Beautify docbook files

25 files changed, 5082 insertions, 17912 deletions

diff --git a/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook b/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook
index 31d5bef87aa..66c581edc83 100644
--- a/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kaddressbook/index.docbook
@@ -3,148 +3,96 @@
 "dtd/kdex.dtd" [
  <!ENTITY kappname "&kaddressbook;">
  <!ENTITY % addindex "IGNORE">
- <!ENTITY % British-English "INCLUDE" 
-> <!-- change language only here -->  
+ <!ENTITY % British-English "INCLUDE" > <!-- change language only here -->  
 ]>
 
 <book lang="&language;">
 <bookinfo>
-<title
->The &kaddressbook; Handbook</title>
+<title>The &kaddressbook; Handbook</title>
 <authorgroup>
-<author
-> <firstname
->Don</firstname
-> <surname
->Sanders</surname
-> <affiliation
-> <address
-><email
->dsanders@kde.org</email
-></address
-> </affiliation
-> </author>
-<othercredit role="translator"
-><firstname
->John</firstname
-><surname
->Knight</surname
-><affiliation
-><address
-><email
->anarchist_tomato@herzeleid.net</email
-></address
-></affiliation
-><contrib
->KDE British Conversion</contrib
-></othercredit>
+<author> <firstname>Don</firstname> <surname>Sanders</surname> <affiliation> <address><email>dsanders@kde.org</email></address> </affiliation> </author>
+<othercredit role="translator"><firstname>John</firstname><surname>Knight</surname><affiliation><address><email>anarchist_tomato@herzeleid.net</email></address></affiliation><contrib>KDE British Conversion</contrib></othercredit>
 </authorgroup>
 
-<date
->2001-06-01</date>
-<releaseinfo
->0.01.00</releaseinfo>
+<date>2001-06-01</date>
+<releaseinfo>0.01.00</releaseinfo>
 
 <legalnotice>
 &FDLNotice;
 </legalnotice>
 
 <abstract>
-<para
->&kaddressbook; is the &kde; address book.</para>
+<para>&kaddressbook; is the &kde; address book.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->kaddressbook</keyword>
+<keyword>KDE</keyword>
+<keyword>kaddressbook</keyword>
 
 </keywordset>
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
 <sect1 id="features">
-<title
->Features</title>
+<title>Features</title>
 
-<para
-> The documentation for &kaddressbook; was not complete at the time you installed this application. If you have any questions, please direct them to the appropriate &kde; mailing list. </para>
+<para> The documentation for &kaddressbook; was not complete at the time you installed this application. If you have any questions, please direct them to the appropriate &kde; mailing list. </para>
 
-<para
-> For &kaddressbook; this is probably </para>
+<para> For &kaddressbook; this is probably </para>
 
 </sect1>
 </chapter>
 
 <chapter id="using-pab">
-<title
->Using &kaddressbook;</title>
+<title>Using &kaddressbook;</title>
 
-<para
-></para>
+<para></para>
 
 </chapter>
 
 <chapter id="questions-answers-and-tips">
-<title
->Questions, Answers, and Tips</title>
+<title>Questions, Answers, and Tips</title>
 
 <sect1 id="question-1">
-<title
->Question 1</title>
+<title>Question 1</title>
 
-<para
->The answer</para>
+<para>The answer</para>
 
 </sect1>
 
 </chapter>
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
-<para
-> </para>
+<para> </para>
 
 <sect1 id="how-to-obtain-pab">
-<title
->How to obtain &kaddressbook;</title>
+<title>How to obtain &kaddressbook;</title>
 
-<para
-> </para>
+<para> </para>
 
 </sect1>
 
 <sect1 id="requirements">
-<title
->Requirements</title>
+<title>Requirements</title>
 
-<para
-> </para>
+<para> </para>
 
 </sect1>
 
 <sect1 id="compilation-and-installation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 
-<para
->Compiling &kaddressbook; is very easy. The following should do it: <screen>
+<para>Compiling &kaddressbook; is very easy. The following should do it: <screen>
 &percnt; ./configure
 &percnt; make
 &percnt; make install
-</screen
-> </para>
+</screen> </para>
 
-<para
->That should do it! Should you run into any problems, please report them to the author at <email
->dsanders@kde.org</email
-></para>
+<para>That should do it! Should you run into any problems, please report them to the author at <email>dsanders@kde.org</email></para>
 
 &underFDL;
 
diff --git a/tde-i18n-en_GB/docs/tdepim/kcontrol/kalarmd/index.docbook b/tde-i18n-en_GB/docs/tdepim/kcontrol/kalarmd/index.docbook
index 4b75e497a2f..e9f9a2d6976 100644
--- a/tde-i18n-en_GB/docs/tdepim/kcontrol/kalarmd/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kcontrol/kalarmd/index.docbook
@@ -2,114 +2,63 @@
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
 <!ENTITY % addindex "IGNORE">
-<!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+<!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <article lang="&language;">
 <articleinfo>
 
 <authorgroup>
-<author
-><firstname
->Lauri</firstname
-> <surname
->Watts</surname
-> <affiliation
-><address
-><email
->lauri@kde.org</email
-></address
-></affiliation>
+<author><firstname>Lauri</firstname> <surname>Watts</surname> <affiliation><address><email>lauri@kde.org</email></address></affiliation>
 </author>
 
-<othercredit role="translator"
-><firstname
->Malcolm</firstname
-><surname
->Hunter</surname
-><affiliation
-><address
-><email
->malcolm.hunter@gmx.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Malcolm</firstname><surname>Hunter</surname><affiliation><address><email>malcolm.hunter@gmx.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
-<date
->2002-02-11</date>
-<releaseinfo
->3.00.00</releaseinfo>
+<date>2002-02-11</date>
+<releaseinfo>3.00.00</releaseinfo>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KControl</keyword>
-<keyword
->alarm</keyword>
-<keyword
->schedule</keyword>
+<keyword>KDE</keyword>
+<keyword>KControl</keyword>
+<keyword>alarm</keyword>
+<keyword>schedule</keyword>
 </keywordset>
 
 </articleinfo>
 
 <sect1 id="alarmd">
-<title
->Alarm Daemon</title>
+<title>Alarm Daemon</title>
 
-<para
->This module allows you to configure &kalarmd;, the alarm daemon from the tdepim package. It will not be available if you have not installed this package.</para>
+<para>This module allows you to configure &kalarmd;, the alarm daemon from the tdepim package. It will not be available if you have not installed this package.</para>
 
-<para
->There are only two options for this module:</para>
+<para>There are only two options for this module:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Start alarm daemon automatically at login</guilabel
-></term>
+<term><guilabel>Start alarm daemon automatically at login</guilabel></term>
 <listitem>
-<para
->Check this to start the alarm daemon whenever you start a &kde; session.</para>
+<para>Check this to start the alarm daemon whenever you start a &kde; session.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Check interval [minutes]</guilabel
-></term>
+<term><guilabel>Check interval [minutes]</guilabel></term>
 <listitem>
-<para
->How long (in minutes) the alarm daemon should wait between checks for alarms coming due.</para>
+<para>How long (in minutes) the alarm daemon should wait between checks for alarms coming due.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->These settings apply to every application which uses the alarm daemon. Currently, the applications which use it include &korganizer; and &kalarm;. For more information, see their respective handbooks.</para>
+<para>These settings apply to every application which uses the alarm daemon. Currently, the applications which use it include &korganizer; and &kalarm;. For more information, see their respective handbooks.</para>
 
 <sect2>
-<title
->Section Author</title>
-
-<para
->Lauri Watts <email
->lauri@kde.org</email
-></para>
-
-<para
->Conversion to British English: Malcolm Hunter <email
->malcolm.hunter@gmx.co.uk</email
-></para
-> 
+<title>Section Author</title>
+
+<para>Lauri Watts <email>lauri@kde.org</email></para>
+
+<para>Conversion to British English: Malcolm Hunter <email>malcolm.hunter@gmx.co.uk</email></para> 
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/kleopatra/index.docbook b/tde-i18n-en_GB/docs/tdepim/kleopatra/index.docbook
index 939dcac0fbf..07d86b3f851 100644
--- a/tde-i18n-en_GB/docs/tdepim/kleopatra/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kleopatra/index.docbook
@@ -1,798 +1,319 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kleopatra "<application
->Kleopatra</application
->">
-  <!ENTITY kwatchgnupg "<application
->KWatchGnuPG</application
->">
-  <!ENTITY gpgsm "<application
->GpgSM</application
->">
-  <!ENTITY gpg "<application
->GPG</application
->">
-  <!ENTITY gpgconf "<application
->GpgConf</application
->">
+  <!ENTITY kleopatra "<application>Kleopatra</application>">
+  <!ENTITY kwatchgnupg "<application>KWatchGnuPG</application>">
+  <!ENTITY gpgsm "<application>GpgSM</application>">
+  <!ENTITY gpg "<application>GPG</application>">
+  <!ENTITY gpgconf "<application>GpgConf</application>">
   <!ENTITY kappname "&kleopatra;">
   <!ENTITY package "tdepim">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % British-English "INCLUDE">
 
-  <!ENTITY dn "<acronym
->DN</acronym
->">
-  <!ENTITY ca "<acronym
->CA</acronym
->">
+  <!ENTITY dn "<acronym>DN</acronym>">
+  <!ENTITY ca "<acronym>CA</acronym>">
 
   <!-- FILE menu -->
-  <!ENTITY file-new-key-pair "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->New Key Pair...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-export-certificates "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Export Certificates...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-export-secret-key "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Export Secret key...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-import-certificates "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Import Certificates...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-import-crls "<menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Import CRLs...</guimenuitem
-></menuchoice
->">
-  <!ENTITY file-quit "<menuchoice
-><shortcut
-><keycombo action='simul'
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-></shortcut
-><guimenu
->File</guimenu
-><guimenuitem
->Quit</guimenuitem
-></menuchoice
->">
+  <!ENTITY file-new-key-pair "<menuchoice><guimenu>File</guimenu><guimenuitem>New Key Pair...</guimenuitem></menuchoice>">
+  <!ENTITY file-export-certificates "<menuchoice><guimenu>File</guimenu><guimenuitem>Export Certificates...</guimenuitem></menuchoice>">
+  <!ENTITY file-export-secret-key "<menuchoice><guimenu>File</guimenu><guimenuitem>Export Secret key...</guimenuitem></menuchoice>">
+  <!ENTITY file-import-certificates "<menuchoice><guimenu>File</guimenu><guimenuitem>Import Certificates...</guimenuitem></menuchoice>">
+  <!ENTITY file-import-crls "<menuchoice><guimenu>File</guimenu><guimenuitem>Import CRLs...</guimenuitem></menuchoice>">
+  <!ENTITY file-quit "<menuchoice><shortcut><keycombo action='simul'>&Ctrl;<keycap>Q</keycap></keycombo></shortcut><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice>">
 
   <!-- VIEW menu -->
-  <!ENTITY view-redisplay "<menuchoice
-><shortcut
-><keycombo action='simul'
-><keycap
->F5</keycap
-></keycombo
-></shortcut
-><guimenu
->View</guimenu
-><guimenuitem
->Redisplay</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-stop-operation "<menuchoice
-><shortcut
-><keycombo action='simul'
-><keycap
->Esc</keycap
-></keycombo
-></shortcut
-><guimenu
->View</guimenu
-><guimenuitem
->Stop Operation</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-certificate-details "<menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Certificate Details...</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-hierarchical-key-list "<menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Hierarchical Key List</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-expand-all "<menuchoice
-><shortcut
-><keycombo action='simul'
->&Ctrl;<keycap
->.</keycap
-></keycombo
-></shortcut
-><guimenu
->View</guimenu
-><guimenuitem
->Expand All</guimenuitem
-></menuchoice
->">
-  <!ENTITY view-collapse-all "<menuchoice
-><shortcut
-><keycombo action='simul'
->&Ctrl;<keycap
->,</keycap
-></keycombo
-></shortcut
-><guimenu
->View</guimenu
-><guimenuitem
->Collapse All</guimenuitem
-></menuchoice
->">
+  <!ENTITY view-redisplay "<menuchoice><shortcut><keycombo action='simul'><keycap>F5</keycap></keycombo></shortcut><guimenu>View</guimenu><guimenuitem>Redisplay</guimenuitem></menuchoice>">
+  <!ENTITY view-stop-operation "<menuchoice><shortcut><keycombo action='simul'><keycap>Esc</keycap></keycombo></shortcut><guimenu>View</guimenu><guimenuitem>Stop Operation</guimenuitem></menuchoice>">
+  <!ENTITY view-certificate-details "<menuchoice><guimenu>View</guimenu><guimenuitem>Certificate Details...</guimenuitem></menuchoice>">
+  <!ENTITY view-hierarchical-key-list "<menuchoice><guimenu>View</guimenu><guimenuitem>Hierarchical Key List</guimenuitem></menuchoice>">
+  <!ENTITY view-expand-all "<menuchoice><shortcut><keycombo action='simul'>&Ctrl;<keycap>.</keycap></keycombo></shortcut><guimenu>View</guimenu><guimenuitem>Expand All</guimenuitem></menuchoice>">
+  <!ENTITY view-collapse-all "<menuchoice><shortcut><keycombo action='simul'>&Ctrl;<keycap>,</keycap></keycombo></shortcut><guimenu>View</guimenu><guimenuitem>Collapse All</guimenuitem></menuchoice>">
 
   <!-- CERTIFICATES menu -->
- <!ENTITY certificates-validate "<menuchoice
-><shortcut
-><keycombo action='simul'
->&Shift;<keycap
->F5</keycap
-></keycombo
-></shortcut
-><guimenu
->Certificates</guimenu
-><guimenuitem
->Validate</guimenuitem
-></menuchoice
->">
-  <!ENTITY certificates-refresh-crls "<menuchoice
-><guimenu
->Certificates</guimenu
-><guimenuitem
->Refresh CRLs</guimenuitem
-></menuchoice
->">
-  <!ENTITY certificates-delete "<menuchoice
-><shortcut
-><keycombo action='simul'
-><keycap
->Delete</keycap
-></keycombo
-></shortcut
-><guimenu
->Certificates</guimenu
-><guimenuitem
->Delete</guimenuitem
-></menuchoice
->">
-  <!ENTITY certificates-download "<menuchoice
-><guimenu
->Certificates</guimenu
-><guimenuitem
->Download</guimenuitem
-></menuchoice
->">
+ <!ENTITY certificates-validate "<menuchoice><shortcut><keycombo action='simul'>&Shift;<keycap>F5</keycap></keycombo></shortcut><guimenu>Certificates</guimenu><guimenuitem>Validate</guimenuitem></menuchoice>">
+  <!ENTITY certificates-refresh-crls "<menuchoice><guimenu>Certificates</guimenu><guimenuitem>Refresh CRLs</guimenuitem></menuchoice>">
+  <!ENTITY certificates-delete "<menuchoice><shortcut><keycombo action='simul'><keycap>Delete</keycap></keycombo></shortcut><guimenu>Certificates</guimenu><guimenuitem>Delete</guimenuitem></menuchoice>">
+  <!ENTITY certificates-download "<menuchoice><guimenu>Certificates</guimenu><guimenuitem>Download</guimenuitem></menuchoice>">
 
   <!-- CRLS menu -->
-  <!ENTITY crls-clear-crl-cache "<menuchoice
-><guimenu
->CRLs</guimenu
-><guimenuitem
->Clear CRL Cache...</guimenuitem
-></menuchoice
->">
-  <!ENTITY crls-dump-crl-cache "<menuchoice
-><guimenu
->CRLs</guimenu
-><guimenuitem
->Dump CRL Cache...</guimenuitem
-></menuchoice
->">
+  <!ENTITY crls-clear-crl-cache "<menuchoice><guimenu>CRLs</guimenu><guimenuitem>Clear CRL Cache...</guimenuitem></menuchoice>">
+  <!ENTITY crls-dump-crl-cache "<menuchoice><guimenu>CRLs</guimenu><guimenuitem>Dump CRL Cache...</guimenuitem></menuchoice>">
 
   <!-- TOOLS menu -->
-  <!ENTITY tools-gnupg-log-viewer "<menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->GnuPG Log Viewer...</guimenuitem
-></menuchoice
->">
+  <!ENTITY tools-gnupg-log-viewer "<menuchoice><guimenu>Tools</guimenu><guimenuitem>GnuPG Log Viewer...</guimenuitem></menuchoice>">
 
   <!-- SETTINGS menu -->
-  <!ENTITY settings-show-statusbar "<menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Show Statusbar</guimenuitem
-></menuchoice
->">
-  <!ENTITY settings-configure-shortcuts "<menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts...</guimenuitem
-></menuchoice
->">
-  <!ENTITY settings-configure-kleopatra "<menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kleopatra;...</guimenuitem
-></menuchoice
->">
-  <!ENTITY settings-configure-gpgme-backend "<menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure GpgME Backend...</guimenuitem
-></menuchoice
->">
+  <!ENTITY settings-show-statusbar "<menuchoice><guimenu>Settings</guimenu><guimenuitem>Show Statusbar</guimenuitem></menuchoice>">
+  <!ENTITY settings-configure-shortcuts "<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice>">
+  <!ENTITY settings-configure-kleopatra "<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kleopatra;...</guimenuitem></menuchoice>">
+  <!ENTITY settings-configure-gpgme-backend "<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure GpgME Backend...</guimenuitem></menuchoice>">
 
   <!-- Command line options -->
-  <!ENTITY commandline-option-external "<option
->--external</option
->">
-  <!ENTITY commandline-option-query "<option
->--query</option
->">
-  <!ENTITY commandline-option-import-certificate "<option
->--import-certificate</option
->">
+  <!ENTITY commandline-option-external "<option>--external</option>">
+  <!ENTITY commandline-option-query "<option>--query</option>">
+  <!ENTITY commandline-option-import-certificate "<option>--import-certificate</option>">
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &kleopatra; Handbook</title>
+<title>The &kleopatra; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
->Marc</firstname
-> <surname
->Mutz</surname
-> <affiliation
-> <address
-><email
->marc@klaralvdalens-datakonsult.se</email
-></address>
+<author><firstname>Marc</firstname> <surname>Mutz</surname> <affiliation> <address><email>marc@klaralvdalens-datakonsult.se</email></address>
 </affiliation>
 </author>
 
-<othercredit role="developer"
-><firstname
->David</firstname
-> <surname
->Faure</surname
-> <contrib
->Developer</contrib>
+<othercredit role="developer"><firstname>David</firstname> <surname>Faure</surname> <contrib>Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Steffen</firstname
-> <othername
-></othername
-> <surname
->Hansen</surname
-> <affiliation
-> <address
-><email
->steffen@klaralvdalens-datakonsult.se</email
-></address>
+<othercredit role="developer"><firstname>Steffen</firstname> <othername></othername> <surname>Hansen</surname> <affiliation> <address><email>steffen@klaralvdalens-datakonsult.se</email></address>
 </affiliation>
-<contrib
->Developer</contrib>
+<contrib>Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Matthias Kalle</firstname
-> <surname
->Dalheimer</surname
-> <contrib
->Developer</contrib>
+<othercredit role="developer"><firstname>Matthias Kalle</firstname> <surname>Dalheimer</surname> <contrib>Developer</contrib>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
->Jesper</firstname
-> <surname
->Pedersen</surname
-> <affiliation
-> <address
-><email
->blackie@kde.org</email
-></address>
+<othercredit role="developer"><firstname>Jesper</firstname> <surname>Pedersen</surname> <affiliation> <address><email>blackie@kde.org</email></address>
 </affiliation>
-<contrib
->Developer</contrib>
+<contrib>Developer</contrib>
 </othercredit>
-<othercredit role="developer"
-><firstname
->Daniel</firstname
-> <surname
->Molkentin</surname
-> <affiliation
-> <address
-><email
->molkentin@kde.org</email
-></address>
+<othercredit role="developer"><firstname>Daniel</firstname> <surname>Molkentin</surname> <affiliation> <address><email>molkentin@kde.org</email></address>
 </affiliation>
-<contrib
->Developer</contrib>
+<contrib>Developer</contrib>
 </othercredit>
 
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
 
-<legalnotice
->&GPLNotice;</legalnotice>
+<legalnotice>&GPLNotice;</legalnotice>
 
-<date
->2004-06-11</date>
-<releaseinfo
->0.31</releaseinfo>
+<date>2004-06-11</date>
+<releaseinfo>0.31</releaseinfo>
 
 <abstract>
-<para
->&kleopatra; is a tool for managing X.509 certificates. </para>
+<para>&kleopatra; is a tool for managing X.509 certificates. </para>
 </abstract>
 
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Kapp</keyword>
-<keyword
->X509</keyword>
-<keyword
->LDAP</keyword>
-<keyword
->gpg</keyword>
-<keyword
->gpgsm</keyword>
+<keyword>KDE</keyword>
+<keyword>Kapp</keyword>
+<keyword>X509</keyword>
+<keyword>LDAP</keyword>
+<keyword>gpg</keyword>
+<keyword>gpgsm</keyword>
 </keywordset>
 
 </bookinfo>
 
-<chapter id="introduction"
-> <title
->Introduction</title
-> 
-
-<para
->&kleopatra; is the &kde; tool for managing X.509 certificates in the &gpgsm; keybox and for retrieving certificates from <acronym
->LDAP</acronym
-> servers.</para>
-
-<para
->&kleopatra; can be started from KMail's <guimenu
->Tools</guimenu
-> menu, as well as from the command line. The &kleopatra; executable is named <userinput
-><command
->kleopatra</command
-></userinput
->.</para>
-
-<note
-><para
->This program is named after Cleopatra, a famous female Egyptian pharaoh that lived at the time of Julius Caesar, whom she is said to have had an intimate relationship with.</para>
-
-<para
->The name was chosen since this program originates from the <ulink url="http://www.gnupg.org/aegypten2/"
->&Auml;gypten Projects</ulink
-> (&Auml;gypten is German for Egypt). Kleopatra is the German spelling of Cleopatra.</para
-></note>
+<chapter id="introduction"> <title>Introduction</title> 
+
+<para>&kleopatra; is the &kde; tool for managing X.509 certificates in the &gpgsm; keybox and for retrieving certificates from <acronym>LDAP</acronym> servers.</para>
+
+<para>&kleopatra; can be started from KMail's <guimenu>Tools</guimenu> menu, as well as from the command line. The &kleopatra; executable is named <userinput><command>kleopatra</command></userinput>.</para>
+
+<note><para>This program is named after Cleopatra, a famous female Egyptian pharaoh that lived at the time of Julius Caesar, whom she is said to have had an intimate relationship with.</para>
+
+<para>The name was chosen since this program originates from the <ulink url="http://www.gnupg.org/aegypten2/">&Auml;gypten Projects</ulink> (&Auml;gypten is German for Egypt). Kleopatra is the German spelling of Cleopatra.</para></note>
 
 </chapter>
 
-<chapter id="functions"
-><title
->Main Functions</title>
+<chapter id="functions"><title>Main Functions</title>
 
-<sect1 id="functions-view"
-><title
->Viewing the Local Keybox</title>
+<sect1 id="functions-view"><title>Viewing the Local Keybox</title>
 
 <!-- Viewing and Refreshing, also Validation -->
 
-<para
->&kleopatra;'s main function is to display and edit the contents of the local keybox, which is similar to &gpg;'s concept of keyrings, albeit one should not stretch this analogy too much.</para>
-
-<para
->The main window is divided into the large key listing area, the menubar and the <link linkend="functions-search"
->search bar</link
-> on top, and a statusbar at the bottom.</para>
-
-<para
->Each line in the key list corresponds to one certificate, identified by the so-called <guilabel
->Subject &dn;</guilabel
->. &dn; is an acronym for <quote
->Distinguished Name</quote
->, a hierarchical identifier, much like a filesystem path with an unusual syntax, that is supposed to globally uniquely identify a given certificate.</para>
-
-<para
->To be valid, and thus usable, (public) keys need to be signed by a &ca; (Certification Authority). These signatures are called certificates, but usually the terms <quote
->certificate</quote
-> and <quote
->(public) key</quote
-> are used interchangeably, and we will not distinguish between them in this manual either, except when explicitly noted. The name of the &ca; which issued the certificate (its &dn;) is shown in the <guilabel
->Issuer DN</guilabel
-> column.</para>
-
-<para
->&ca;s must in turn be signed by other &ca;s to be valid. Of course, this must end somewhere, so the top-level &ca; (root-&ca;) signs its key with itself (this is called a self-signature). Root certificates thus need to be assigned validity (commonly called trust) manually, &eg; after comparing the fingerprint with the one on the website of the &ca;. This is typically done by the system administrator or the vendor of a product using certificates, but can be done by the user via &gpgsm;'s command line interface.</para>
-
-<para
->To see which of the certificates are root certificates, you can either compare <guilabel
->Subject &dn;</guilabel
-> and <guilabel
->Issuer &dn;</guilabel
->, or you switch to hierarchical keylist mode with <xref linkend="view-hierarchical-key-list"/>.</para>
-
-<para
->You can see the details of any certificate by double-clicking it or using <xref linkend="view-certificate-details"/>. This opens a dialog that shows the most common properties of the certificate, its certificate chain (&ie; the chain of issuers up to the root-&ca;), and a dump of all information the backend is able to extract from the certificate.</para>
-
-<para
->If you change the keybox without using &kleopatra; (&eg; using &gpgsm;'s command line interface), you can refresh the view with <xref linkend="view-redisplay"/>.</para>
-
-<para
->Since validating a key may take some time (&eg; CRLs might need to be fetched), the normal keylisting does not attempt to check the validity of keys. For this, <xref linkend="certificates-validate"/>, a special variant of <xref linkend="view-redisplay"/>, is provided. It either checks the selected certificates, or all keys if none are selected.</para>
+<para>&kleopatra;'s main function is to display and edit the contents of the local keybox, which is similar to &gpg;'s concept of keyrings, albeit one should not stretch this analogy too much.</para>
+
+<para>The main window is divided into the large key listing area, the menubar and the <link linkend="functions-search">search bar</link> on top, and a statusbar at the bottom.</para>
+
+<para>Each line in the key list corresponds to one certificate, identified by the so-called <guilabel>Subject &dn;</guilabel>. &dn; is an acronym for <quote>Distinguished Name</quote>, a hierarchical identifier, much like a filesystem path with an unusual syntax, that is supposed to globally uniquely identify a given certificate.</para>
+
+<para>To be valid, and thus usable, (public) keys need to be signed by a &ca; (Certification Authority). These signatures are called certificates, but usually the terms <quote>certificate</quote> and <quote>(public) key</quote> are used interchangeably, and we will not distinguish between them in this manual either, except when explicitly noted. The name of the &ca; which issued the certificate (its &dn;) is shown in the <guilabel>Issuer DN</guilabel> column.</para>
+
+<para>&ca;s must in turn be signed by other &ca;s to be valid. Of course, this must end somewhere, so the top-level &ca; (root-&ca;) signs its key with itself (this is called a self-signature). Root certificates thus need to be assigned validity (commonly called trust) manually, &eg; after comparing the fingerprint with the one on the website of the &ca;. This is typically done by the system administrator or the vendor of a product using certificates, but can be done by the user via &gpgsm;'s command line interface.</para>
+
+<para>To see which of the certificates are root certificates, you can either compare <guilabel>Subject &dn;</guilabel> and <guilabel>Issuer &dn;</guilabel>, or you switch to hierarchical keylist mode with <xref linkend="view-hierarchical-key-list"/>.</para>
+
+<para>You can see the details of any certificate by double-clicking it or using <xref linkend="view-certificate-details"/>. This opens a dialog that shows the most common properties of the certificate, its certificate chain (&ie; the chain of issuers up to the root-&ca;), and a dump of all information the backend is able to extract from the certificate.</para>
+
+<para>If you change the keybox without using &kleopatra; (&eg; using &gpgsm;'s command line interface), you can refresh the view with <xref linkend="view-redisplay"/>.</para>
+
+<para>Since validating a key may take some time (&eg; CRLs might need to be fetched), the normal keylisting does not attempt to check the validity of keys. For this, <xref linkend="certificates-validate"/>, a special variant of <xref linkend="view-redisplay"/>, is provided. It either checks the selected certificates, or all keys if none are selected.</para>
 
 </sect1>
 
-<sect1 id="functions-search"
-><title
->Searching and Importing Certificates</title>
-
-<para
->Most of the time, you will acquire new certificates by verifying signatures in emails, since certificates are embedded in the signatures made using them most of the time. However, if you need to send a mail to someone you have not yet had contact with, you need to fetch the certificate from an LDAP directory (although &gpgsm; can do this automatically), or from a file. You also need to import your own certificate after receiving the &ca; answer to your certification request.</para>
-
-<para
->To search for a certificate in an LDAP directory, switch the dropdown menu of the search bar from <guilabel
->in Local Certificates</guilabel
-> to <guilabel
->in External Certificates</guilabel
->, enter some text (&eg; the name of the person you want the certificate for) into the line edit, and click on the <guilabel
->Find</guilabel
-> icon. The results will be displayed in the key list below the search bar, where you can select certificates to either look at them with <xref linkend="view-certificate-details"/> or download them with <xref linkend="certificates-download"/> into the local keybox. Note that you can also download the certificate from the details dialogue, using the <guilabel
->Import to Local</guilabel
-> button.</para>
-
-<para
->You can configure the list of LDAP servers to search in the <link linkend="configuration-directory-services"
-><guilabel
->Directory Services</guilabel
-></link
-> page of &kleopatra;'s <link linkend="configuration"
->configure dialogue</link
->.</para>
-
-<para
->If you received the certificate as a file, try <xref linkend="file-import-certificates"/>. &gpgsm; needs to understand the format of the certificate file; please refer to &gpgsm;'s manual for a list of supported file formats.</para>
-
-<para
->If you did not <link linkend="functions-newkey"
->create your keypair with &gpgsm;</link
->, you also need to manually import the public key (as well as the secret key) from the PKCS#12 file you got from the &ca;. You can do this on the command line with <link linkend="commandline-option-import-certificate"
-><userinput
-><command
->kleopatra &commandline-option-import-certificate; <filename
->filename</filename
-></command
-></userinput
-></link
-> or from within &kleopatra; with <xref linkend="file-import-certificates"/>, just as you would to for <quote
->normal</quote
-> certificates.</para>
+<sect1 id="functions-search"><title>Searching and Importing Certificates</title>
+
+<para>Most of the time, you will acquire new certificates by verifying signatures in emails, since certificates are embedded in the signatures made using them most of the time. However, if you need to send a mail to someone you have not yet had contact with, you need to fetch the certificate from an LDAP directory (although &gpgsm; can do this automatically), or from a file. You also need to import your own certificate after receiving the &ca; answer to your certification request.</para>
+
+<para>To search for a certificate in an LDAP directory, switch the dropdown menu of the search bar from <guilabel>in Local Certificates</guilabel> to <guilabel>in External Certificates</guilabel>, enter some text (&eg; the name of the person you want the certificate for) into the line edit, and click on the <guilabel>Find</guilabel> icon. The results will be displayed in the key list below the search bar, where you can select certificates to either look at them with <xref linkend="view-certificate-details"/> or download them with <xref linkend="certificates-download"/> into the local keybox. Note that you can also download the certificate from the details dialogue, using the <guilabel>Import to Local</guilabel> button.</para>
+
+<para>You can configure the list of LDAP servers to search in the <link linkend="configuration-directory-services"><guilabel>Directory Services</guilabel></link> page of &kleopatra;'s <link linkend="configuration">configure dialogue</link>.</para>
+
+<para>If you received the certificate as a file, try <xref linkend="file-import-certificates"/>. &gpgsm; needs to understand the format of the certificate file; please refer to &gpgsm;'s manual for a list of supported file formats.</para>
+
+<para>If you did not <link linkend="functions-newkey">create your keypair with &gpgsm;</link>, you also need to manually import the public key (as well as the secret key) from the PKCS#12 file you got from the &ca;. You can do this on the command line with <link linkend="commandline-option-import-certificate"><userinput><command>kleopatra &commandline-option-import-certificate; <filename>filename</filename></command></userinput></link> or from within &kleopatra; with <xref linkend="file-import-certificates"/>, just as you would to for <quote>normal</quote> certificates.</para>
 
 </sect1>
 
-<sect1 id="functions-newkey"
-><title
->Creating New Key Pairs</title>
-
-<para
->The menu item <xref linkend="file-new-key-pair"/> starts the certificate-request-creating wizard which will guide you through a number of steps to create a certificate request; this request can, on the last page of the wizard, either be sent to a certificate authority (CA) to be signed or saved to a file (for example to a floppy, so it can be shipped to the CA).</para
-> <para
->Whenever you are done with a step in the wizard, press <guibutton
->Next</guibutton
-> to go to the next step (or <guibutton
->Back</guibutton
-> to review steps that are already completed). The certificate request creation can be cancelled at any time by pressing the <guibutton
->Cancel</guibutton
-> button. </para>
-<para
->The first step in the wizard is to type in your personal data for the certificate. The fields to fill out are: <itemizedlist>
+<sect1 id="functions-newkey"><title>Creating New Key Pairs</title>
+
+<para>The menu item <xref linkend="file-new-key-pair"/> starts the certificate-request-creating wizard which will guide you through a number of steps to create a certificate request; this request can, on the last page of the wizard, either be sent to a certificate authority (CA) to be signed or saved to a file (for example to a floppy, so it can be shipped to the CA).</para> <para>Whenever you are done with a step in the wizard, press <guibutton>Next</guibutton> to go to the next step (or <guibutton>Back</guibutton> to review steps that are already completed). The certificate request creation can be cancelled at any time by pressing the <guibutton>Cancel</guibutton> button. </para>
+<para>The first step in the wizard is to type in your personal data for the certificate. The fields to fill out are: <itemizedlist>
 <listitem>
-<para
-><guilabel
->Name:</guilabel
-> Your name;</para>
+<para><guilabel>Name:</guilabel> Your name;</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Location:</guilabel
->The town or city in which you live;</para>
+<para><guilabel>Location:</guilabel>The town or city in which you live;</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Organisation:</guilabel
->The organisation you represent (for example, the company you work for);</para>
+<para><guilabel>Organisation:</guilabel>The organisation you represent (for example, the company you work for);</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Department:</guilabel
->The organisational unit you are in (for example, "Logistics");</para
-> 
+<para><guilabel>Department:</guilabel>The organisational unit you are in (for example, "Logistics");</para> 
 </listitem>
 <listitem>
-<para
-><guilabel
->Country code:</guilabel
->The two letter code for the country in which you are living (for example, "UK");</para>
+<para><guilabel>Country code:</guilabel>The two letter code for the country in which you are living (for example, "UK");</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Email address:</guilabel
->Your email address; be sure to type this in correctly&mdash;this will be the address people will be sending mail to when they use your certificate.</para>
+<para><guilabel>Email address:</guilabel>Your email address; be sure to type this in correctly&mdash;this will be the address people will be sending mail to when they use your certificate.</para>
 </listitem>
 </itemizedlist>
-</para
-><para
->The next step in the wizard is to select whether to store the certificate in a file or send it directly to a CA. You will have to specify the filename or email address to send the certificate request to. </para
-></sect1>
+</para><para>The next step in the wizard is to select whether to store the certificate in a file or send it directly to a CA. You will have to specify the filename or email address to send the certificate request to. </para></sect1>
 
 
-<sect1 id="functions-keybox-management"
-><title
->Keybox Management</title>
+<sect1 id="functions-keybox-management"><title>Keybox Management</title>
 
-<para
->In addition to <link linkend="functions-view"
->list and validate</link
->, <link linkend="functions-search"
->search and import</link
-> certificates and <link linkend="functions-newkey"
->creating new ones</link
->, &kleopatra; also has some less often used functions that help you manage your local keybox.</para>
+<para>In addition to <link linkend="functions-view">list and validate</link>, <link linkend="functions-search">search and import</link> certificates and <link linkend="functions-newkey">creating new ones</link>, &kleopatra; also has some less often used functions that help you manage your local keybox.</para>
 
-<para
->These functions include deleting certificates from the local keybox with <xref linkend="certificates-delete"/>, as well as manual handling of CRLs (<xref linkend="certificates-refresh-crls"/>, <xref linkend="crls-clear-crl-cache"/>, <xref linkend="crls-dump-crl-cache"/>).</para>
+<para>These functions include deleting certificates from the local keybox with <xref linkend="certificates-delete"/>, as well as manual handling of CRLs (<xref linkend="certificates-refresh-crls"/>, <xref linkend="crls-clear-crl-cache"/>, <xref linkend="crls-dump-crl-cache"/>).</para>
 
 </sect1>
 
 </chapter>
 
-<chapter id="menu"
-><title
->Menu Reference</title>
+<chapter id="menu"><title>Menu Reference</title>
 
-<sect1 id="menufile"
-><title
->File Menu</title>
+<sect1 id="menufile"><title>File Menu</title>
 
 <variablelist>
 
 <varlistentry id="file-new-key-pair">
-<term
->&file-new-key-pair;</term>
+<term>&file-new-key-pair;</term>
 
 <listitem>
-<para
-><action
->Creates a new key pair (public and private)</action
-> and allows to send the public part to a certification authority (<acronym
->CA</acronym
->) for signing. The resulting certificate is then sent back to you, or stored in an LDAP server for you to download into your local keybox, where you can use it to sign and decrypt mails.</para>
-
-<para
->This mode of operation is called <quote
->decentralised key generation</quote
->, since all keys are created locally. &kleopatra; (and &gpgsm;) do not support <quote
->centralised key generation</quote
-> directly, but you can import the public/secret key bundle that you receive from the CA in PKCS#12 format via &file-import-certificates;.</para>
+<para><action>Creates a new key pair (public and private)</action> and allows to send the public part to a certification authority (<acronym>CA</acronym>) for signing. The resulting certificate is then sent back to you, or stored in an LDAP server for you to download into your local keybox, where you can use it to sign and decrypt mails.</para>
+
+<para>This mode of operation is called <quote>decentralised key generation</quote>, since all keys are created locally. &kleopatra; (and &gpgsm;) do not support <quote>centralised key generation</quote> directly, but you can import the public/secret key bundle that you receive from the CA in PKCS#12 format via &file-import-certificates;.</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-export-certificates">
-<term
->&file-export-certificates;</term>
+<term>&file-export-certificates;</term>
 
 <listitem>
-<para
-><action
->Exports the selected certificates</action
-> into a file.</para>
-
-<note
-><para
->This exports only the public keys, even if the secret key is available. Use &file-export-secret-key; to export both public and secret keys into a file, but note that this is almost always a bad idea.</para
-></note>
+<para><action>Exports the selected certificates</action> into a file.</para>
+
+<note><para>This exports only the public keys, even if the secret key is available. Use &file-export-secret-key; to export both public and secret keys into a file, but note that this is almost always a bad idea.</para></note>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-export-secret-key">
-<term
->&file-export-secret-key;</term>
+<term>&file-export-secret-key;</term>
 
 <listitem>
-<para
-><action
->Exports both the public and the secret key to a (PKCS#12) file.</action
-></para>
-
-<warning
-><para
->It should rarely be necessary to use this function, and if it is, it should be carefully planned. Planning the migration of a secret key involves choice of transport media and secure deletion of the key data on the old machine, as well as the transport medium, among other things.</para
-></warning>
+<para><action>Exports both the public and the secret key to a (PKCS#12) file.</action></para>
+
+<warning><para>It should rarely be necessary to use this function, and if it is, it should be carefully planned. Planning the migration of a secret key involves choice of transport media and secure deletion of the key data on the old machine, as well as the transport medium, among other things.</para></warning>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-import-certificates">
-<term
->&file-import-certificates;</term>
+<term>&file-import-certificates;</term>
 
 <listitem>
-<para
-><action
->Imports certificates and/or secret keys from files into the local keybox.</action
-></para>
+<para><action>Imports certificates and/or secret keys from files into the local keybox.</action></para>
 
-<para
->The format of the certificate file must be supported by &gpgsm;. Please refer to the &gpgsm; manual for a list of supported formats.</para>
+<para>The format of the certificate file must be supported by &gpgsm;. Please refer to the &gpgsm; manual for a list of supported formats.</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-import-crls">
-<term
->&file-import-crls;</term>
+<term>&file-import-crls;</term>
 
 <listitem>
-<para
-><action
->Lets you manually import CRLs from files.</action
-></para>
-
-<para
->Normally, Certificate Revocation Lists (CRLs) are handled transparently by the backend, but it can sometimes be useful to import a CRL manually into the local CRL cache.</para>
-
-<note
-><para
->For CRL import to work, the <application
->dirmngr</application
-> tool must be in the search <varname
->PATH</varname
->. If this menu item is disabled, you should contact the system administrator and ask them to install <application
->dirmngr</application
->.</para
-></note>
-
-<para
->You can view the contents of the local CRL cache from the menu item &crls-dump-crl-cache;. This will display a dialogue with information about the CRLs in the cache and the fingerprints of the certificates in each CRL. </para>
+<para><action>Lets you manually import CRLs from files.</action></para>
+
+<para>Normally, Certificate Revocation Lists (CRLs) are handled transparently by the backend, but it can sometimes be useful to import a CRL manually into the local CRL cache.</para>
+
+<note><para>For CRL import to work, the <application>dirmngr</application> tool must be in the search <varname>PATH</varname>. If this menu item is disabled, you should contact the system administrator and ask them to install <application>dirmngr</application>.</para></note>
+
+<para>You can view the contents of the local CRL cache from the menu item &crls-dump-crl-cache;. This will display a dialogue with information about the CRLs in the cache and the fingerprints of the certificates in each CRL. </para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="file-quit">
-<term
->&file-quit;</term>
+<term>&file-quit;</term>
 
 <listitem>
-<para
-><action
->Terminates &kleopatra;.</action
-></para>
+<para><action>Terminates &kleopatra;.</action></para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-</sect1
-> <!-- File Menu -->
+</sect1> <!-- File Menu -->
 
 
 
-<sect1 id="menuview"
-><title
->View Menu</title>
+<sect1 id="menuview"><title>View Menu</title>
 
 <variablelist>
 
 <varlistentry id="view-redisplay">
-<term
->&view-redisplay;</term>
+<term>&view-redisplay;</term>
 
 <listitem>
-<para
-><action
->Redisplays the selected certificates or refreshes the certificate list.</action
-></para>
+<para><action>Redisplays the selected certificates or refreshes the certificate list.</action></para>
 
-<para
->If there are selected certificates, the refresh operation is restricted to those selected entries.</para>
+<para>If there are selected certificates, the refresh operation is restricted to those selected entries.</para>
 
-<para
->If a query result (either remote or local) is currently displayed, the query is re-issued and the new results are displayed in place of the old ones.</para>
+<para>If a query result (either remote or local) is currently displayed, the query is re-issued and the new results are displayed in place of the old ones.</para>
 
-<para
->If no query has been performed, the whole keybox contents is re-fetched and re-displayed.</para>
+<para>If no query has been performed, the whole keybox contents is re-fetched and re-displayed.</para>
 
-<para
->You can use this if you have changed the contents of the keybox by other means than &kleopatra; (&eg; by using &gpgsm;'s command line interface).</para>
+<para>You can use this if you have changed the contents of the keybox by other means than &kleopatra; (&eg; by using &gpgsm;'s command line interface).</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="view-stop-operation">
-<term
->&view-stop-operation;</term>
+<term>&view-stop-operation;</term>
 
 <listitem>
-<para
-><action
->Stops (cancels) all pending operations,</action
-> &eg; a search or a download.</para>
-
-<note
-><para
->Depending on the server used, cancelling a remote search can block &kleopatra; for a few seconds while waiting for the backend to complete the procedure. This is normal and expected behaviour.</para
-></note>
+<para><action>Stops (cancels) all pending operations,</action> &eg; a search or a download.</para>
+
+<note><para>Depending on the server used, cancelling a remote search can block &kleopatra; for a few seconds while waiting for the backend to complete the procedure. This is normal and expected behaviour.</para></note>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="view-certificate-details">
-<term
->&view-certificate-details;</term>
+<term>&view-certificate-details;</term>
 
 <listitem>
-<para
-><action
->Shows the details of the currently selected certificate.</action
-></para>
+<para><action>Shows the details of the currently selected certificate.</action></para>
 
-<para
->This function is also available by double-clicking the corresponding item in the list view directly.</para>
+<para>This function is also available by double-clicking the corresponding item in the list view directly.</para>
 
 <!--FIXME: link to the dialog's help, but where do we put _that_?-->
 </listitem>
@@ -800,64 +321,43 @@
 
 
 <varlistentry id="view-hierarchical-key-list">
-<term
->&view-hierarchical-key-list;</term>
+<term>&view-hierarchical-key-list;</term>
 
 <listitem>
-<para
-><action
->Toggles between hierarchical and flat keylist mode. </action
-></para>
-
-<para
->In hierarchical mode, certificates are arranged in issuer/subject relation, so it is easy to see to which certification hierarchy a given certificate belongs, but a given certificate is harder to find initially (though you can of course use the <link linkend="functions-search"
->search bar</link
->).</para>
-
-<para
->In flat mode, all certificates are displayed in a flat list, sorted alphabetically. In this mode, a given certificate is easy to find, but it is not directly clear which root certificate it belongs to.</para>
+<para><action>Toggles between hierarchical and flat keylist mode. </action></para>
+
+<para>In hierarchical mode, certificates are arranged in issuer/subject relation, so it is easy to see to which certification hierarchy a given certificate belongs, but a given certificate is harder to find initially (though you can of course use the <link linkend="functions-search">search bar</link>).</para>
+
+<para>In flat mode, all certificates are displayed in a flat list, sorted alphabetically. In this mode, a given certificate is easy to find, but it is not directly clear which root certificate it belongs to.</para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry id="view-expand-all">
-<term
->&view-expand-all;</term>
+<term>&view-expand-all;</term>
 
 <listitem>
-<para
->(This function is only available when <xref linkend="view-hierarchical-key-list"/> is on.)</para>
+<para>(This function is only available when <xref linkend="view-hierarchical-key-list"/> is on.)</para>
 
-<para
-><action
->Expands all list items in the certificate list view,</action
-> &ie; makes all items visible.</para>
+<para><action>Expands all list items in the certificate list view,</action> &ie; makes all items visible.</para>
 
-<para
->This is the default when entering hierarchical keylist mode.</para>
+<para>This is the default when entering hierarchical keylist mode.</para>
 
-<para
->You can still expand and collapse each individual item by itself, of course.</para>
+<para>You can still expand and collapse each individual item by itself, of course.</para>
 </listitem>
 </varlistentry>
 
 
 
 <varlistentry id="view-collapse-all">
-<term
->&view-collapse-all;</term>
+<term>&view-collapse-all;</term>
 
 <listitem>
-<para
->(This function is only available when <xref linkend="view-hierarchical-key-list"/> is on.)</para>
+<para>(This function is only available when <xref linkend="view-hierarchical-key-list"/> is on.)</para>
 
-<para
-><action
->Collapses all list items in the certificate list view,</action
-> &ie; hides all but the top-level items.</para>
+<para><action>Collapses all list items in the certificate list view,</action> &ie; hides all but the top-level items.</para>
 
-<para
->You can still expand and collapse each individual item by itself, of course.</para>
+<para>You can still expand and collapse each individual item by itself, of course.</para>
 </listitem>
 </varlistentry>
 
@@ -865,98 +365,59 @@
 
 </sect1>
 
-<sect1 id="menucertificates"
-><title
->Certificates Menu</title>
+<sect1 id="menucertificates"><title>Certificates Menu</title>
 
 <variablelist>
 
 <varlistentry id="certificates-validate">
-<term
->&certificates-validate;</term>
+<term>&certificates-validate;</term>
 
 <listitem>
-<para
-><action
->Validates selected (or all) keys.</action
-></para>
-
-<para
->This is similar to <xref linkend="view-redisplay"/>, but performs a validation of the (selected) keys. Validation here means that all relevant CRLs are fetched, and the certificate chain is checked for correctness. As a result, invalid or expired keys will be marked according to your colour and font preferences set in the <link linkend="configuration-appearance"
-><guilabel
->Appearance</guilabel
-> page</link
-> of &kleopatra;'s <link linkend="configuration"
->configure dialogue</link
->.</para>
-
-<warning
-><para
->You can only rely on information from validated keys, and, since any of them may be revoked at any time, even validation is only ever a snapshot of the current state of the local keyring. This is why the backend normally performs such checks whenever the keys are used (&eg; for signing, signature verification, encryption or decryption).</para
-></warning>
+<para><action>Validates selected (or all) keys.</action></para>
+
+<para>This is similar to <xref linkend="view-redisplay"/>, but performs a validation of the (selected) keys. Validation here means that all relevant CRLs are fetched, and the certificate chain is checked for correctness. As a result, invalid or expired keys will be marked according to your colour and font preferences set in the <link linkend="configuration-appearance"><guilabel>Appearance</guilabel> page</link> of &kleopatra;'s <link linkend="configuration">configure dialogue</link>.</para>
+
+<warning><para>You can only rely on information from validated keys, and, since any of them may be revoked at any time, even validation is only ever a snapshot of the current state of the local keyring. This is why the backend normally performs such checks whenever the keys are used (&eg; for signing, signature verification, encryption or decryption).</para></warning>
 </listitem>
 </varlistentry>
 
 
 
 <varlistentry id="certificates-refresh-crls">
-<term
->&certificates-refresh-crls;</term>
+<term>&certificates-refresh-crls;</term>
 
 <listitem>
-<para
-><action
->Fetches the current CRLs for all selected keys,</action
-> even though they would normally not be fetched when using the key.</para>
-
-<para
->This function only has an effect on certificates which define a CRL distribution point. Depending on the backend used, certificates configured to perform checks using OCSP will not be updated.</para>
-
-<para
->You may use this &eg; if you have sideband knowledge that a key has been revoked, and you want the backend to reflect this <emphasis
->now</emphasis
-> instead of relying on this to automatically happen at the next scheduled CRL update.</para>
-
-<warning
-><para
->Excessive use of this function might put a high load on your provider's or company's network, since CRLs of large organisations can be surprisingly big (several megabytes are not uncommon).</para>
-
-<para
->Use this function scarcely.</para
-></warning>
+<para><action>Fetches the current CRLs for all selected keys,</action> even though they would normally not be fetched when using the key.</para>
+
+<para>This function only has an effect on certificates which define a CRL distribution point. Depending on the backend used, certificates configured to perform checks using OCSP will not be updated.</para>
+
+<para>You may use this &eg; if you have sideband knowledge that a key has been revoked, and you want the backend to reflect this <emphasis>now</emphasis> instead of relying on this to automatically happen at the next scheduled CRL update.</para>
+
+<warning><para>Excessive use of this function might put a high load on your provider's or company's network, since CRLs of large organisations can be surprisingly big (several megabytes are not uncommon).</para>
+
+<para>Use this function scarcely.</para></warning>
 </listitem>
 </varlistentry>
 
 
 
 <varlistentry id="certificates-delete">
-<term
->&certificates-delete;</term>
+<term>&certificates-delete;</term>
 
 <listitem>
-<para
-><action
->Deletes selected certificate(s)</action
-> from the local keyring.</para>
-
-<para
->Use this function to remove unused keys from your local keybox. However, since certificates are typically attached to signed emails, verifying an email might result in the key just removed to pop back into the local keybox. So it is probably best to avoid using this function as much as possible. When you are lost, use the <link linkend="functions-search"
->search bar</link
-> or the <xref linkend="view-hierarchical-key-list"/> function to regain control over the lot of certificates.</para>
+<para><action>Deletes selected certificate(s)</action> from the local keyring.</para>
+
+<para>Use this function to remove unused keys from your local keybox. However, since certificates are typically attached to signed emails, verifying an email might result in the key just removed to pop back into the local keybox. So it is probably best to avoid using this function as much as possible. When you are lost, use the <link linkend="functions-search">search bar</link> or the <xref linkend="view-hierarchical-key-list"/> function to regain control over the lot of certificates.</para>
 </listitem>
 </varlistentry>
 
 
 
 <varlistentry id="certificates-download">
-<term
->&certificates-download;</term>
+<term>&certificates-download;</term>
 
 <listitem>
-<para
-><action
->Downloads the selected certificate(s) from the LDAP to the local keybox.</action
-></para>
+<para><action>Downloads the selected certificate(s) from the LDAP to the local keybox.</action></para>
 </listitem>
 </varlistentry>
 
@@ -966,36 +427,25 @@
 
 
 
-<sect1 id="menucrls"
-><title
->CRLs Menu</title>
+<sect1 id="menucrls"><title>CRLs Menu</title>
 
 <variablelist>
 
 <varlistentry id="crls-clear-crl-cache">
-<term
->&crls-clear-crl-cache;</term>
+<term>&crls-clear-crl-cache;</term>
 
 <listitem>
-<para
-><action
->Clears the &gpgsm; CRL cache.</action
-></para>
+<para><action>Clears the &gpgsm; CRL cache.</action></para>
 
-<para
->You probably never need this. You can force a refresh of the CRL cache by selecting all certificates and using <xref linkend="certificates-refresh-crls"/> instead.</para>
+<para>You probably never need this. You can force a refresh of the CRL cache by selecting all certificates and using <xref linkend="certificates-refresh-crls"/> instead.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="crls-dump-crl-cache">
-<term
->&crls-dump-crl-cache;</term>
+<term>&crls-dump-crl-cache;</term>
 
 <listitem>
-<para
-><action
->Shows the detailed contents of the &gpgsm; CRL cache.</action
-></para>
+<para><action>Shows the detailed contents of the &gpgsm; CRL cache.</action></para>
 </listitem>
 </varlistentry>
 
@@ -1003,23 +453,15 @@
 
 </sect1>
 
-<sect1 id="menutools"
-><title
->Tools Menu</title>
+<sect1 id="menutools"><title>Tools Menu</title>
 
 <variablelist>
 
 <varlistentry id="tools-gnupg-log-viewer">
-<term
->&tools-gnupg-log-viewer;</term>
+<term>&tools-gnupg-log-viewer;</term>
 
 <listitem>
-<para
-><action
->Starts <ulink url="help:/kwatchgnupg/index.html"
->&kwatchgnupg;</ulink
-></action
-></para>
+<para><action>Starts <ulink url="help:/kwatchgnupg/index.html">&kwatchgnupg;</ulink></action></para>
 </listitem>
 </varlistentry>
 
@@ -1027,63 +469,43 @@
 
 </sect1>
 
-<sect1 id="menusettings"
-><title
->Settings Menu</title>
+<sect1 id="menusettings"><title>Settings Menu</title>
 
 <variablelist>
 
 <varlistentry id="settings-show-statusbar">
-<term
->&settings-show-statusbar;</term>
+<term>&settings-show-statusbar;</term>
 
 <listitem>
-<para
-><action
->Toggles the visibility of the bottom status bar.</action
-></para>
+<para><action>Toggles the visibility of the bottom status bar.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="settings-configure-shortcuts">
-<term
->&settings-configure-shortcuts;</term>
+<term>&settings-configure-shortcuts;</term>
 
 <listitem>
-<para
-><action
->Opens the standard &kde; shortcut configuration dialogue, where you can assign and re-assign keyboard shortcuts for all menu items.</action
-></para>
+<para><action>Opens the standard &kde; shortcut configuration dialogue, where you can assign and re-assign keyboard shortcuts for all menu items.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="settings-configure-kleopatra">
-<term
->&settings-configure-kleopatra;</term>
+<term>&settings-configure-kleopatra;</term>
 
 <listitem>
-<para
-><action
->Opens &kleopatra;'s configure dialogue.</action
-></para>
+<para><action>Opens &kleopatra;'s configure dialogue.</action></para>
 
-<para
->See <xref linkend="configuration"/> for more details.</para>
+<para>See <xref linkend="configuration"/> for more details.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="settings-configure-gpgme-backend">
-<term
->&settings-configure-gpgme-backend;</term>
+<term>&settings-configure-gpgme-backend;</term>
 
 <listitem>
-<para
-><action
->Opens a dialogue that allows you to configure every aspect of &gpgsm; and other backend modules.</action
-></para>
+<para><action>Opens a dialogue that allows you to configure every aspect of &gpgsm; and other backend modules.</action></para>
 
-<para
->This dialogue is dynamically built from the output of the &gpgconf; utility and may thus change when backend modules are updated.</para>
+<para>This dialogue is dynamically built from the output of the &gpgconf; utility and may thus change when backend modules are updated.</para>
 </listitem>
 </varlistentry>
 
@@ -1091,70 +513,43 @@
 
 </sect1>
 
-<sect1 id="menuhelp"
-><title
->Help Menu</title>
+<sect1 id="menuhelp"><title>Help Menu</title>
 
 
-<para
->The <guimenu
->Help</guimenu
-> menu contains the standard &kde; help menu.</para>
+<para>The <guimenu>Help</guimenu> menu contains the standard &kde; help menu.</para>
 &help.menu.documentation; </sect1>
 
 </chapter>
 
-<chapter id="commandline-options"
-><title
->Command Line Options Reference</title>
+<chapter id="commandline-options"><title>Command Line Options Reference</title>
 
-<para
->Only the options specific to &kleopatra; are listed here. As with all &kde; applications, you can get a complete list of options by issuing the command <userinput
-><command
->kleopatra <option
->--help</option
-></command
-></userinput
->.</para>
+<para>Only the options specific to &kleopatra; are listed here. As with all &kde; applications, you can get a complete list of options by issuing the command <userinput><command>kleopatra <option>--help</option></command></userinput>.</para>
 
 <variablelist>
 
 <varlistentry id="commandline-option-external">
-<term
->&commandline-option-external;</term>
+<term>&commandline-option-external;</term>
 
 <listitem>
-<para
-><action
->Specifies that &commandline-option-query; shall search remotely instead of in the local keybox.</action
-></para>
+<para><action>Specifies that &commandline-option-query; shall search remotely instead of in the local keybox.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="commandline-option-query">
-<term
->&commandline-option-query;</term>
+<term>&commandline-option-query;</term>
 
 <listitem>
-<para
-><action
->Specifies that &kleopatra; shall start with the given query string instead of listing the complete local keybox.</action
-></para>
+<para><action>Specifies that &kleopatra; shall start with the given query string instead of listing the complete local keybox.</action></para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="commandline-option-import-certificate">
-<term
->&commandline-option-import-certificate;</term>
+<term>&commandline-option-import-certificate;</term>
 
 <listitem>
-<para
-><action
->Specifies a file or URL from which to import certificates (or secret keys) from.</action
-></para>
+<para><action>Specifies a file or URL from which to import certificates (or secret keys) from.</action></para>
 
-<para
->This is the command line equivalent of <xref linkend="file-import-certificates"/>.</para>
+<para>This is the command line equivalent of <xref linkend="file-import-certificates"/>.</para>
 </listitem>
 </varlistentry>
 
@@ -1162,304 +557,111 @@
 
 </chapter>
 
-<chapter id="configuration"
-><title
->Configuring &kleopatra;</title>
-
-<para
->&kleopatra;'s configure dialogue can be accessed via <xref linkend="settings-configure-kleopatra"/>.</para>
-
-<para
->Each of its pages is described in the sections below.</para>
-
-<sect1 id="configuration-directory-services"
-><title
->Configuring Directory Services</title>
-
-<para
->On this page, you can configure which LDAP servers to use for certificate searches. You can also configure their order, as well as some selected LDAP-related settings from the dynamic backend configuration dialogue, available via <xref linkend="settings-configure-gpgme-backend"/>.</para>
-
-<para
->To add a new server, click on the <guilabel
->Add Service...</guilabel
-> button. In the dialogue that appears, you can set the <guilabel
->Server name</guilabel
->, the <guilabel
->Port</guilabel
-> (preset to the default LDAP port), the <guilabel
->Base DN</guilabel
-> (sometimes referred to as the search root or search base), and the usual <guilabel
->User name</guilabel
-> and <guilabel
->Password</guilabel
->, both of which are only needed if the server requires authentication. Clicking <guilabel
->OK</guilabel
-> adds the server details to the list of servers, while <guilabel
->Cancel</guilabel
-> dismisses the input.</para>
-
-<para
->To remove a server from the search list, select it in the list, then press the <guilabel
->Remove Service</guilabel
-> button.</para>
-
-<para
->To change the relative search order of servers, select one of them and move it up or down with the arrow buttons right next to the list.</para>
-
-<para
->To set the LDAP timeout, &ie; the maximum time the backend will wait for a server to respond, simply use the corresponding input field labelled <guilabel
->LDAP timeout</guilabel
->.</para>
-
-<para
->If one of your servers has a large database, so that even reasonable searches like <userinput
->Smith</userinput
-> hit the <guilabel
->maximum number of items returned by query</guilabel
->, you might want to increase this limit. You can find out easily if you hit the limit during a search, since a dialogue box will pop up in that case, telling you that the results have been truncated.</para>
-
-<note
-><para
->Some servers may impose their own limits on the number of items returned from a query. In this case, increasing the limit here will not result in more returned items.</para
-></note>
+<chapter id="configuration"><title>Configuring &kleopatra;</title>
+
+<para>&kleopatra;'s configure dialogue can be accessed via <xref linkend="settings-configure-kleopatra"/>.</para>
+
+<para>Each of its pages is described in the sections below.</para>
+
+<sect1 id="configuration-directory-services"><title>Configuring Directory Services</title>
+
+<para>On this page, you can configure which LDAP servers to use for certificate searches. You can also configure their order, as well as some selected LDAP-related settings from the dynamic backend configuration dialogue, available via <xref linkend="settings-configure-gpgme-backend"/>.</para>
+
+<para>To add a new server, click on the <guilabel>Add Service...</guilabel> button. In the dialogue that appears, you can set the <guilabel>Server name</guilabel>, the <guilabel>Port</guilabel> (preset to the default LDAP port), the <guilabel>Base DN</guilabel> (sometimes referred to as the search root or search base), and the usual <guilabel>User name</guilabel> and <guilabel>Password</guilabel>, both of which are only needed if the server requires authentication. Clicking <guilabel>OK</guilabel> adds the server details to the list of servers, while <guilabel>Cancel</guilabel> dismisses the input.</para>
+
+<para>To remove a server from the search list, select it in the list, then press the <guilabel>Remove Service</guilabel> button.</para>
+
+<para>To change the relative search order of servers, select one of them and move it up or down with the arrow buttons right next to the list.</para>
+
+<para>To set the LDAP timeout, &ie; the maximum time the backend will wait for a server to respond, simply use the corresponding input field labelled <guilabel>LDAP timeout</guilabel>.</para>
+
+<para>If one of your servers has a large database, so that even reasonable searches like <userinput>Smith</userinput> hit the <guilabel>maximum number of items returned by query</guilabel>, you might want to increase this limit. You can find out easily if you hit the limit during a search, since a dialogue box will pop up in that case, telling you that the results have been truncated.</para>
+
+<note><para>Some servers may impose their own limits on the number of items returned from a query. In this case, increasing the limit here will not result in more returned items.</para></note>
 
 </sect1>
 
-<sect1 id="configuration-appearance"
-><title
->Configuring Visual Appearance</title>
+<sect1 id="configuration-appearance"><title>Configuring Visual Appearance</title>
 
-<para
->&kleopatra; allows you to customise the appearance of (validated) keys in the list view. This includes the foreground (text) and background colours, as well as the font.</para>
+<para>&kleopatra; allows you to customise the appearance of (validated) keys in the list view. This includes the foreground (text) and background colours, as well as the font.</para>
 
-<para
->Each <guilabel
->Key Category</guilabel
-> on the left is assigned a set of colours and a font in which keys belonging to that category are displayed. The category list also acts as a preview of the settings. Categories can be freely defined by the administrator or the power user, see <xref linkend="admin-key-filters"/> in <xref linkend="admin"/>.</para>
+<para>Each <guilabel>Key Category</guilabel> on the left is assigned a set of colours and a font in which keys belonging to that category are displayed. The category list also acts as a preview of the settings. Categories can be freely defined by the administrator or the power user, see <xref linkend="admin-key-filters"/> in <xref linkend="admin"/>.</para>
 
-<para
->To change the text (foreground) colour of a category, select it in the list, and press the <guilabel
->Set Text Colour...</guilabel
-> button. The standard &kde; colour selection dialogue will appear where you can select or create a new colour.</para>
+<para>To change the text (foreground) colour of a category, select it in the list, and press the <guilabel>Set Text Colour...</guilabel> button. The standard &kde; colour selection dialogue will appear where you can select or create a new colour.</para>
 
-<para
->Changing the background colour is done in the same way, just press <guilabel
->Set Background Colour...</guilabel
-> instead.</para>
+<para>Changing the background colour is done in the same way, just press <guilabel>Set Background Colour...</guilabel> instead.</para>
 
-<para
->To change the font, you basically have two options:</para>
+<para>To change the font, you basically have two options:</para>
 
 <orderedlist>
-<listitem
-><para
->Modify the standard font, used for all list views in &kde;</para
-></listitem>
-<listitem
-><para
->Use a custom font.</para
-></listitem>
+<listitem><para>Modify the standard font, used for all list views in &kde;</para></listitem>
+<listitem><para>Use a custom font.</para></listitem>
 </orderedlist>
 
-<para
->The first option has the advantage that the font will follow whichever style you choose &kde;-wide, whereas the latter gives you full control over the font to use. The choice is yours.</para>
+<para>The first option has the advantage that the font will follow whichever style you choose &kde;-wide, whereas the latter gives you full control over the font to use. The choice is yours.</para>
 
-<para
->To use the modified standard font, select the category in the list, and tick or un-tick the font modifiers <guilabel
->Italic</guilabel
->, <guilabel
->Bold</guilabel
->, and/or <guilabel
->Strikeout</guilabel
->. You can immediately see the effect on the font in the category list.</para>
+<para>To use the modified standard font, select the category in the list, and tick or un-tick the font modifiers <guilabel>Italic</guilabel>, <guilabel>Bold</guilabel>, and/or <guilabel>Strikeout</guilabel>. You can immediately see the effect on the font in the category list.</para>
 
-<para
->To use a custom font, press the <guilabel
->Set Font...</guilabel
-> button. The standard &kde; font selection dialogue will appear where you can select the new font. Note that you can still use the font modifiers to change the custom font, just as for modifying the standard font.</para>
+<para>To use a custom font, press the <guilabel>Set Font...</guilabel> button. The standard &kde; font selection dialogue will appear where you can select the new font. Note that you can still use the font modifiers to change the custom font, just as for modifying the standard font.</para>
 
-<para
->To switch back to the standard font, you need to press the <guilabel
->Default Appearance</guilabel
-> button.</para>
+<para>To switch back to the standard font, you need to press the <guilabel>Default Appearance</guilabel> button.</para>
 
 </sect1>
 
-<sect1 id="configuration-dn-order"
-><title
->Configuring the Order DN Attributes are Shown</title>
-
-<para
->Although &dn;s are hierarchical, the order of the individual components (called relative &dn;s (RDNs), or &dn; attributes) is not defined. The order in which the attributes are shown is thus a matter of personal taste or company policy, which is why it is configurable in &kleopatra;.</para>
-
-<note
-><para
->This setting does not only apply to &kleopatra;, but to all applications using &kleopatra; Technology. At the time of this writing, these include KMail, KAddressBook, as well as &kleopatra; itself, of course.</para
-></note>
-
-<para
->This configuration page basically consists of two lists, one for the known attributes (<guilabel
->Available attributes</guilabel
->), and one describing the <guilabel
->Current attribute order</guilabel
->.</para>
-
-<para
->Both lists contain entries described by the short from of the attribute (&eg; <guilabel
->CN</guilabel
->) as well as the spelled-out form (<guilabel
->Common Name</guilabel
->).</para>
-
-<para
->The <guilabel
->Available attributes</guilabel
-> list is always sorted alphabetically, while the <guilabel
->Current attribute order</guilabel
-> list's order reflects the configured &dn; attribute order: the first attribute in the list is also the one displayed first.</para>
-
-<para
->Only attributes explicitly listed in the <guilabel
->Current attribute order</guilabel
-> list are displayed at all. The rest is hidden by default.</para>
-
-<para
->However, if the placeholder entry <guilabel
->_X_</guilabel
-> (<guilabel
->All others</guilabel
->) is in the <quote
->current</quote
-> list, all unlisted attributes (whether known or not), are inserted at the point of <guilabel
->_X_</guilabel
->, in their original relative order.</para>
-
-<para
->A small example will help to make this more clear:</para>
+<sect1 id="configuration-dn-order"><title>Configuring the Order DN Attributes are Shown</title>
+
+<para>Although &dn;s are hierarchical, the order of the individual components (called relative &dn;s (RDNs), or &dn; attributes) is not defined. The order in which the attributes are shown is thus a matter of personal taste or company policy, which is why it is configurable in &kleopatra;.</para>
+
+<note><para>This setting does not only apply to &kleopatra;, but to all applications using &kleopatra; Technology. At the time of this writing, these include KMail, KAddressBook, as well as &kleopatra; itself, of course.</para></note>
+
+<para>This configuration page basically consists of two lists, one for the known attributes (<guilabel>Available attributes</guilabel>), and one describing the <guilabel>Current attribute order</guilabel>.</para>
+
+<para>Both lists contain entries described by the short from of the attribute (&eg; <guilabel>CN</guilabel>) as well as the spelled-out form (<guilabel>Common Name</guilabel>).</para>
+
+<para>The <guilabel>Available attributes</guilabel> list is always sorted alphabetically, while the <guilabel>Current attribute order</guilabel> list's order reflects the configured &dn; attribute order: the first attribute in the list is also the one displayed first.</para>
+
+<para>Only attributes explicitly listed in the <guilabel>Current attribute order</guilabel> list are displayed at all. The rest is hidden by default.</para>
+
+<para>However, if the placeholder entry <guilabel>_X_</guilabel> (<guilabel>All others</guilabel>) is in the <quote>current</quote> list, all unlisted attributes (whether known or not), are inserted at the point of <guilabel>_X_</guilabel>, in their original relative order.</para>
+
+<para>A small example will help to make this more clear:</para>
 
 <informalexample>
-<para
->Given the &dn;</para>
-<blockquote
-> <para
-> O=KDE, C=US, CN=Dave Devel, X-BAR=foo, OU=Kleopatra, X-FOO=bar, </para
-> </blockquote
-> <para
->the default attribute order of <quote
->CN, L, _X_, OU, O, C</quote
-> will produce the following formatted &dn;:</para
-> <blockquote
-> <para
-> CN=Dave Devel, X-BAR=foo, X-FOO=bar, OU=Kleopatra, O=KDE, C=US </para
-> </blockquote
-> <para
->while <quote
->CN, L, OU, O, C</quote
-> will produce</para
-> <blockquote
-> <para
-> CN=Dave Devel, OU=Kleopatra, O=KDE, C=US </para
-> </blockquote
-> </informalexample>
-
-<para
->To add an attribute to the display order list, select it in the <guilabel
->Available attributes</guilabel
-> list, and press the <guilabel
->Add to current attribute order</guilabel
-> button.</para>
-
-<para
->To remove an attribute from the display order list, select it in the <guilabel
->Current attribute order</guilabel
-> list, and press the <guilabel
->Remove from current attribute order</guilabel
-> button.</para>
-
-<para
->To move an attribute to the beginning (end), select it in the <guilabel
->Current attribute order</guilabel
-> list, and press the <guilabel
->Move to top</guilabel
-> (<guilabel
->Move to bottom</guilabel
->) button.</para>
-
-<para
->To move an attribute up (down) one slot only, select it in the <guilabel
->Current attribute order</guilabel
-> list, and press the <guilabel
->Move one up</guilabel
-> (<guilabel
->Move one down</guilabel
->) button.</para>
+<para>Given the &dn;</para>
+<blockquote> <para> O=KDE, C=US, CN=Dave Devel, X-BAR=foo, OU=Kleopatra, X-FOO=bar, </para> </blockquote> <para>the default attribute order of <quote>CN, L, _X_, OU, O, C</quote> will produce the following formatted &dn;:</para> <blockquote> <para> CN=Dave Devel, X-BAR=foo, X-FOO=bar, OU=Kleopatra, O=KDE, C=US </para> </blockquote> <para>while <quote>CN, L, OU, O, C</quote> will produce</para> <blockquote> <para> CN=Dave Devel, OU=Kleopatra, O=KDE, C=US </para> </blockquote> </informalexample>
+
+<para>To add an attribute to the display order list, select it in the <guilabel>Available attributes</guilabel> list, and press the <guilabel>Add to current attribute order</guilabel> button.</para>
+
+<para>To remove an attribute from the display order list, select it in the <guilabel>Current attribute order</guilabel> list, and press the <guilabel>Remove from current attribute order</guilabel> button.</para>
+
+<para>To move an attribute to the beginning (end), select it in the <guilabel>Current attribute order</guilabel> list, and press the <guilabel>Move to top</guilabel> (<guilabel>Move to bottom</guilabel>) button.</para>
+
+<para>To move an attribute up (down) one slot only, select it in the <guilabel>Current attribute order</guilabel> list, and press the <guilabel>Move one up</guilabel> (<guilabel>Move one down</guilabel>) button.</para>
 
 </sect1>
 
 </chapter>
 
-<chapter id="admin"
-><title
->Administrator's Guide</title>
-
-<para
->This Administrator's Guide describes ways to customise &kleopatra; that are not accessible via the GUI, but only via config files.</para>
-
-<para
->It is assumed that the reader is familiar with the technology used for &kde; application configuration, including layout, filesystem location and cascading of &kde; config files, as well as the KIOSK framework.</para>
-
-<sect1 id="admin-certificate-request-wizard"
-><title
->Customisation of the Certificate-Creation Wizard</title>
-
-<para
->&kleopatra; allows you to customise the fields that the user is allowed to enter in order to create their certificate.</para>
-
-<para
->Create a group called <literal
->CertificateCreationWizard</literal
-> in the system-wide <filename
->kleopatrarc</filename
->. If you want a custom order of attributes or if you only want certain items to appear, create a key called <varname
->DNAttributeOrder</varname
->. The argument is one or more of <varname
->CN,SN,GN,L,T,OU,O,PC,C,SP,DC,BC,EMAIL</varname
-> If you want to initialise fields with a certain value, write something like Attribute=value. If you want the attribute to be treated as a required one, append an exclamation mark (e.g. <varname
->CN!,L,OU,O!,C!,EMAIL!</varname
->, which happens to be the default configuration).</para>
-
-<para
->Using the <acronym
->KIOSK</acronym
-> mode modifier <varname
->$e</varname
-> allows to retrieve the values from environment variables or from an evaluated script or binary. If you want to disallow editing of the respective field in addition, use the modifier <varname
->$i</varname
->. If you want to disallow the use <guibutton
->Insert My Address</guibutton
-> button, set <varname
->ShowSetWhoAmI</varname
-> to false.</para>
-
-<tip
-><para
->Due to the nature of the &kde; <acronym
->KIOSK</acronym
-> framework, using the immutable flag (<varname
->$i</varname
->) makes it impossible for the user to override the flag. This is intended behaviour. <varname
->$i</varname
-> and <varname
->$e</varname
-> can be used with all other config keys in &kde; applications as well.</para
-></tip>
-
-<para
->The following example outlines possible customisations:</para>
+<chapter id="admin"><title>Administrator's Guide</title>
+
+<para>This Administrator's Guide describes ways to customise &kleopatra; that are not accessible via the GUI, but only via config files.</para>
+
+<para>It is assumed that the reader is familiar with the technology used for &kde; application configuration, including layout, filesystem location and cascading of &kde; config files, as well as the KIOSK framework.</para>
+
+<sect1 id="admin-certificate-request-wizard"><title>Customisation of the Certificate-Creation Wizard</title>
+
+<para>&kleopatra; allows you to customise the fields that the user is allowed to enter in order to create their certificate.</para>
+
+<para>Create a group called <literal>CertificateCreationWizard</literal> in the system-wide <filename>kleopatrarc</filename>. If you want a custom order of attributes or if you only want certain items to appear, create a key called <varname>DNAttributeOrder</varname>. The argument is one or more of <varname>CN,SN,GN,L,T,OU,O,PC,C,SP,DC,BC,EMAIL</varname> If you want to initialise fields with a certain value, write something like Attribute=value. If you want the attribute to be treated as a required one, append an exclamation mark (e.g. <varname>CN!,L,OU,O!,C!,EMAIL!</varname>, which happens to be the default configuration).</para>
+
+<para>Using the <acronym>KIOSK</acronym> mode modifier <varname>$e</varname> allows to retrieve the values from environment variables or from an evaluated script or binary. If you want to disallow editing of the respective field in addition, use the modifier <varname>$i</varname>. If you want to disallow the use <guibutton>Insert My Address</guibutton> button, set <varname>ShowSetWhoAmI</varname> to false.</para>
+
+<tip><para>Due to the nature of the &kde; <acronym>KIOSK</acronym> framework, using the immutable flag (<varname>$i</varname>) makes it impossible for the user to override the flag. This is intended behaviour. <varname>$i</varname> and <varname>$e</varname> can be used with all other config keys in &kde; applications as well.</para></tip>
+
+<para>The following example outlines possible customisations:</para>
 
 <para>
-<programlisting
->[CertificateCreationWizard] 
+<programlisting>[CertificateCreationWizard] 
 ;Disallow to copy personal data from the addressbook, do not allow local override
 ShowSetWhoAmI[$i]=false
 
@@ -1481,394 +683,175 @@ C=DE
 
     <sect1 id="admin-key-filters">
 
-      <title
->Creating and Editing Key Categories </title>
-
-      <para
->&kleopatra; allows the user to configure the <link linkend="configuration-appearance"
->visual appearance</link
-> of keys based on a concept called <guilabel
->Key Categories</guilabel
->. This section describes how you can edit the available categories and add new ones. </para>
-
-      <para
->When trying to find the category a key belongs to, &kleopatra; tries to match the key to a sequence of key filters, configured in the <filename
->libkleopatrarc</filename
->. The first one to match defines the category. </para>
-
-      <para
->Each key filter is defined in a config group named <literal
->Key Filter #<replaceable
->n</replaceable
-></literal
->, where <replaceable
->n</replaceable
-> is a number, starting from <literal
->0</literal
->. </para>
-
-      <para
->The only mandatory key in a <literal
->Key Filter #<replaceable
->n</replaceable
-></literal
-> group is <varname
->Name</varname
->, containing the name of the category as displayed in the <link linkend="configuration-appearance"
->config dialogue</link
->. </para>
-
-      <para
-><xref linkend="table-key-filters-appearance"/> lists all keys that define the display properties of keys belonging to that category (&ie; those keys that can be adjusted in the <link linkend="configuration-appearance"
->config dialogue</link
->), whereas <xref linkend="table-key-filters-criteria"/> lists all keys that define the criteria the filter matches keys against. </para>
+      <title>Creating and Editing Key Categories </title>
+
+      <para>&kleopatra; allows the user to configure the <link linkend="configuration-appearance">visual appearance</link> of keys based on a concept called <guilabel>Key Categories</guilabel>. This section describes how you can edit the available categories and add new ones. </para>
+
+      <para>When trying to find the category a key belongs to, &kleopatra; tries to match the key to a sequence of key filters, configured in the <filename>libkleopatrarc</filename>. The first one to match defines the category. </para>
+
+      <para>Each key filter is defined in a config group named <literal>Key Filter #<replaceable>n</replaceable></literal>, where <replaceable>n</replaceable> is a number, starting from <literal>0</literal>. </para>
+
+      <para>The only mandatory key in a <literal>Key Filter #<replaceable>n</replaceable></literal> group is <varname>Name</varname>, containing the name of the category as displayed in the <link linkend="configuration-appearance">config dialogue</link>. </para>
+
+      <para><xref linkend="table-key-filters-appearance"/> lists all keys that define the display properties of keys belonging to that category (&ie; those keys that can be adjusted in the <link linkend="configuration-appearance">config dialogue</link>), whereas <xref linkend="table-key-filters-criteria"/> lists all keys that define the criteria the filter matches keys against. </para>
 
       <table id="table-key-filters-appearance">
-	<title
->Key-Filter Configuration Keys Defining Display Properties</title>
+	<title>Key-Filter Configuration Keys Defining Display Properties</title>
 	<tgroup cols="3">
 	  <colspec colnum="2" align="center"/>
 	  <thead>
 	    <row>
-	      <entry
->Config Key</entry>
-	      <entry
->Type</entry>
-	      <entry
->Description</entry>
+	      <entry>Config Key</entry>
+	      <entry>Type</entry>
+	      <entry>Description</entry>
 	    </row>
 	  </thead>
 	  <!--tfoot/-->
 	  <tbody>
 	    <row>
-	      <entry
-><varname
->background-color</varname
-></entry>
-	      <entry
->color</entry>
-	      <entry
->The background colour to use. If missing, defaults to whichever background colour is defined globally for list views. </entry>
+	      <entry><varname>background-color</varname></entry>
+	      <entry>color</entry>
+	      <entry>The background colour to use. If missing, defaults to whichever background colour is defined globally for list views. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->foreground-color</varname
-></entry>
-	      <entry
->color</entry>
-	      <entry
->The foreground colour to use. If missing, defaults to whichever foreground colour is defined globally for list views. </entry>
+	      <entry><varname>foreground-color</varname></entry>
+	      <entry>color</entry>
+	      <entry>The foreground colour to use. If missing, defaults to whichever foreground colour is defined globally for list views. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->font</varname
-></entry>
-	      <entry
->font</entry>
-	      <entry
->The custom font to use. The font will be scaled to the size configured for list views, and any font attributes (see below) will be applied. </entry>
+	      <entry><varname>font</varname></entry>
+	      <entry>font</entry>
+	      <entry>The custom font to use. The font will be scaled to the size configured for list views, and any font attributes (see below) will be applied. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->font-bold</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->If set to <literal
->true</literal
-> and <varname
->font</varname
-> is not set, uses the default list view font with bold font style added (if available). Ignored if <varname
->font</varname
-> is also present. </entry>
+	      <entry><varname>font-bold</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>If set to <literal>true</literal> and <varname>font</varname> is not set, uses the default list view font with bold font style added (if available). Ignored if <varname>font</varname> is also present. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->font-italic</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->Analogous to <varname
->font-bold</varname
->, but for italic font style instead of bold. </entry>
+	      <entry><varname>font-italic</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>Analogous to <varname>font-bold</varname>, but for italic font style instead of bold. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->font-strikeout</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->If <literal
->true</literal
->, draws a centred line over the font. Applied even if <varname
->font</varname
-> is set. </entry>
+	      <entry><varname>font-strikeout</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>If <literal>true</literal>, draws a centred line over the font. Applied even if <varname>font</varname> is set. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->icon</varname
-></entry>
-	      <entry
->text</entry>
-	      <entry
->The name of an icon to show in the first column. Not yet implemented. </entry>
+	      <entry><varname>icon</varname></entry>
+	      <entry>text</entry>
+	      <entry>The name of an icon to show in the first column. Not yet implemented. </entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </table>
 
       <table id="table-key-filters-criteria">
-	<title
->Key-Filter Configuration Keys Defining Filter Criteria</title>
+	<title>Key-Filter Configuration Keys Defining Filter Criteria</title>
 	<tgroup cols="3">
 	  <colspec colnum="2" align="center"/>
 	  <thead>
 	    <row>
-	      <entry
->Config Key</entry>
-	      <entry
->Type</entry>
-	      <entry
->If specified, filter matches when...</entry>
+	      <entry>Config Key</entry>
+	      <entry>Type</entry>
+	      <entry>If specified, filter matches when...</entry>
 	    </row>
 	  </thead>
 	  <!--tfoot/-->
 	  <tbody>
 	    <row>
-	      <entry
-><varname
->is-revoked</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key has been revoked.</entry>
+	      <entry><varname>is-revoked</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key has been revoked.</entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->is-expired</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key is expired.</entry>
+	      <entry><varname>is-expired</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key is expired.</entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->is-disabled</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key has been disabled (marked for not using) by the user. Ignored for S/MIME keys. </entry>
+	      <entry><varname>is-disabled</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key has been disabled (marked for not using) by the user. Ignored for S/MIME keys. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->is-root-certificate</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key is a root certificate. Ignored for OpenPGP keys. </entry>
+	      <entry><varname>is-root-certificate</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key is a root certificate. Ignored for OpenPGP keys. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->can-encrypt</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key can be used for encryption. </entry>
+	      <entry><varname>can-encrypt</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key can be used for encryption. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->can-sign</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key can be used for signing. </entry>
+	      <entry><varname>can-sign</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key can be used for signing. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->can-certify</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key can be used for signing (certifying) other keys. </entry>
+	      <entry><varname>can-certify</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key can be used for signing (certifying) other keys. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->can-authenticate</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key can be used for authentication (&eg; as an <acronym
->TLS</acronym
-> client certificate). </entry>
+	      <entry><varname>can-authenticate</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key can be used for authentication (&eg; as an <acronym>TLS</acronym> client certificate). </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->has-secret-key</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the secret key for this key pair is available. </entry>
+	      <entry><varname>has-secret-key</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the secret key for this key pair is available. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->is-openpgp-key</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key is an OpenPGP key (<literal
->true</literal
->), or an S/MIME key (<literal
->false</literal
->). </entry>
+	      <entry><varname>is-openpgp-key</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key is an OpenPGP key (<literal>true</literal>), or an S/MIME key (<literal>false</literal>). </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
->was-validated</varname
-></entry>
-	      <entry
->boolean</entry>
-	      <entry
->the key has been validated (see <xref linkend="certificates-validate"/>). </entry>
+	      <entry><varname>was-validated</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>the key has been validated (see <xref linkend="certificates-validate"/>). </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
-><replaceable
->prefix</replaceable
->-ownertrust</varname
-></entry>
-	      <entry
->validity<footnote
-> <para
->Validity is an (ordered) enumeration with the following allowed values: <literal
->unknown</literal
->, <literal
->undefined</literal
->, <literal
->never</literal
->, <literal
->marginal</literal
->, <literal
->full</literal
->, <literal
->ultimate</literal
->. See the &gpg; and &gpgsm; manuals for a detailed explanation. </para>
+	      <entry><varname><replaceable>prefix</replaceable>-ownertrust</varname></entry>
+	      <entry>validity<footnote> <para>Validity is an (ordered) enumeration with the following allowed values: <literal>unknown</literal>, <literal>undefined</literal>, <literal>never</literal>, <literal>marginal</literal>, <literal>full</literal>, <literal>ultimate</literal>. See the &gpg; and &gpgsm; manuals for a detailed explanation. </para>
 		</footnote>
 	      </entry>
-	      <entry
->the key has exactly (<replaceable
->prefix</replaceable
->&nbsp;=&nbsp;<literal
->is</literal
->), has anything but (<replaceable
->prefix</replaceable
->&nbsp;=&nbsp;<literal
->is-not</literal
->), has at least (<replaceable
->prefix</replaceable
->&nbsp;=&nbsp;<literal
->is-at-least</literal
->), or has at most (<replaceable
->prefix</replaceable
->&nbsp;=&nbsp;<literal
->is-at-most</literal
->) the ownertrust given as the value of the config key. If more than one <varname
-><replaceable
->prefix</replaceable
->-ownertrust</varname
-> keys (with different <replaceable
->prefix</replaceable
-> values) are present in a single group, the behaviour is undefined. </entry>
+	      <entry>the key has exactly (<replaceable>prefix</replaceable>&nbsp;=&nbsp;<literal>is</literal>), has anything but (<replaceable>prefix</replaceable>&nbsp;=&nbsp;<literal>is-not</literal>), has at least (<replaceable>prefix</replaceable>&nbsp;=&nbsp;<literal>is-at-least</literal>), or has at most (<replaceable>prefix</replaceable>&nbsp;=&nbsp;<literal>is-at-most</literal>) the ownertrust given as the value of the config key. If more than one <varname><replaceable>prefix</replaceable>-ownertrust</varname> keys (with different <replaceable>prefix</replaceable> values) are present in a single group, the behaviour is undefined. </entry>
 	    </row>
 	    <row>
-	      <entry
-><varname
-><replaceable
->prefix</replaceable
->-validity</varname
-></entry>
-	      <entry
->validity</entry>
-	      <entry
->Analogous to <varname
-><replaceable
->prefix</replaceable
->-ownertrust</varname
->, but for key validity instead of ownertrust. </entry>
+	      <entry><varname><replaceable>prefix</replaceable>-validity</varname></entry>
+	      <entry>validity</entry>
+	      <entry>Analogous to <varname><replaceable>prefix</replaceable>-ownertrust</varname>, but for key validity instead of ownertrust. </entry>
 	    </row>
 	  </tbody>
 	</tgroup>
       </table>
 
       <note>
-	<para
->Some of the more interesting criteria, such as <varname
->is-revoked</varname
-> or <varname
->is-expired</varname
-> will only work on <emphasis
->validated</emphasis
-> keys, which is why, by default, only validated keys are checked for revocation and expiration, although you are free to remove these extra checks. </para>
+	<para>Some of the more interesting criteria, such as <varname>is-revoked</varname> or <varname>is-expired</varname> will only work on <emphasis>validated</emphasis> keys, which is why, by default, only validated keys are checked for revocation and expiration, although you are free to remove these extra checks. </para>
       </note>
 
-      <para
->In general, criteria not specified (&ie; the config entry is not set) are not checked for. If a criterion is given, it is checked for and must match for the filter as a whole to match, &ie; the criteria are AND'ed together. </para>
+      <para>In general, criteria not specified (&ie; the config entry is not set) are not checked for. If a criterion is given, it is checked for and must match for the filter as a whole to match, &ie; the criteria are AND'ed together. </para>
 
       <example>
-	<title
->Examples of key filters </title>
-	<para
->To check for all expired, but non-revoked root certificates, you would use a key filter defined as follows: </para>
+	<title>Examples of key filters </title>
+	<para>To check for all expired, but non-revoked root certificates, you would use a key filter defined as follows: </para>
 <!-- isn't there a better way to not indent this in the output??? -->
-	<screen
-><!--
--->[Key Filter #<replaceable
->n</replaceable
->]
+	<screen><!--
+-->[Key Filter #<replaceable>n</replaceable>]
 Name=expired, but not revoked
 was-validated=true
 is-expired=true
 is-revoked=false
 is-root-certificate=true<!--
      --></screen>
-	<para
->To check for all disabled OpenPGP keys (not yet supported by &kleopatra;) with ownertrust of at least <quote
->marginal</quote
->, you would use: </para>
-	<screen
-><!--
--->[Key Filter #<replaceable
->n</replaceable
->]
+	<para>To check for all disabled OpenPGP keys (not yet supported by &kleopatra;) with ownertrust of at least <quote>marginal</quote>, you would use: </para>
+	<screen><!--
+-->[Key Filter #<replaceable>n</replaceable>]
 Name=disabled OpenPGP keys with marginal or better ownertrust
 is-openpgp=true
 is-disabled=true
@@ -1878,57 +861,34 @@ is-at-least-ownertrust=marginal<!--
 
     </sect1>
 
-  </chapter
-> <!-- Administrator's Guide -->
+  </chapter> <!-- Administrator's Guide -->
 
 <chapter id="credits-and-license">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&kleopatra; copyright 2002 Steffen Hansen, Matthias Kalle Dalheimer and Jesper Pedersen., copyright 2004 Daniel Molkentin, copyright 2004 Klar&auml;lvdalens Datakonsult AB</para>
+<para>&kleopatra; copyright 2002 Steffen Hansen, Matthias Kalle Dalheimer and Jesper Pedersen., copyright 2004 Daniel Molkentin, copyright 2004 Klar&auml;lvdalens Datakonsult AB</para>
 
-<para
->Documentation copyright 2002 Steffen Hansen, copyright 2004 Daniel Molkentin, copyright 2004 Klar&auml;lvdalens Datakonsult AB</para>
+<para>Documentation copyright 2002 Steffen Hansen, copyright 2004 Daniel Molkentin, copyright 2004 Klar&auml;lvdalens Datakonsult AB</para>
 
 <itemizedlist>
-<title
->Contributors</title>
+<title>Contributors</title>
 <listitem>
-<para
->Marc Mutz <email
->mutz@kde.org</email
-></para>
+<para>Marc Mutz <email>mutz@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->David Faure <email
->faure@kde.org</email
-></para>
+<para>David Faure <email>faure@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->Steffen Hansen <email
->hansen@kde.org</email
-></para>
+<para>Steffen Hansen <email>hansen@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->Matthias Kalle Dalheimer <email
->kalle@kde.org</email
-></para>
+<para>Matthias Kalle Dalheimer <email>kalle@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->Jesper Pedersen <email
->blackie@kde.org</email
-></para>
+<para>Jesper Pedersen <email>blackie@kde.org</email></para>
 </listitem>
 <listitem>
-<para
->Daniel Molkentin <email
->molkentin@kde.org</email
-></para>
+<para>Daniel Molkentin <email>molkentin@kde.org</email></para>
 </listitem>
 </itemizedlist>
 &underGPL; &underFDL; </chapter>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/configure.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/configure.docbook
index eb9333ab2ea..920b5cbfbe2 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/configure.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/configure.docbook
@@ -2,261 +2,103 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->Marc</firstname
-> <surname
->Mutz</surname
-> <affiliation
-><orgname
->Klar&auml;lvdalens Datakonsult AB</orgname
-> <address
-> <email
->mutz@kde.org</email
-> </address
-> </affiliation>
+<author><firstname>Marc</firstname> <surname>Mutz</surname> <affiliation><orgname>Klar&auml;lvdalens Datakonsult AB</orgname> <address> <email>mutz@kde.org</email> </address> </affiliation>
 </author>
-<author
-><firstname
->Michel</firstname
-> <surname
->Boyer de la Giroday</surname
-> <affiliation
-><address
-> <email
->michel@klaralvdalens-datakonsult.se</email>
-</address
-></affiliation>
+<author><firstname>Michel</firstname> <surname>Boyer de la Giroday</surname> <affiliation><address> <email>michel@klaralvdalens-datakonsult.se</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-13</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-13</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Configure &kmail;</title>
+<title>Configure &kmail;</title>
 
 <sect1 id="configure-generalinfo">
-<title
->General Information</title>
+<title>General Information</title>
 
-<para
->&kmail;'s configuration window enables you to configure &kmail; in many ways. You can reach it via <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
->.</para>
+<para>&kmail;'s configuration window enables you to configure &kmail; in many ways. You can reach it via <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice>.</para>
 
-<para
->It is divided into six pages, each of them represented by one of the icons in the list on the left hand side of the dialogue. Below the pages will be described in detail.</para>
+<para>It is divided into six pages, each of them represented by one of the icons in the list on the left hand side of the dialogue. Below the pages will be described in detail.</para>
 
-<para
->The dialogue has several buttons:</para>
+<para>The dialogue has several buttons:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guibutton
->Help</guibutton
-></term>
-<listitem
-><para
->This will open this manual at the appropriate page.</para
-></listitem>
+<term><guibutton>Help</guibutton></term>
+<listitem><para>This will open this manual at the appropriate page.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Defaults</guibutton
-></term>
-<listitem
-><para
->This will reset the configuration options on the current page back to the default values.</para
-></listitem>
+<term><guibutton>Defaults</guibutton></term>
+<listitem><para>This will reset the configuration options on the current page back to the default values.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Load Profile...</guibutton
-></term>
-<listitem
-><para
->This will open a dialogue which offers several configuration profiles. You can use these as starting points for your own configuration.</para
-></listitem>
+<term><guibutton>Load Profile...</guibutton></term>
+<listitem><para>This will open a dialogue which offers several configuration profiles. You can use these as starting points for your own configuration.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Reset</guibutton
-></term>
-<listitem
-><para
->This resets all changes you have made since you last saved the settings.</para
-></listitem>
+<term><guibutton>Reset</guibutton></term>
+<listitem><para>This resets all changes you have made since you last saved the settings.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->OK</guibutton
-></term>
-<listitem
-><para
->This saves the settings and closes the configuration dialogue.</para
-></listitem>
+<term><guibutton>OK</guibutton></term>
+<listitem><para>This saves the settings and closes the configuration dialogue.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Apply</guibutton
-></term>
-<listitem
-><para
->This saves the settings without closing the configuration dialogue.</para
-></listitem>
+<term><guibutton>Apply</guibutton></term>
+<listitem><para>This saves the settings without closing the configuration dialogue.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guibutton
->Cancel</guibutton
-></term>
-<listitem
-><para
->This closes the configuration dialogue without saving the changes you have made.</para
-></listitem>
+<term><guibutton>Cancel</guibutton></term>
+<listitem><para>This closes the configuration dialogue without saving the changes you have made.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect1>
 
 <sect1 id="configure-identity">
-<title
->Identities Page</title>
-
-<para
->You can find a quick introduction to the <guilabel
->Identities</guilabel
-> page in the <link linkend="getting-started"
->Getting Started</link
-> section.</para>
-
-<para
->This page allows you to create one or more <emphasis
->Identities</emphasis
->, &ie; combinations of name, email address and other settings. For example, you can create one identity for business communication and one for personal communication. If you have more than one email address, you can create one identity per address. You will then be able to select an identity on a per-message basis.</para>
-
-<para
->The page consists of a list of identities and buttons to manage them. The identities list will always show at least one identity, which is then the <guilabel
->Default</guilabel
-> identity.</para>
-
-<para
->To add a new identity to the identity list, click on the <guibutton
->New...</guibutton
-> button. The <link linkend="configure-identity-newidentitydialog"
->New identity</link
-> dialogue will then appear.</para>
+<title>Identities Page</title>
+
+<para>You can find a quick introduction to the <guilabel>Identities</guilabel> page in the <link linkend="getting-started">Getting Started</link> section.</para>
+
+<para>This page allows you to create one or more <emphasis>Identities</emphasis>, &ie; combinations of name, email address and other settings. For example, you can create one identity for business communication and one for personal communication. If you have more than one email address, you can create one identity per address. You will then be able to select an identity on a per-message basis.</para>
+
+<para>The page consists of a list of identities and buttons to manage them. The identities list will always show at least one identity, which is then the <guilabel>Default</guilabel> identity.</para>
+
+<para>To add a new identity to the identity list, click on the <guibutton>New...</guibutton> button. The <link linkend="configure-identity-newidentitydialog">New identity</link> dialogue will then appear.</para>
 
 <sect2 id="configure-identity-newidentitydialog">
-<title
->The <guilabel
->New Identity</guilabel
-> Dialogue</title>
+<title>The <guilabel>New Identity</guilabel> Dialogue</title>
 
-<para
->You have to enter the name of the new identity into the <guilabel
->New Identity</guilabel
-> edit field. This will be the name shown in the identity list.</para>
+<para>You have to enter the name of the new identity into the <guilabel>New Identity</guilabel> edit field. This will be the name shown in the identity list.</para>
 
-<para
->You can choose how the new identity should be initialised by checking one of the three radio buttons in the middle of the dialogue:</para>
+<para>You can choose how the new identity should be initialised by checking one of the three radio buttons in the middle of the dialogue:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->With empty fields</guilabel
-></term>
+<term><guilabel>With empty fields</guilabel></term>
 <listitem>
-<para
->All fields of the new identity are cleared or preset with standard values.</para>
+<para>All fields of the new identity are cleared or preset with standard values.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Use Control Centre settings</guilabel
-></term>
+<term><guilabel>Use Control Centre settings</guilabel></term>
 <listitem>
-<para
->Uses the settings of the <application
->Control Centre</application
->'s default email profile (you can edit that one under <menuchoice
-><guimenu
->Internet &amp; Network</guimenu
-> <guimenuitem
->Email</guimenuitem
-></menuchoice
-> in the <application
->Control Centre</application
->).</para>
+<para>Uses the settings of the <application>Control Centre</application>'s default email profile (you can edit that one under <menuchoice><guimenu>Internet &amp; Network</guimenu> <guimenuitem>Email</guimenuitem></menuchoice> in the <application>Control Centre</application>).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Duplicate existing identity</guilabel
-></term>
+<term><guilabel>Duplicate existing identity</guilabel></term>
 <listitem>
-<para
->Copies all fields from an existing identity. You can choose which identity to copy from by selecting the corresponding entry in the <guilabel
->Existing identities</guilabel
-> popup.</para>
+<para>Copies all fields from an existing identity. You can choose which identity to copy from by selecting the corresponding entry in the <guilabel>Existing identities</guilabel> popup.</para>
 </listitem>
 </varlistentry>
 
@@ -265,167 +107,96 @@
 </sect2>
 
 <sect2 id="configure-identity-general">
-<title
->General</title>
+<title>General</title>
 
-<para
->The <guilabel
->General</guilabel
-> tab allows you to specify some basic settings for the currently selected identity.</para>
+<para>The <guilabel>General</guilabel> tab allows you to specify some basic settings for the currently selected identity.</para>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Your name</guilabel
-></term>
+<term><guilabel>Your name</guilabel></term>
 <listitem>
-<para
->Enter your full name here (sometimes also called <emphasis
->display name</emphasis
->). Although this field is not strictly mandatory, it is recommended to enter the correct value here.</para>
+<para>Enter your full name here (sometimes also called <emphasis>display name</emphasis>). Although this field is not strictly mandatory, it is recommended to enter the correct value here.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Organisation</guilabel
-></term>
+<term><guilabel>Organisation</guilabel></term>
 <listitem>
-<para
->Enter your organisation here. This field is optional.</para>
+<para>Enter your organisation here. This field is optional.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Email address</guilabel
-></term>
+<term><guilabel>Email address</guilabel></term>
 <listitem>
-<para
->Enter your email address here, &ie; something like <userinput
->joe@example.com</userinput
->.</para>
+<para>Enter your email address here, &ie; something like <userinput>joe@example.com</userinput>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 <example>
-<title
->Example</title>
-<para
->So if your address is <replaceable
->Joe User &lt;joe@example.com&gt;</replaceable
->, you should enter <userinput
->Joe User</userinput
-> into the <guilabel
->Your name</guilabel
-> field and <userinput
->joe@example.com</userinput
-> into the <guilabel
->Email address</guilabel
-> field.</para
-></example>
+<title>Example</title>
+<para>So if your address is <replaceable>Joe User &lt;joe@example.com&gt;</replaceable>, you should enter <userinput>Joe User</userinput> into the <guilabel>Your name</guilabel> field and <userinput>joe@example.com</userinput> into the <guilabel>Email address</guilabel> field.</para></example>
 </sect2>
 
     <sect2 id="configure-identity-cryptography">
-      <title
->Cryptography </title>
+      <title>Cryptography </title>
 
-      <para
->The <guilabel
->Cryptography</guilabel
-> tab allows you to specify &openpgp; and &smime; keys associated with this identity, as well as choosing the preferred (cryptographic) message format to use. </para>
+      <para>The <guilabel>Cryptography</guilabel> tab allows you to specify &openpgp; and &smime; keys associated with this identity, as well as choosing the preferred (cryptographic) message format to use. </para>
 
       <variablelist>
 
 	<varlistentry id="configure-identity-cryptography-openpgp-sign">
 	  <term>
-	    <guilabel
->OpenPGP signing key</guilabel>
+	    <guilabel>OpenPGP signing key</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can select the key to be used when &openpgp;-signing messages written with this identity in effect. </para>
-	    <para
->For brevity, only the short key id of selected keys is shown. Hovering with the mouse over the key list will show more information in a tooltip. </para>
-	    <para
->To clear the label press the <guibutton
->Clear</guibutton
-> button. </para>
-	    <para
->To change the selected key, press the <guibutton
->Change...</guibutton
-> button. A dialogue listing all secret &openpgp; keys will be shown allowing you to select the one to use. </para>
+	    <para>Here you can select the key to be used when &openpgp;-signing messages written with this identity in effect. </para>
+	    <para>For brevity, only the short key id of selected keys is shown. Hovering with the mouse over the key list will show more information in a tooltip. </para>
+	    <para>To clear the label press the <guibutton>Clear</guibutton> button. </para>
+	    <para>To change the selected key, press the <guibutton>Change...</guibutton> button. A dialogue listing all secret &openpgp; keys will be shown allowing you to select the one to use. </para>
 	  </listitem>
 	</varlistentry>
 
 	
 	<varlistentry id="configure-identity-cryptography-openpgp-encrypt">
 	  <term>
-	    <guilabel
->OpenPGP encryption key</guilabel>
+	    <guilabel>OpenPGP encryption key</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can select the key to &openpgp;-encrypt messages to when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. This key is also used for the <xref linkend="composer-attach-attach-my-public-key"/> function of the <link linkend="the-composer-window"
->Composer</link
->. </para>
-	    <para
->To change the selected key, press the <guibutton
->Change...</guibutton
-> button. A dialogue listing all &openpgp; keys found in your keyring will be shown allowing you to select the one to use. </para>
-	    <para
->You can clear the list of keys and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
+	    <para>Here you can select the key to &openpgp;-encrypt messages to when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. This key is also used for the <xref linkend="composer-attach-attach-my-public-key"/> function of the <link linkend="the-composer-window">Composer</link>. </para>
+	    <para>To change the selected key, press the <guibutton>Change...</guibutton> button. A dialogue listing all &openpgp; keys found in your keyring will be shown allowing you to select the one to use. </para>
+	    <para>You can clear the list of keys and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
 	  </listitem>
 	</varlistentry>
 
 	
 	<varlistentry id="configure-identity-cryptography-smime-sign">
 	  <term>
-	    <guilabel
->S/MIME signing certificate</guilabel>
+	    <guilabel>S/MIME signing certificate</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can select the certificate to be used when &smime;-signing messages written with this identity in effect. </para>
-	    <para
->To change the selected certificate, press the <guibutton
->Change...</guibutton
-> button. A dialogue listing all secret &smime; signing certificates will be shown allowing you to select the one to use. </para>
-	    <para
->You can clear the list of certificates and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
+	    <para>Here you can select the certificate to be used when &smime;-signing messages written with this identity in effect. </para>
+	    <para>To change the selected certificate, press the <guibutton>Change...</guibutton> button. A dialogue listing all secret &smime; signing certificates will be shown allowing you to select the one to use. </para>
+	    <para>You can clear the list of certificates and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
 	  </listitem>
 	</varlistentry>
 
 	
 	<varlistentry id="configure-identity-cryptography-smime-encrypt">
 	  <term>
-	    <guilabel
->S/MIME encryption certificate</guilabel>
+	    <guilabel>S/MIME encryption certificate</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can select the certificate to &smime;-encrypt messages to when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. </para>
-	    <para
->To change the selected certificate, press the <guibutton
->Change...</guibutton
-> button. A dialogue listing all &smime; encryption certificates found in your local keybox will be shown allowing you to select the one to use. </para>
-	    <para
->You can clear the list of certificates and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
+	    <para>Here you can select the certificate to &smime;-encrypt messages to when this identity and <xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. </para>
+	    <para>To change the selected certificate, press the <guibutton>Change...</guibutton> button. A dialogue listing all &smime; encryption certificates found in your local keybox will be shown allowing you to select the one to use. </para>
+	    <para>You can clear the list of certificates and get more information about them in the same way as described for <xref linkend="configure-identity-cryptography-openpgp-sign"/>. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-identity-cryptography-preferred-format">
 	  <term>
-	    <guilabel
->Preferred crypto message format</guilabel>
+	    <guilabel>Preferred crypto message format</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Here you can choose which cryptographic message format to use by default with this identity. </para>
-	    <para
->You can either select any of the four formats supported by &kmail; or leave the option at the recommended default setting of <guilabel
->Any</guilabel
->, which will choose a suitable format based on the recipients of the message, or might even go so far as to create two copies of the message, one &smime; signed and/or encrypted, the other &openpgp; signed and/or encrypted. </para>
+	    <para>Here you can choose which cryptographic message format to use by default with this identity. </para>
+	    <para>You can either select any of the four formats supported by &kmail; or leave the option at the recommended default setting of <guilabel>Any</guilabel>, which will choose a suitable format based on the recipients of the message, or might even go so far as to create two copies of the message, one &smime; signed and/or encrypted, the other &openpgp; signed and/or encrypted. </para>
 	  </listitem>
 	</varlistentry>
 
@@ -434,118 +205,49 @@
     </sect2>
 
 <sect2 id="configure-identity-advanced">
-<title
->Advanced</title>
+<title>Advanced</title>
 
-<para
->The <guilabel
->Advanced</guilabel
-> tab allows you to specify some rarely used or otherwise specialised settings for the currently selected identity.</para>
+<para>The <guilabel>Advanced</guilabel> tab allows you to specify some rarely used or otherwise specialised settings for the currently selected identity.</para>
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Reply-To address</guilabel
-></term>
+<term><guilabel>Reply-To address</guilabel></term>
 <listitem>
-<para
->Enter the address to which replies to your messages should be sent. Only fill out this field if it is different from your normal address (specified using the <guilabel
->Name</guilabel
-> and <guilabel
->Email Address</guilabel
-> on the <link linkend="configure-identity-general"
-><guilabel
->General</guilabel
-> tab</link
->), since replies default to the sender's address anyway.</para>
-<note
-><para
->This field is only useful if you want replies to your mail to go somewhere else than your regular email address, &eg; if you are using this identity to send messages from an email address that cannot receive messages. Note that some mailing lists overwrite this header field with their post address to make sure that replies go to the list instead of individuals. So the usefulness of this field is very limited and it should only be used in rare cases.</para
-></note>
+<para>Enter the address to which replies to your messages should be sent. Only fill out this field if it is different from your normal address (specified using the <guilabel>Name</guilabel> and <guilabel>Email Address</guilabel> on the <link linkend="configure-identity-general"><guilabel>General</guilabel> tab</link>), since replies default to the sender's address anyway.</para>
+<note><para>This field is only useful if you want replies to your mail to go somewhere else than your regular email address, &eg; if you are using this identity to send messages from an email address that cannot receive messages. Note that some mailing lists overwrite this header field with their post address to make sure that replies go to the list instead of individuals. So the usefulness of this field is very limited and it should only be used in rare cases.</para></note>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->BCC address</guilabel
-></term>
+<term><guilabel>BCC address</guilabel></term>
 <listitem>
-<para
->Optionally enter an address to which blind copies of your messages should be sent to. Note that a BCC is only send to this address, when <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->BCC</guimenuitem
-></menuchoice
-> is activated while composing a message. If you want to send a BCC regardless of this setting, you should look at the <guilabel
->Headers</guilabel
-> tab of the <guilabel
->Composer</guilabel
-> page.</para>
+<para>Optionally enter an address to which blind copies of your messages should be sent to. Note that a BCC is only send to this address, when <menuchoice><guimenu>View</guimenu><guimenuitem>BCC</guimenuitem></menuchoice> is activated while composing a message. If you want to send a BCC regardless of this setting, you should look at the <guilabel>Headers</guilabel> tab of the <guilabel>Composer</guilabel> page.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Sent-mail folder</guilabel
-></term>
+<term><guilabel>Sent-mail folder</guilabel></term>
 <listitem>
-<para
->Select the folder into which messages should be filed after sending when using this identity. <acronym
->IMAP</acronym
-> users should consider changing this to an <acronym
->IMAP</acronym
-> folder, so their sent-mail is stored on a server instead of being stored in a local folder. This way they can access these messages at a different location.</para>
-
-<tip
-><para
->You can exercise more fine-grained control over where to file sent messages by creating a corresponding <link linkend="filters"
->message filter</link
-> that is applied to outgoing messages.</para
-></tip>
+<para>Select the folder into which messages should be filed after sending when using this identity. <acronym>IMAP</acronym> users should consider changing this to an <acronym>IMAP</acronym> folder, so their sent-mail is stored on a server instead of being stored in a local folder. This way they can access these messages at a different location.</para>
+
+<tip><para>You can exercise more fine-grained control over where to file sent messages by creating a corresponding <link linkend="filters">message filter</link> that is applied to outgoing messages.</para></tip>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Drafts folder</guilabel
-></term>
+<term><guilabel>Drafts folder</guilabel></term>
 <listitem>
-<para
->Select the folder into which drafts should be filed when using this identity. <acronym
->IMAP</acronym
-> users should consider changing this to an <acronym
->IMAP</acronym
-> folder, so their drafts are stored on a server instead of being stored in a local folder. This way they can easily continue to work on their drafts at a different location.</para>
+<para>Select the folder into which drafts should be filed when using this identity. <acronym>IMAP</acronym> users should consider changing this to an <acronym>IMAP</acronym> folder, so their drafts are stored on a server instead of being stored in a local folder. This way they can easily continue to work on their drafts at a different location.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Special transport</guilabel
-></term>
+<term><guilabel>Special transport</guilabel></term>
 <listitem>
-<para
->Select or enter an alternative SMTP server to be used when sending messages using this identity.</para>
-
-<note
-><para
->You need to configure outgoing mail servers first, before you can choose them from the list. You can do this on the <link linkend="configure-accounts-sending"
-><guilabel
->Sending</guilabel
-> tab</link
-> of the <link linkend="configure-accounts"
-> <guilabel
->Accounts</guilabel
-> page</link
->.</para
-></note>
+<para>Select or enter an alternative SMTP server to be used when sending messages using this identity.</para>
+
+<note><para>You need to configure outgoing mail servers first, before you can choose them from the list. You can do this on the <link linkend="configure-accounts-sending"><guilabel>Sending</guilabel> tab</link> of the <link linkend="configure-accounts"> <guilabel>Accounts</guilabel> page</link>.</para></note>
 </listitem>
 </varlistentry>
 
@@ -553,74 +255,26 @@
 </sect2>
 
 <sect2 id="configure-identity-signature">
-<title
->Signature</title>
-
-<para
->This tab allows you to specify a signature (sometimes called <quote
->footer</quote
-> or <quote
->disclaimer</quote
->) to be appended to each message sent using this identity.</para>
-
-<note
-><para
->This type of signature has nothing to do with the (digital) signatures for which you can select the keys to use on the <link linkend="configure-identity-cryptography"
->Cryptography</link
-> tab. It is just bad wording to call this a signature, but since the term is already used everywhere else, we keep this notation. Just keep in mind that these signatures and digital signatures are two completely different things.</para
-></note>
-
-<para
->Check the <guilabel
->Enable signature</guilabel
-> option if you want to be able to append the signature when using this identity. To <emphasis
->automatically</emphasis
-> append it to every new message you also have to select <guilabel
->Automatically append signature</guilabel
-> in the <guilabel
->Composer</guilabel
-> configuration page.</para>
-
-<para
->&kmail; can obtain the signature text from various sources. The traditional way on Unix is to read the text from a file called <filename
->.signature</filename
-> in your home folder. This file can be shared between several programs, so you get the same signature in each mail program you use.</para>
-
-<para
->To read the text from a text file you select <guilabel
->Obtain signature text from file</guilabel
->. Enter the filename in the <guilabel
->Specify file</guilabel
-> edit field or hit the button to the right of it to browse your filesystem. If you want to edit the file, hit the <guilabel
->Edit File</guilabel
-> button.</para>
-
-<para
->&kmail; can also read the signature text from the output of a command. Thus, you can use programs such as <command
->fortune</command
-> to create a new signature text for every message. Everything the program prints onto <acronym
->stdout</acronym
-> is caught and used as the signature text.</para>
-
-<para
->To read the text from the output of a command you select <guilabel
->Obtain signature text from Output of Command</guilabel
->. Enter the command (preferably with full path) in the <guilabel
->Specify command</guilabel
-> edit field.</para>
-
-<para
->As a third option, you can enter the signature text directly in &kmail;'s configuration dialogue. To do this, select <guilabel
->Obtain signature text from input field below</guilabel
-> and enter the text into the appearing text box.</para>
-
-<note
-><para
->On the Internet, signatures are by convention separated from the body of the message by a line containing only the three character <quote
->-- </quote
-> (dash, dash, space). &kmail; will automatically prepend the signature text with this line if it is not already present in the signature text.</para>
-<para
->If you do not wish the separator to be prepended automatically by &kmail;, simply add it to the signature text yourself.</para>
+<title>Signature</title>
+
+<para>This tab allows you to specify a signature (sometimes called <quote>footer</quote> or <quote>disclaimer</quote>) to be appended to each message sent using this identity.</para>
+
+<note><para>This type of signature has nothing to do with the (digital) signatures for which you can select the keys to use on the <link linkend="configure-identity-cryptography">Cryptography</link> tab. It is just bad wording to call this a signature, but since the term is already used everywhere else, we keep this notation. Just keep in mind that these signatures and digital signatures are two completely different things.</para></note>
+
+<para>Check the <guilabel>Enable signature</guilabel> option if you want to be able to append the signature when using this identity. To <emphasis>automatically</emphasis> append it to every new message you also have to select <guilabel>Automatically append signature</guilabel> in the <guilabel>Composer</guilabel> configuration page.</para>
+
+<para>&kmail; can obtain the signature text from various sources. The traditional way on Unix is to read the text from a file called <filename>.signature</filename> in your home folder. This file can be shared between several programs, so you get the same signature in each mail program you use.</para>
+
+<para>To read the text from a text file you select <guilabel>Obtain signature text from file</guilabel>. Enter the filename in the <guilabel>Specify file</guilabel> edit field or hit the button to the right of it to browse your filesystem. If you want to edit the file, hit the <guilabel>Edit File</guilabel> button.</para>
+
+<para>&kmail; can also read the signature text from the output of a command. Thus, you can use programs such as <command>fortune</command> to create a new signature text for every message. Everything the program prints onto <acronym>stdout</acronym> is caught and used as the signature text.</para>
+
+<para>To read the text from the output of a command you select <guilabel>Obtain signature text from Output of Command</guilabel>. Enter the command (preferably with full path) in the <guilabel>Specify command</guilabel> edit field.</para>
+
+<para>As a third option, you can enter the signature text directly in &kmail;'s configuration dialogue. To do this, select <guilabel>Obtain signature text from input field below</guilabel> and enter the text into the appearing text box.</para>
+
+<note><para>On the Internet, signatures are by convention separated from the body of the message by a line containing only the three character <quote>-- </quote> (dash, dash, space). &kmail; will automatically prepend the signature text with this line if it is not already present in the signature text.</para>
+<para>If you do not wish the separator to be prepended automatically by &kmail;, simply add it to the signature text yourself.</para>
 </note>
 
 </sect2>
@@ -628,357 +282,111 @@
 </sect1>
 
 <sect1 id="configure-accounts">
-<title
->Accounts Page</title>
-
-<para
->You can find a quick introduction to the <guilabel
->Accounts</guilabel
-> page in the <link linkend="setting-up-your-account"
->Setting up your Account</link
-> section.</para>
-
-<para
->This page allows you to create one or more (incoming and outgoing) <emphasis
->accounts</emphasis
->, &ie; combinations of mail servers, login information and other settings. Typically, you will create one outgoing (used for sending messages) and one incoming (used to retrieve messages) account. You can create as many accounts as you want, though, and assign each one to different <link linkend="configure-identity"
->identities</link
-> or decide on a per-message basis.</para>
+<title>Accounts Page</title>
+
+<para>You can find a quick introduction to the <guilabel>Accounts</guilabel> page in the <link linkend="setting-up-your-account">Setting up your Account</link> section.</para>
+
+<para>This page allows you to create one or more (incoming and outgoing) <emphasis>accounts</emphasis>, &ie; combinations of mail servers, login information and other settings. Typically, you will create one outgoing (used for sending messages) and one incoming (used to retrieve messages) account. You can create as many accounts as you want, though, and assign each one to different <link linkend="configure-identity">identities</link> or decide on a per-message basis.</para>
 
 <sect2 id="configure-accounts-sending">
-<title
->Sending</title>
-
-<para
->The <guilabel
->Sending</guilabel
-> tab allows you to define new outgoing mail servers and set some common options.</para>
-
-<para
->For basic information, see <link linkend="sending-mail"
->Setting up your Account: Sending</link
->.</para>
-
-<para
->When you click <guibutton
->Add...</guibutton
-> or <guibutton
->Modify...</guibutton
-> the <guilabel
->Add transport</guilabel
-> or <guilabel
->Modify transport</guilabel
-> dialogues will open respectively. For sending via <application
->sendmail</application
-> or similar programs you can specify a name and the location of the <command
->sendmail</command
-> program. For <acronym
->SMTP</acronym
-> you can specify <guilabel
->Name</guilabel
->, <guilabel
->Host</guilabel
-> and <guilabel
->Port</guilabel
-> of the server. <guilabel
->Server requires authentication</guilabel
-> will enable the <guilabel
->Login</guilabel
-> and <guilabel
->Password</guilabel
-> fields and the <guilabel
->Authentication method</guilabel
-> buttons on the <guilabel
->Security</guilabel
-> tab. If you are not sure about the security settings you can make &kmail; test for the best settings by using <guibutton
->Check What the Server Supports</guibutton
->.</para>
-
-<para
-><guilabel
->Confirm before send</guilabel
-> will pop up a confirmation box every time you send a message.</para>
-
-<para
-><guilabel
->Send messages in outbox folder</guilabel
-> lets you specify when queued messages, &ie; messages in the outbox folder pending to be sent, should be sent. You can choose between:</para>
+<title>Sending</title>
+
+<para>The <guilabel>Sending</guilabel> tab allows you to define new outgoing mail servers and set some common options.</para>
+
+<para>For basic information, see <link linkend="sending-mail">Setting up your Account: Sending</link>.</para>
+
+<para>When you click <guibutton>Add...</guibutton> or <guibutton>Modify...</guibutton> the <guilabel>Add transport</guilabel> or <guilabel>Modify transport</guilabel> dialogues will open respectively. For sending via <application>sendmail</application> or similar programs you can specify a name and the location of the <command>sendmail</command> program. For <acronym>SMTP</acronym> you can specify <guilabel>Name</guilabel>, <guilabel>Host</guilabel> and <guilabel>Port</guilabel> of the server. <guilabel>Server requires authentication</guilabel> will enable the <guilabel>Login</guilabel> and <guilabel>Password</guilabel> fields and the <guilabel>Authentication method</guilabel> buttons on the <guilabel>Security</guilabel> tab. If you are not sure about the security settings you can make &kmail; test for the best settings by using <guibutton>Check What the Server Supports</guibutton>.</para>
+
+<para><guilabel>Confirm before send</guilabel> will pop up a confirmation box every time you send a message.</para>
+
+<para><guilabel>Send messages in outbox folder</guilabel> lets you specify when queued messages, &ie; messages in the outbox folder pending to be sent, should be sent. You can choose between:</para>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Never Automatically</guilabel
-></term>
-<listitem
-><para
->Queued messages will only be sent if you select <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send queued messages</guimenuitem
-></menuchoice
->.</para
-></listitem>
+<term><guilabel>Never Automatically</guilabel></term>
+<listitem><para>Queued messages will only be sent if you select <menuchoice><guimenu>File</guimenu><guimenuitem>Send queued messages</guimenuitem></menuchoice>.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->On Manual Mail Checks</guilabel
-></term>
-<listitem
-><para
->Queued messages will be sent after you have manually checked for new mail, &eg; with <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail</guimenuitem
-></menuchoice
->. Of course, you can also manually send the queued messages with <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send queued messages</guimenuitem
-></menuchoice
->.</para
-></listitem>
+<term><guilabel>On Manual Mail Checks</guilabel></term>
+<listitem><para>Queued messages will be sent after you have manually checked for new mail, &eg; with <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>. Of course, you can also manually send the queued messages with <menuchoice><guimenu>File</guimenu><guimenuitem>Send queued messages</guimenuitem></menuchoice>.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->On All Mail Checks</guilabel
-></term>
-<listitem
-><para
->Queued messages will be sent after all checks for new mail, &ie; after automatic mail checks as well as after manual mail checks. Of course, you can also manually send the queued messages with <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send queued messages</guimenuitem
-></menuchoice
->.</para
-></listitem>
+<term><guilabel>On All Mail Checks</guilabel></term>
+<listitem><para>Queued messages will be sent after all checks for new mail, &ie; after automatic mail checks as well as after manual mail checks. Of course, you can also manually send the queued messages with <menuchoice><guimenu>File</guimenu><guimenuitem>Send queued messages</guimenuitem></menuchoice>.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para
-><guilabel
->Default send method</guilabel
-> lets you define what happens when a message is sent. If <guilabel
->Send now</guilabel
-> is selected, the message is sent to the mail server immediately, while if <guilabel
->Send later</guilabel
-> is selected, the message is queued in the outbox to be sent later with the <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Queued Messages</guimenuitem
-></menuchoice
-> command or automatically when you check your mail, depending on the setting of <guilabel
->Send messages in outbox folder</guilabel
-> above.</para>
-
-<para
-><guilabel
->Message property</guilabel
-> lets you select how your message will be encoded when it is sent. <guilabel
->Allow 8-bit</guilabel
-> means that &kmail; will send your message in 8-bit <acronym
->ASCII</acronym
->, which means that all special characters such as accented letters will be sent as-is. If <guilabel
->MIME Compliant (Quoted Printable)</guilabel
-> is selected, special characters will be encoded using standard &MIME; encodings, which may be more portable to mailing systems other than 8-bit <acronym
->ASCII</acronym
->. We recommend to use <guilabel
->MIME Compliant</guilabel
->.</para>
-
-<note
-><para
->Even with <guilabel
->Allow 8-bit</guilabel
-> selected &kmail; will use <guilabel
->MIME Compliant</guilabel
-> encoding in some situations, for example for sending cryptographically signed messages.</para
-></note>
-
-<para
-><guilabel
->Default domain</guilabel
-> lets you specify which domain name should be used to complete email addresses that only consist of the recipient's user name. For example when you set the default domain to <replaceable
->kde.org</replaceable
-> then messages you send to <replaceable
->joebloggs</replaceable
-> will be sent to <replaceable
->joebloggs@kde.org</replaceable
->.</para>
+<para><guilabel>Default send method</guilabel> lets you define what happens when a message is sent. If <guilabel>Send now</guilabel> is selected, the message is sent to the mail server immediately, while if <guilabel>Send later</guilabel> is selected, the message is queued in the outbox to be sent later with the <menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued Messages</guimenuitem></menuchoice> command or automatically when you check your mail, depending on the setting of <guilabel>Send messages in outbox folder</guilabel> above.</para>
+
+<para><guilabel>Message property</guilabel> lets you select how your message will be encoded when it is sent. <guilabel>Allow 8-bit</guilabel> means that &kmail; will send your message in 8-bit <acronym>ASCII</acronym>, which means that all special characters such as accented letters will be sent as-is. If <guilabel>MIME Compliant (Quoted Printable)</guilabel> is selected, special characters will be encoded using standard &MIME; encodings, which may be more portable to mailing systems other than 8-bit <acronym>ASCII</acronym>. We recommend to use <guilabel>MIME Compliant</guilabel>.</para>
+
+<note><para>Even with <guilabel>Allow 8-bit</guilabel> selected &kmail; will use <guilabel>MIME Compliant</guilabel> encoding in some situations, for example for sending cryptographically signed messages.</para></note>
+
+<para><guilabel>Default domain</guilabel> lets you specify which domain name should be used to complete email addresses that only consist of the recipient's user name. For example when you set the default domain to <replaceable>kde.org</replaceable> then messages you send to <replaceable>joebloggs</replaceable> will be sent to <replaceable>joebloggs@kde.org</replaceable>.</para>
 
 </sect2>
 
 <sect2 id="configure-accounts-receiving">
-<title
->Receiving</title>
-
-<para
->For basic information, see <link linkend="receiving-mail"
->Setting up your Account: Receiving</link
->.</para>
-
-<para
-><guilabel
->Check mail on startup</guilabel
-> lets you specify whether KMail should check for new mail immediately after it has been started.</para>
-
-<para
->With <guilabel
->New Mail Notification</guilabel
-> you can set how &kmail; will notify you if new messages have arrived: <guilabel
->Beep</guilabel
-> will play a short beep sound; if <guilabel
->Detailed new mail notification</guilabel
-> is enabled then &kmail; will show the number of new messages for each folder provided you have chosen to be notified with a dialogue. More advanced notification options, like showing a dialogue or running a certain command, are available via the <guibutton
->Other Actions</guibutton
-> button.</para>
+<title>Receiving</title>
+
+<para>For basic information, see <link linkend="receiving-mail">Setting up your Account: Receiving</link>.</para>
+
+<para><guilabel>Check mail on startup</guilabel> lets you specify whether KMail should check for new mail immediately after it has been started.</para>
+
+<para>With <guilabel>New Mail Notification</guilabel> you can set how &kmail; will notify you if new messages have arrived: <guilabel>Beep</guilabel> will play a short beep sound; if <guilabel>Detailed new mail notification</guilabel> is enabled then &kmail; will show the number of new messages for each folder provided you have chosen to be notified with a dialogue. More advanced notification options, like showing a dialogue or running a certain command, are available via the <guibutton>Other Actions</guibutton> button.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="configure-appearance">
-<title
->Appearance Page</title>
+<title>Appearance Page</title>
 
 <sect2 id="configure-appearance-fonts">
-<title
->Fonts</title>
-
-<para
->This section allows you to change the type, size and character set of the display fonts. <guilabel
->Message Body</guilabel
-> sets the font for the reader pane, <guilabel
->Composer</guilabel
-> sets the font for writing messages in the composer window. There is a separate entry for <guilabel
->Message List - Date Field</guilabel
-> so you can choose a monospaced font for the date field for better readability.</para>
+<title>Fonts</title>
+
+<para>This section allows you to change the type, size and character set of the display fonts. <guilabel>Message Body</guilabel> sets the font for the reader pane, <guilabel>Composer</guilabel> sets the font for writing messages in the composer window. There is a separate entry for <guilabel>Message List - Date Field</guilabel> so you can choose a monospaced font for the date field for better readability.</para>
 
 </sect2>
 
 <sect2 id="configure-appearance-colors">
-<title
->Colours</title>
+<title>Colours</title>
 
-<para
->This section allows you to change the colour of the text. <guilabel
->Recycle colours on deep quoting</guilabel
-> means that even text that is quoted more than three times will appear in colour. Note that the <guilabel
->Quoted text</guilabel
-> colours only work in the message reader, not in the composer. </para>
+<para>This section allows you to change the colour of the text. <guilabel>Recycle colours on deep quoting</guilabel> means that even text that is quoted more than three times will appear in colour. Note that the <guilabel>Quoted text</guilabel> colours only work in the message reader, not in the composer. </para>
 
 </sect2>
 
 <sect2 id="configure-appearance-layout">
-<title
->Layout</title>
-
-<para
-><guilabel
->Show HTML status bar</guilabel
-> activates a bar at the left side of the reader pane that tells you if a message is &html; or not. This is important because &html; messages might imitate the look of a signed and encrypted message, so you should be aware of the fact that you are reading a &html; message. The &html; status bar itself cannot be influenced by the &html; code of the message.</para>
-
-<para
->The <guilabel
->Window Layout</guilabel
-> section lets you choose the layout of the main window. You can choose where you want the <guilabel
->Message Preview Pane</guilabel
-> or choose not to have it at all.</para>
-
-<para
->The <guilabel
->Message Structure Viewer</guilabel
-> option lets you choose when the structure viewer will be shown: the structure viewer is a part of the main window that lets you access all parts of a message. <guilabel
->Show never</guilabel
-> will disable the structure viewer (note that you can still access attachments as icons), <guilabel
->Show always</guilabel
-> will show the structure viewer even if there is only one plaintext part. <guilabel
->Show only for non-plaintext messages</guilabel
-> will display the structure viewer only if it makes sense, &ie; if the current message has attachments or has &html; parts.</para>
+<title>Layout</title>
+
+<para><guilabel>Show HTML status bar</guilabel> activates a bar at the left side of the reader pane that tells you if a message is &html; or not. This is important because &html; messages might imitate the look of a signed and encrypted message, so you should be aware of the fact that you are reading a &html; message. The &html; status bar itself cannot be influenced by the &html; code of the message.</para>
+
+<para>The <guilabel>Window Layout</guilabel> section lets you choose the layout of the main window. You can choose where you want the <guilabel>Message Preview Pane</guilabel> or choose not to have it at all.</para>
+
+<para>The <guilabel>Message Structure Viewer</guilabel> option lets you choose when the structure viewer will be shown: the structure viewer is a part of the main window that lets you access all parts of a message. <guilabel>Show never</guilabel> will disable the structure viewer (note that you can still access attachments as icons), <guilabel>Show always</guilabel> will show the structure viewer even if there is only one plaintext part. <guilabel>Show only for non-plaintext messages</guilabel> will display the structure viewer only if it makes sense, &ie; if the current message has attachments or has &html; parts.</para>
 
 </sect2>
 
 <sect2 id="configure-appearance-headers">
-<title
->Headers</title>
-
-<para
->With <guilabel
->Display message sizes</guilabel
-> selected there will be another column in the header pane that shows the messages' size.</para>
-
-<para
-><guilabel
->Show crypto icons</guilabel
-> will add more status information to the <guilabel
->Subject</guilabel
-> columns in the header pane: every message that has been signed will have a small <guiicon
->Signed</guiicon
-> icon in front of the subject, every message that has been encrypted will have a small <guiicon
->Encrypted</guiicon
-> icon in front of the subject. Note that you have to select a message once before these icons will appear, until then only question marks will be displayed.</para>
-
-<para
-><guilabel
->Thread list of message headers</guilabel
-> will put all the messages in the header pane in a kind of tree list, so that the replies to a message are directly below that message.</para>
-
-<para
->With <guilabel
->Message header threading options</guilabel
-> you can select whether threads should appear expanded (<guilabel
->open</guilabel
->) by default or whether they should be collapsed (<guilabel
->closed</guilabel
->). You can of course still open/close threads using the <guilabel
->+</guilabel
->/<guilabel
->-</guilabel
-> buttons.</para
-> 
-
-<para
->With <guilabel
->Date Display</guilabel
-> you can choose between several date formats. The <guilabel
->Localised Format</guilabel
-> is the one you can specify under <guilabel
->Country &amp; Language</guilabel
-> in &kcontrol;. For the <guilabel
->Custom</guilabel
-> format you can get a description of the possible values by pressing <keycombo action="simul"
->&Shift;<keycap
->F1</keycap
-></keycombo
-> and then clicking on <guilabel
->Custom</guilabel
-> option.</para>
+<title>Headers</title>
+
+<para>With <guilabel>Display message sizes</guilabel> selected there will be another column in the header pane that shows the messages' size.</para>
+
+<para><guilabel>Show crypto icons</guilabel> will add more status information to the <guilabel>Subject</guilabel> columns in the header pane: every message that has been signed will have a small <guiicon>Signed</guiicon> icon in front of the subject, every message that has been encrypted will have a small <guiicon>Encrypted</guiicon> icon in front of the subject. Note that you have to select a message once before these icons will appear, until then only question marks will be displayed.</para>
+
+<para><guilabel>Thread list of message headers</guilabel> will put all the messages in the header pane in a kind of tree list, so that the replies to a message are directly below that message.</para>
+
+<para>With <guilabel>Message header threading options</guilabel> you can select whether threads should appear expanded (<guilabel>open</guilabel>) by default or whether they should be collapsed (<guilabel>closed</guilabel>). You can of course still open/close threads using the <guilabel>+</guilabel>/<guilabel>-</guilabel> buttons.</para> 
+
+<para>With <guilabel>Date Display</guilabel> you can choose between several date formats. The <guilabel>Localised Format</guilabel> is the one you can specify under <guilabel>Country &amp; Language</guilabel> in &kcontrol;. For the <guilabel>Custom</guilabel> format you can get a description of the possible values by pressing <keycombo action="simul">&Shift;<keycap>F1</keycap></keycombo> and then clicking on <guilabel>Custom</guilabel> option.</para>
 
 </sect2>
 
 <sect2 id="configure-appearance-systemtray">
-<title
->System Tray</title>
-
-<para
->If you enable the system tray icon then a small &kmail; icon with the number of unread messages will be shown in the system tray. You can enable &kmail;'s system tray icon with <guilabel
->Enable system tray icon</guilabel
->, and with <guilabel
->System Tray Mode</guilabel
-> you can specify whether the tray icon should always be shown or only if you have unread messages.</para>
-
-<para
->If the icon is visible then you can hide &kmail;'s main window by clicking on the icon or by clicking on the window close button. By clicking on the icon you can make &kmail;'s main window visible again. If you click on the icon with the <mousebutton
->right</mousebutton
-> mousebutton then you get a menu with a few useful commands. You can check for new mail, create a new message or quit &kmail;. Additionally, there is the entry <guilabel
->New Messages In</guilabel
-> which lists all folders containing unread messages. If you choose one of those folders then this folder will be selected in &kmail;'s main window. </para>
+<title>System Tray</title>
+
+<para>If you enable the system tray icon then a small &kmail; icon with the number of unread messages will be shown in the system tray. You can enable &kmail;'s system tray icon with <guilabel>Enable system tray icon</guilabel>, and with <guilabel>System Tray Mode</guilabel> you can specify whether the tray icon should always be shown or only if you have unread messages.</para>
+
+<para>If the icon is visible then you can hide &kmail;'s main window by clicking on the icon or by clicking on the window close button. By clicking on the icon you can make &kmail;'s main window visible again. If you click on the icon with the <mousebutton>right</mousebutton> mousebutton then you get a menu with a few useful commands. You can check for new mail, create a new message or quit &kmail;. Additionally, there is the entry <guilabel>New Messages In</guilabel> which lists all folders containing unread messages. If you choose one of those folders then this folder will be selected in &kmail;'s main window. </para>
 
 </sect2>
 
@@ -988,92 +396,58 @@
 </sect1>
 
   <sect1 id="configure-composer">
-    <title
->Composer Page </title>
+    <title>Composer Page </title>
 
     <sect2 id="configure-composer-general">
-      <title
->General </title>
+      <title>General </title>
 
       <variablelist>
 	<varlistentry id="configure-composer-general-append-signature">
 	  <term>
-	    <guilabel
->Automatically append signature</guilabel>
+	    <guilabel>Automatically append signature</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, your signature as defined in the <link linkend="configure-identity-signature"
->identity page</link
-> is automatically included at the end of all messages you create (&ie; new messages, replies &etc;). </para>
+	    <para>If checked, your signature as defined in the <link linkend="configure-identity-signature">identity page</link> is automatically included at the end of all messages you create (&ie; new messages, replies &etc;). </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-smart-quoting">
 	  <term>
-	    <guilabel
->Use smart quoting</guilabel>
+	    <guilabel>Use smart quoting</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will break long lines but will try to keep the correct quoting (&eg; the <quote
->&gt; </quote
-> will always be at the start of the line). </para>
+	    <para>If checked, &kmail; will break long lines but will try to keep the correct quoting (&eg; the <quote>&gt; </quote> will always be at the start of the line). </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-auto-request-mdns">
 	  <term>
-	    <guilabel
->Automatically request message disposition notifications</guilabel>
+	    <guilabel>Automatically request message disposition notifications</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, <xref linkend="composer-options-request-mdn"/> will default to <emphasis
->on</emphasis
->. Check this option only if you know what you are doing. &mdn;s are considered a nuisance (or are simply ignored) by a lot of people. It is better to decide to request them on a message-by-message basis. </para>
+	    <para>If checked, <xref linkend="composer-options-request-mdn"/> will default to <emphasis>on</emphasis>. Check this option only if you know what you are doing. &mdn;s are considered a nuisance (or are simply ignored) by a lot of people. It is better to decide to request them on a message-by-message basis. </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-word-wrap">
 	  <term>
-	    <guilabel
->Word wrap at column</guilabel>
+	    <guilabel>Word wrap at column</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Lets you turn word wrapping on and off in the composer window and lets you set the column at which words will be wrapped (you probably should not need to change the default value, which is <literal
->78</literal
->). </para>
+	    <para>Lets you turn word wrapping on and off in the composer window and lets you set the column at which words will be wrapped (you probably should not need to change the default value, which is <literal>78</literal>). </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-autosave-interval">
 	  <term>
-	    <guilabel
->Autosave interval</guilabel>
+	    <guilabel>Autosave interval</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->A backup copy of the text in the composer window can be created regularly. This option lets you specify the interval used to create the backup. You can disable autosaving by setting it to the value <literal
->0</literal
->. </para>
+	    <para>A backup copy of the text in the composer window can be created regularly. This option lets you specify the interval used to create the backup. You can disable autosaving by setting it to the value <literal>0</literal>. </para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry id="configure-composer-general-external-editor">
 	  <term>
-	    <guilabel
->External Editor</guilabel>
+	    <guilabel>External Editor</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If you do not like the Composer you can use a different editor. Note that the composer window will still open and the external editor will open as soon as you type just one character in the body of the message. If you are done, save the text and exit the editor. The text will now appear in the composer window, where you can send it. Note that your editor may not return immediately, you have to use &eg; <userinput
-> <command
-> gvim <option
->-f</option
-> <varname
->%f</varname
-> </command
-> </userinput
-> for <application
->gvim</application
->. </para>
+	    <para>If you do not like the Composer you can use a different editor. Note that the composer window will still open and the external editor will open as soon as you type just one character in the body of the message. If you are done, save the text and exit the editor. The text will now appear in the composer window, where you can send it. Note that your editor may not return immediately, you have to use &eg; <userinput> <command> gvim <option>-f</option> <varname>%f</varname> </command> </userinput> for <application>gvim</application>. </para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
@@ -1082,281 +456,167 @@
 
 
 <sect2 id="configure-composer-phrases">
-<title
->Phrases</title>
-
-<para
->The <guilabel
->Phrases</guilabel
-> tab lets you define the automatically generated lines that are added to message replies, forwarded messages, and the character that is added in front of quoted text. There are special &percnt;-denoted characters that will insert certain values, which are also displayed at the top of the <guilabel
->Phrases</guilabel
-> section. You can add reply phrases in languages other than your default &kde; language using the <guibutton
->Add...</guibutton
-> button. You can then choose between different languages with the <guilabel
->Language</guilabel
-> drop down box. This will only work for languages whose i18n package you have installed.</para>
+<title>Phrases</title>
+
+<para>The <guilabel>Phrases</guilabel> tab lets you define the automatically generated lines that are added to message replies, forwarded messages, and the character that is added in front of quoted text. There are special &percnt;-denoted characters that will insert certain values, which are also displayed at the top of the <guilabel>Phrases</guilabel> section. You can add reply phrases in languages other than your default &kde; language using the <guibutton>Add...</guibutton> button. You can then choose between different languages with the <guilabel>Language</guilabel> drop down box. This will only work for languages whose i18n package you have installed.</para>
 
 </sect2>
 
 <sect2 id="configure-composer-subject">
-<title
->Subject</title>
-
-<para
->This section contains a list of prefixes for <quote
->Reply</quote
-> and <quote
->Forward</quote
->. If you receive messages that use prefixes different to the standard ones, you can add them here so &kmail; will recognise them. This way &kmail; can ignore them for sorting messages and when setting the subject of a reply or a forwarded messages, and optionally replace them with <quote
->Re:</quote
-> or <quote
->Fwd:</quote
-> respectively.</para>
+<title>Subject</title>
+
+<para>This section contains a list of prefixes for <quote>Reply</quote> and <quote>Forward</quote>. If you receive messages that use prefixes different to the standard ones, you can add them here so &kmail; will recognise them. This way &kmail; can ignore them for sorting messages and when setting the subject of a reply or a forwarded messages, and optionally replace them with <quote>Re:</quote> or <quote>Fwd:</quote> respectively.</para>
 
 </sect2>
 
 <sect2 id="configure-composer-charset">
-<title
->Charset</title>
-
-<para
->Here you can manage the default charsets used for your own messages. Every message you send will be checked if it is written in one of the listed charsets, starting at the top of the list. If it is, this charset will be used. If it is not, a dialogue will show up and tell you that you manually have to choose a charset using <menuchoice
-><guimenu
->Options</guimenu
-><guisubmenu
->Set Encoding</guisubmenu
-></menuchoice
->. </para>
-
-<para
->If you select <guilabel
->Keep original charset when replying or forwarding (if possible)</guilabel
->, the original message's charset will be kept, unless there are now characters that cannot be represented using that charset.</para>
+<title>Charset</title>
+
+<para>Here you can manage the default charsets used for your own messages. Every message you send will be checked if it is written in one of the listed charsets, starting at the top of the list. If it is, this charset will be used. If it is not, a dialogue will show up and tell you that you manually have to choose a charset using <menuchoice><guimenu>Options</guimenu><guisubmenu>Set Encoding</guisubmenu></menuchoice>. </para>
+
+<para>If you select <guilabel>Keep original charset when replying or forwarding (if possible)</guilabel>, the original message's charset will be kept, unless there are now characters that cannot be represented using that charset.</para>
 
 </sect2>
 
 <sect2 id="configure-composer-headers">
-<title
->Headers</title>
-
-<para
->Check the <guilabel
->Use custom message-id suffix</guilabel
-> checkbox if you want &kmail; to generate Message-Id's with a custom suffix. Enter the desired suffix in the <guilabel
->Custom message-id suffix</guilabel
-> field. Please make sure that the suffix that you specify is world-wide unique. The best thing is to use the name of a domain which you are the owner of. If you do not check <guilabel
->Use custom Message-Id suffix</guilabel
-> then &kmail; will automatically generate the complete Message-Id. If you do not know what this is all about do not check this option.</para>
-
-<para
->The <guilabel
->Define custom mime header fields</guilabel
-> list sets the headers that &kmail; will use for its outgoing messages. You can both invent new fields and overwrite existing ones. This feature is only useful for advanced users.</para>
+<title>Headers</title>
+
+<para>Check the <guilabel>Use custom message-id suffix</guilabel> checkbox if you want &kmail; to generate Message-Id's with a custom suffix. Enter the desired suffix in the <guilabel>Custom message-id suffix</guilabel> field. Please make sure that the suffix that you specify is world-wide unique. The best thing is to use the name of a domain which you are the owner of. If you do not check <guilabel>Use custom Message-Id suffix</guilabel> then &kmail; will automatically generate the complete Message-Id. If you do not know what this is all about do not check this option.</para>
+
+<para>The <guilabel>Define custom mime header fields</guilabel> list sets the headers that &kmail; will use for its outgoing messages. You can both invent new fields and overwrite existing ones. This feature is only useful for advanced users.</para>
 
 </sect2>
 
 <sect2 id="configure-composer-attachments">
-<title
->Attachments</title>
+<title>Attachments</title>
 
-<para
->If you have to send attachments with filenames containing non-English characters to users of Outlook(TM) or Outlook Express(TM) then you might want to check the <guilabel
->Outlook-compatible attachment naming</guilabel
-> option. &kmail; will then encode the attachment names in a non-standard way that is understood by Outlook(TM).</para>
-<para
->Note that &kmail; will create non-standard compliant messages, and consequently it is possible that your messages will not be understood by standard-compliant mail clients. So, unless you have no other choice, you should not enable this option.</para>
+<para>If you have to send attachments with filenames containing non-English characters to users of Outlook(TM) or Outlook Express(TM) then you might want to check the <guilabel>Outlook-compatible attachment naming</guilabel> option. &kmail; will then encode the attachment names in a non-standard way that is understood by Outlook(TM).</para>
+<para>Note that &kmail; will create non-standard compliant messages, and consequently it is possible that your messages will not be understood by standard-compliant mail clients. So, unless you have no other choice, you should not enable this option.</para>
 
-<para
->Check the <guilabel
->Enable detection of missing attachments</guilabel
-> checkbox if you want &kmail; to warn you whenever you are about to send a message without attachments although the message text contains certain words which indicate that you wanted to include an attachment. The list of key words can be modified.</para>
+<para>Check the <guilabel>Enable detection of missing attachments</guilabel> checkbox if you want &kmail; to warn you whenever you are about to send a message without attachments although the message text contains certain words which indicate that you wanted to include an attachment. The list of key words can be modified.</para>
 
 </sect2>
 
 </sect1>
 
   <sect1 id="configure-security">
-    <title
->Security Page </title>
+    <title>Security Page </title>
 
     <sect2 id="configure-security-reading">
-      <title
->Reading </title>
+      <title>Reading </title>
 
-      <para
->On this tab you can configure security-relevant options for reading messages. </para>
+      <para>On this tab you can configure security-relevant options for reading messages. </para>
 
       <variablelist>
 
 	<varlistentry id="configure-security-reading-prefer-html">
 	  <term>
-	    <guilabel
->Prefer HTML to plain text</guilabel>
+	    <guilabel>Prefer HTML to plain text</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will show &html; messages with their &html; formatting and layout. We strongly recommend to leave this option off, as security problems with &html; might show up. When this option is off, you can still read &html; messages, but only as plain text. </para>
+	    <para>If checked, &kmail; will show &html; messages with their &html; formatting and layout. We strongly recommend to leave this option off, as security problems with &html; might show up. When this option is off, you can still read &html; messages, but only as plain text. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-reading-external-references">
 	  <term>
-	    <guilabel
->Allow messages to load external references from the Internet</guilabel>
+	    <guilabel>Allow messages to load external references from the Internet</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; can load external images, style sheets &etc; from the Internet when you look at an &html; message. We strongly recommend to leave this option off (although it has no effect if you only view plain text messages). By adding external references to their messages, people sending spam can detect that and when you have looked at their message. Note that this option has no effect on &Java;, JavaScript and Plugins - these are disabled anyway and cannot be enabled at all. </para>
+	    <para>If checked, &kmail; can load external images, style sheets &etc; from the Internet when you look at an &html; message. We strongly recommend to leave this option off (although it has no effect if you only view plain text messages). By adding external references to their messages, people sending spam can detect that and when you have looked at their message. Note that this option has no effect on &Java;, JavaScript and Plugins - these are disabled anyway and cannot be enabled at all. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-reading-mdns">
 	  <term>
-	    <guilabel
->Message Disposition Notifications</guilabel>
+	    <guilabel>Message Disposition Notifications</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->&mdn;s are a generalisation of what is commonly called a <quote
->read receipt</quote
->. The message author requests a disposition notification to be sent and the receiver's mail program generates a reply from which the author can learn what happened to his message. Common disposition types include <quote
->displayed</quote
-> (&ie; read), <quote
->deleted</quote
-> and <quote
->dispatched</quote
-> (&eg; forwarded). </para>
-	    <para
->The following options (listed as <guilabel
->Send policy</guilabel
->) are available to control <emphasis
->when</emphasis
-> &kmail; sends &mdn;s: </para>
+	    <para>&mdn;s are a generalisation of what is commonly called a <quote>read receipt</quote>. The message author requests a disposition notification to be sent and the receiver's mail program generates a reply from which the author can learn what happened to his message. Common disposition types include <quote>displayed</quote> (&ie; read), <quote>deleted</quote> and <quote>dispatched</quote> (&eg; forwarded). </para>
+	    <para>The following options (listed as <guilabel>Send policy</guilabel>) are available to control <emphasis>when</emphasis> &kmail; sends &mdn;s: </para>
 	    <variablelist>
 	      <varlistentry>
-		<term
-><guilabel
->Ignore</guilabel
-> (recommended) </term>
+		<term><guilabel>Ignore</guilabel> (recommended) </term>
 		<listitem>
-		  <para
->Ignores any request for disposition notifications. No &mdn; will ever be sent automatically. </para>
+		  <para>Ignores any request for disposition notifications. No &mdn; will ever be sent automatically. </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Ask</guilabel>
+		  <guilabel>Ask</guilabel>
 		</term>
 		<listitem>
-		  <para
->Answers requests only after asking the user for permission. This way, you can send &mdn;s for selected messages while denying or ignoring them for others. </para>
+		  <para>Answers requests only after asking the user for permission. This way, you can send &mdn;s for selected messages while denying or ignoring them for others. </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Deny</guilabel>
+		  <guilabel>Deny</guilabel>
 		</term>
 		<listitem>
-		  <para
->Always sends a <quote
->denied</quote
-> notification. This is only <emphasis
->slightly</emphasis
-> better than always sending &mdn;s. The author will still know that the messages has been acted upon, he just cannot tell whether it was deleted or read &etc; </para>
+		  <para>Always sends a <quote>denied</quote> notification. This is only <emphasis>slightly</emphasis> better than always sending &mdn;s. The author will still know that the messages has been acted upon, he just cannot tell whether it was deleted or read &etc; </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Always send</guilabel>
+		  <guilabel>Always send</guilabel>
 		</term>
 		<listitem>
-		  <para
->Always sends the requested disposition notification. That means that the author of the message gets to know when the message was acted upon and, in addition, what happened to it (displayed, deleted &etc;). This option is strongly discouraged, but since it makes sense where privacy is not a concern, &eg; in customer relationship management, it has been made available. </para>
+		  <para>Always sends the requested disposition notification. That means that the author of the message gets to know when the message was acted upon and, in addition, what happened to it (displayed, deleted &etc;). This option is strongly discouraged, but since it makes sense where privacy is not a concern, &eg; in customer relationship management, it has been made available. </para>
 		</listitem>
 	      </varlistentry>
 	    </variablelist>
-	    <para
->If you are unsure, experiment a while with <guilabel
->Ask</guilabel
-> and if you find &kmail;s questions annoying, switch to <guilabel
->Ignore</guilabel
->. </para>
-	    <para
->The following options (listed as <guilabel
->Quote original message</guilabel
->) are available to control <emphasis
->how much</emphasis
-> of the original message &kmail; sends back in &mdn;s. </para>
+	    <para>If you are unsure, experiment a while with <guilabel>Ask</guilabel> and if you find &kmail;s questions annoying, switch to <guilabel>Ignore</guilabel>. </para>
+	    <para>The following options (listed as <guilabel>Quote original message</guilabel>) are available to control <emphasis>how much</emphasis> of the original message &kmail; sends back in &mdn;s. </para>
 	    <variablelist>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Nothing</guilabel>
+		  <guilabel>Nothing</guilabel>
 		</term>
 		<listitem>
-		  <para
->No parts of the message other than the mandatory message-id and the original recipient is included in the &mdn; reply. This preserves enough information for the sender to find the message in his sent messages for which this &mdn; was generated. </para>
+		  <para>No parts of the message other than the mandatory message-id and the original recipient is included in the &mdn; reply. This preserves enough information for the sender to find the message in his sent messages for which this &mdn; was generated. </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Full message</guilabel>
+		  <guilabel>Full message</guilabel>
 		</term>
 		<listitem>
-		  <para
->Attaches the complete message to the disposition notification. Usually, this is overkill. It does not add any valuable information that cannot be deduced from the message headers alone, but people sometimes insist on this, since it is much easier for humans to correlate the content of the message than just the headers to what they sent earlier. </para>
+		  <para>Attaches the complete message to the disposition notification. Usually, this is overkill. It does not add any valuable information that cannot be deduced from the message headers alone, but people sometimes insist on this, since it is much easier for humans to correlate the content of the message than just the headers to what they sent earlier. </para>
 		</listitem>
 	      </varlistentry>
 	      <varlistentry>
 		<term>
-		  <guilabel
->Only headers</guilabel>
+		  <guilabel>Only headers</guilabel>
 		</term>
 		<listitem>
-		  <para
->Attaches only the headers to the disposition notification. This is usually enough to enable both humans (by subject) and computers (by message-id) to easily correlate &mdn; and original message. </para>
+		  <para>Attaches only the headers to the disposition notification. This is usually enough to enable both humans (by subject) and computers (by message-id) to easily correlate &mdn; and original message. </para>
 		</listitem>
 	      </varlistentry>
 	    </variablelist>
-	    <para
->If unsure, leave the option at the default. </para>
+	    <para>If unsure, leave the option at the default. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>
-	    <guilabel
->Do not send MDNs in response to encrypted messages</guilabel>
+	    <guilabel>Do not send MDNs in response to encrypted messages</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->This option suppresses the sending of &mdn;s if the message is encrypted (partially or in whole). This thwarts attempts to use &kmail;'s &mdn; feature as an <emphasis
->oracle</emphasis
-> to deduce whether you were able to decrypt the message or not. </para>
-	    <para
->Strictly speaking, this option is not needed, since &kmail; sends &mdn;s regardless of whether the message could be successfully decrypted or not (the disposition notification request resides in the unencrypted part of the message), but it gives the security-conscious user the choice to either send them always if requested (option unchecked), or never (option checked). </para>
-	    <para
->If unsure, leave the option checked. </para>
+	    <para>This option suppresses the sending of &mdn;s if the message is encrypted (partially or in whole). This thwarts attempts to use &kmail;'s &mdn; feature as an <emphasis>oracle</emphasis> to deduce whether you were able to decrypt the message or not. </para>
+	    <para>Strictly speaking, this option is not needed, since &kmail; sends &mdn;s regardless of whether the message could be successfully decrypted or not (the disposition notification request resides in the unencrypted part of the message), but it gives the security-conscious user the choice to either send them always if requested (option unchecked), or never (option checked). </para>
+	    <para>If unsure, leave the option checked. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>
-	    <guilabel
->Automatically import keys and certificates</guilabel>
+	    <guilabel>Automatically import keys and certificates</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; automatically imports any attachments containing &openpgp; keys into your local keyring, and any attachments containing &smime; keys into your local key box. </para>
+	    <para>If checked, &kmail; automatically imports any attachments containing &openpgp; keys into your local keyring, and any attachments containing &smime; keys into your local key box. </para>
 	    <note>
-	      <para
->Verifying &smime; signatures always involves importing the contained certificates. This option thus does not affect this. It is also unrelated to &gpg;'s <option
->auto-key-retrieve</option
-> feature, where &gpg; will try to import unknown keys from a key server. </para>
+	      <para>Verifying &smime; signatures always involves importing the contained certificates. This option thus does not affect this. It is also unrelated to &gpg;'s <option>auto-key-retrieve</option> feature, where &gpg; will try to import unknown keys from a key server. </para>
 	    </note>
 	  </listitem>
 	</varlistentry>
@@ -1364,120 +624,73 @@
     </sect2>
 
     <sect2 id="configure-security-composing">
-      <title
->Composing </title>
+      <title>Composing </title>
 
-      <para
->On this tab you can configure security-relevant options for composing messages. </para>
+      <para>On this tab you can configure security-relevant options for composing messages. </para>
 
       <variablelist>
 
 	<varlistentry id="configure-security-composing-automatically-sign">
 	  <term>
-	    <guilabel
->Automatically sign messages</guilabel>
+	    <guilabel>Automatically sign messages</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, the <xref linkend="composer-options-sign-message"/> option in the composer will default to <emphasis
->on</emphasis
->. </para>
-	    <para
->However, you can still switch it on and off on a per-message basis. </para>
+	    <para>If checked, the <xref linkend="composer-options-sign-message"/> option in the composer will default to <emphasis>on</emphasis>. </para>
+	    <para>However, you can still switch it on and off on a per-message basis. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-encrypt-to-self">
 	  <term>
-	    <guilabel
->Always encrypt to self</guilabel>
+	    <guilabel>Always encrypt to self</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, any message that is encrypted to the recipients will additionally be encrypted to yourself. </para>
+	    <para>If checked, any message that is encrypted to the recipients will additionally be encrypted to yourself. </para>
 	    <warning>
-	      <para
->If you uncheck this option, you may not be able to decrypt the messages written by yourself and encrypted to other people anymore. </para>
+	      <para>If you uncheck this option, you may not be able to decrypt the messages written by yourself and encrypted to other people anymore. </para>
 	    </warning>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-store-sent-encrypted">
 	  <term>
-	    <guilabel
->Store sent messages encrypted</guilabel
-><!--
+	    <guilabel>Store sent messages encrypted</guilabel><!--
 	    --><footnote>
-	      <para
->This options enables a mode of using mail encryption that is sometimes (misleadingly) called <quote
->transport-only</quote
-> encryption. In this mode of operation, the message encryption is stripped off as soon as the message has reached its destination. The encryption lasts only while the message is on its way. </para>
-	      <para
->&kmail; supports this mode half-heartedly, since such functionality should better placed at the mail <emphasis
->server</emphasis
-> (<acronym
->MTA</acronym
->) than at the mail <emphasis
->client</emphasis
-> (<acronym
->MUA</acronym
->) level. Thus, future versions of &kmail; may drop support for this option. </para>
+	      <para>This options enables a mode of using mail encryption that is sometimes (misleadingly) called <quote>transport-only</quote> encryption. In this mode of operation, the message encryption is stripped off as soon as the message has reached its destination. The encryption lasts only while the message is on its way. </para>
+	      <para>&kmail; supports this mode half-heartedly, since such functionality should better placed at the mail <emphasis>server</emphasis> (<acronym>MTA</acronym>) than at the mail <emphasis>client</emphasis> (<acronym>MUA</acronym>) level. Thus, future versions of &kmail; may drop support for this option. </para>
 	    </footnote>
 	  </term>
 	  <listitem>
-	    <para
->If checked, messages are stored in your <guilabel
->sent-mail</guilabel
-> folder just as you sent them (&ie; if they were encrypted, they are also stored that way). </para>
-	    <para
->If unchecked, messages will <emphasis
->always</emphasis
-> be stored unencrypted in your <guilabel
->sent-mail</guilabel
-> folder, even if they are sent encrypted. </para>
+	    <para>If checked, messages are stored in your <guilabel>sent-mail</guilabel> folder just as you sent them (&ie; if they were encrypted, they are also stored that way). </para>
+	    <para>If unchecked, messages will <emphasis>always</emphasis> be stored unencrypted in your <guilabel>sent-mail</guilabel> folder, even if they are sent encrypted. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-show-encryption-key">
 	  <term>
-	    <guilabel
->Always show the encryption keys for approval</guilabel>
+	    <guilabel>Always show the encryption keys for approval</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, everytime you encrypt a message, a dialogue will appear that presents you with the encryption keys that will be used for each recipient. You can then review the choice of keys, change them, and approve or cancel the encryption operation. We recommend to keep this option checked, since it makes the encryption process more transparent. </para>
+	    <para>If checked, everytime you encrypt a message, a dialogue will appear that presents you with the encryption keys that will be used for each recipient. You can then review the choice of keys, change them, and approve or cancel the encryption operation. We recommend to keep this option checked, since it makes the encryption process more transparent. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-opportunistic-encryption">
 	  <term>
-	    <guilabel
->Automatically encrypt messages whenever possible</guilabel>
+	    <guilabel>Automatically encrypt messages whenever possible</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Also called <quote
->opportunistic encryption</quote
->. If checked, &kmail; will try to match recipients to (&openpgp; or &smime;) keys even when you did <emphasis
->not</emphasis
-> specifically request encryption. If usable keys are found for all recipients, &kmail; will ask whether or not you want to encrypt the message. </para>
-	    <para
->It is highly recommended to turn this on, as it makes encrypting messages really easy to use. </para>
+	    <para>Also called <quote>opportunistic encryption</quote>. If checked, &kmail; will try to match recipients to (&openpgp; or &smime;) keys even when you did <emphasis>not</emphasis> specifically request encryption. If usable keys are found for all recipients, &kmail; will ask whether or not you want to encrypt the message. </para>
+	    <para>It is highly recommended to turn this on, as it makes encrypting messages really easy to use. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-composing-never-sign-encrypt-drafts">
 	  <term>
-	    <guilabel
->Never sign/encrypt when saving as draft</guilabel>
+	    <guilabel>Never sign/encrypt when saving as draft</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will not attempt to sign and/or encrypt messages that are merely saved to the <guilabel
->drafts</guilabel
-> folder. This is more convenient, and does not result in a gross loss of security, provided the drafts folder is safe. &imap; users might want this options turned off, if their <guilabel
->drafts</guilabel
-> folder is on the server. </para>
+	    <para>If checked, &kmail; will not attempt to sign and/or encrypt messages that are merely saved to the <guilabel>drafts</guilabel> folder. This is more convenient, and does not result in a gross loss of security, provided the drafts folder is safe. &imap; users might want this options turned off, if their <guilabel>drafts</guilabel> folder is on the server. </para>
 	  </listitem>
 	</varlistentry>
 
@@ -1486,84 +699,59 @@
     </sect2>
 
     <sect2 id="configure-security-warnings">
-      <title
->Warnings </title>
+      <title>Warnings </title>
 
-      <para
->On this tab you can switch security-relavant warnings on and off. </para>
+      <para>On this tab you can switch security-relavant warnings on and off. </para>
 
       <variablelist>
 
 	<varlistentry id="configure-security-warnings-warn-send-unsigned">
 	  <term>
-	    <guilabel
->Warn when trying to send unsigned messages</guilabel>
+	    <guilabel>Warn when trying to send unsigned messages</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will show a warning if for whatever reason a message would be sent without being digitally signed. </para>
+	    <para>If checked, &kmail; will show a warning if for whatever reason a message would be sent without being digitally signed. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-warnings-warn-send-unencrypted">
 	  <term>
-	    <guilabel
->Warn when trying to send unencrypted messages</guilabel>
+	    <guilabel>Warn when trying to send unencrypted messages</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will show a warning if for whatever reason a message would be sent without being encrypted. </para>
+	    <para>If checked, &kmail; will show a warning if for whatever reason a message would be sent without being encrypted. </para>
 	    <note>
-	      <para
->While it is common to sign all outgoing messages, encrypting them is not. So unless your company has a policy of never sending any unencrypted messages, it might be a good idea to keep this option switched off and rely on <link linkend="configure-security-composing-opportunistic-encryption"
->opportunistic encryption</link
-> to alert you if you <emphasis
->could</emphasis
-> send encrypted messages, but did not request it. </para>
+	      <para>While it is common to sign all outgoing messages, encrypting them is not. So unless your company has a policy of never sending any unencrypted messages, it might be a good idea to keep this option switched off and rely on <link linkend="configure-security-composing-opportunistic-encryption">opportunistic encryption</link> to alert you if you <emphasis>could</emphasis> send encrypted messages, but did not request it. </para>
 	    </note>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-warnings-warn-receiver-email-not-in-cert">
 	  <term>
-	    <guilabel
->Warn if receiver's email address is not in certificate</guilabel>
+	    <guilabel>Warn if receiver's email address is not in certificate</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will emit a warning if an &smime; certifciate or &openpgp; key will be used for a recipient whose email address is not listed in the email addresses stored in the certificate. </para>
-	    <para
->Situations in which this warning will trigger include when configuring your per-identity &openpgp; keys or &smime; certificates, when encrypting, and when verifying signatures, if the signature was made with a certificate that does not include the email address of the sender. </para>
+	    <para>If checked, &kmail; will emit a warning if an &smime; certifciate or &openpgp; key will be used for a recipient whose email address is not listed in the email addresses stored in the certificate. </para>
+	    <para>Situations in which this warning will trigger include when configuring your per-identity &openpgp; keys or &smime; certificates, when encrypting, and when verifying signatures, if the signature was made with a certificate that does not include the email address of the sender. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-warnings-warn-near-expire">
 	  <term>
-	    <guilabel
->Warn if certificates/keys expire soon</guilabel>
+	    <guilabel>Warn if certificates/keys expire soon</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->If checked, &kmail; will warn when an &smime; certificate or &openpgp; key is used which will expire soon. </para>
-	    <para
->The period in which to warn before key/certificate expiration can then be configured separately for signing and encryption keys, as well as (in the case of &smime;), for end-user certificates, intermediate <acronym
->CA</acronym
-> certificates and root certificates. </para>
+	    <para>If checked, &kmail; will warn when an &smime; certificate or &openpgp; key is used which will expire soon. </para>
+	    <para>The period in which to warn before key/certificate expiration can then be configured separately for signing and encryption keys, as well as (in the case of &smime;), for end-user certificates, intermediate <acronym>CA</acronym> certificates and root certificates. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="configure-security-warnings-reenable-all-warnings">
 	  <term>
-	    <guilabel
->Re-Enable All &quot;Don&apos;t Ask Again&quot; Warnings</guilabel>
+	    <guilabel>Re-Enable All &quot;Don&apos;t Ask Again&quot; Warnings</guilabel>
 	  </term>
 	  <listitem>
-	    <para
->Apart from the main warnings described above, there are more warning and information messages, which contain an option to not show them again. If you would like to re-enable them after choosing not to show them again, you can achieve this by pressing this button. <footnote
-> <para
->This will re-enable <emphasis
->all</emphasis
-> such warnings for &kmail;. It does not make much sense to allow more fine-grained selection of which warnings to show since you can just check the option to suppress them again when they next show up. </para>
+	    <para>Apart from the main warnings described above, there are more warning and information messages, which contain an option to not show them again. If you would like to re-enable them after choosing not to show them again, you can achieve this by pressing this button. <footnote> <para>This will re-enable <emphasis>all</emphasis> such warnings for &kmail;. It does not make much sense to allow more fine-grained selection of which warnings to show since you can just check the option to suppress them again when they next show up. </para>
 	      </footnote>
 	    </para>
 	  </listitem>
@@ -1574,192 +762,96 @@
     </sect2>
 
     <sect2 id="configure-security-smime-validation">
-      <title
->&smime; Validation </title>
+      <title>&smime; Validation </title>
 
-      <para
->This tab contains selected entries from &gpgsm;'s <link linkend="configure-security-crypto-backends-configure"
->dynamic backend configuration dialogue</link
->. Please refer to the &gpgsm; manual for a description of these options. </para>
+      <para>This tab contains selected entries from &gpgsm;'s <link linkend="configure-security-crypto-backends-configure">dynamic backend configuration dialogue</link>. Please refer to the &gpgsm; manual for a description of these options. </para>
     </sect2>
 
     <sect2 id="configure-security-crypto-backends">
-      <title
->Crypto Backends </title>
+      <title>Crypto Backends </title>
 
-      <para
->On this tab you can configure which crypto backends are to be used for &openpgp; and &smime; cryptographic operations (such as signing and encrypting). </para>
+      <para>On this tab you can configure which crypto backends are to be used for &openpgp; and &smime; cryptographic operations (such as signing and encrypting). </para>
 
-      <para
->On the right-hand side, you see a list of available backends. Below each backend entry, you can see what protocols (&openpgp; and/or &smime;) the backend supports. If a protocol is not listed, the backend does not support it. If it is listed, but greyed out, the backend supports the protocol, but some required programs were not found, or other errors occurred during initialisation. If you press <guibutton
->Rescan</guibutton
->, a dialogue box will appear that lists reasons for the initialisation failure. </para>
+      <para>On the right-hand side, you see a list of available backends. Below each backend entry, you can see what protocols (&openpgp; and/or &smime;) the backend supports. If a protocol is not listed, the backend does not support it. If it is listed, but greyed out, the backend supports the protocol, but some required programs were not found, or other errors occurred during initialisation. If you press <guibutton>Rescan</guibutton>, a dialogue box will appear that lists reasons for the initialisation failure. </para>
 
-      <para id="configure-security-crypto-backends-configure"
->To configure a backend, select it in the list of available backends and press <guibutton
->Configure...</guibutton
->. The per-backend configuration dialogue is dynamically created from the information returned by the backend. It may therefore change if you update the backend applications, although &kmail; itself is unchanged. If the <guibutton
->Configure...</guibutton
-> button is disabled, the backend does not support a backend configuration dialogue. </para>
+      <para id="configure-security-crypto-backends-configure">To configure a backend, select it in the list of available backends and press <guibutton>Configure...</guibutton>. The per-backend configuration dialogue is dynamically created from the information returned by the backend. It may therefore change if you update the backend applications, although &kmail; itself is unchanged. If the <guibutton>Configure...</guibutton> button is disabled, the backend does not support a backend configuration dialogue. </para>
 
-      <para
->Please refer to the manuals of the applications underlying each backend for a description of the options presented in the backend configuration dialogues. </para>
+      <para>Please refer to the manuals of the applications underlying each backend for a description of the options presented in the backend configuration dialogues. </para>
 
-      <para
->In front of each backend's protocol entries, you can see a checkbox, with which you select which backend is to be used for a given protocol. These checkboxes are exclusive per protocol, meaning that if you select a backend to perform &openpgp; operations, any previously selected &openpgp; implementation will be unselected, but the &smime; backend selection will be unchanged. If no backend is selected for a given protocol, that protocol is effectively disabled for use in &kmail;. </para>
+      <para>In front of each backend's protocol entries, you can see a checkbox, with which you select which backend is to be used for a given protocol. These checkboxes are exclusive per protocol, meaning that if you select a backend to perform &openpgp; operations, any previously selected &openpgp; implementation will be unselected, but the &smime; backend selection will be unchanged. If no backend is selected for a given protocol, that protocol is effectively disabled for use in &kmail;. </para>
 
     </sect2>
 
-  </sect1
-> <!-- configure-security -->
+  </sect1> <!-- configure-security -->
 
 <sect1 id="configure-misc">
-<title
->Misc Page</title>
+<title>Misc Page</title>
 
 <sect2 id="configure-misc-folders">
-<title
->Folders</title>
+<title>Folders</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Ask for confirmation before moving all messages to the wastebin</guilabel
-></term>
+<term><guilabel>Ask for confirmation before moving all messages to the wastebin</guilabel></term>
 <listitem>
-<para
->Enable this option if you want to be asked for confirmation whenever you use <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Move All Messages to Wastebin</guimenuitem
-></menuchoice
->.</para>
+<para>Enable this option if you want to be asked for confirmation whenever you use <menuchoice><guimenu>Folder</guimenu><guimenuitem>Move All Messages to Wastebin</guimenuitem></menuchoice>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Exclude important messages from expiry</guilabel
-></term>
+<term><guilabel>Exclude important messages from expiry</guilabel></term>
 <listitem>
-<para
->Enable this option if important messages should never be deleted during message expiration, &ie; during automatic deletion of old messages.</para>
+<para>Enable this option if important messages should never be deleted during message expiration, &ie; during automatic deletion of old messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="configure-misc-folders-go-unread">
-<term
-><guilabel
->When trying to find unread messages</guilabel
-></term>
+<term><guilabel>When trying to find unread messages</guilabel></term>
 <listitem>
-<para
->This option controls what happens if you press one of the shortcuts to go to the next or previous unread message (&eg; <keycap
->Space</keycap
->). If you ask &kmail; to go to the next unread message although there is no unread message below the currently selected message then the following happens: <itemizedlist
-> <listitem
-> <para
->If <guilabel
->Do not Loop</guilabel
-> is selected then nothing will happen. </para
-> </listitem
-> <listitem
-> <para
->If <guilabel
->Loop in Current Folder</guilabel
-> is selected then &kmail; will search from the beginning of the current folder for an unread message. If none is found then nothing happens.</para
-> </listitem
-> <listitem
-> <para
->If <guilabel
->Loop in All Folders</guilabel
-> is selected then &kmail; will first search in the current folder for another unread message. If none is found then &kmail; will search the next folder containing unread messages. </para
-> </listitem
-> </itemizedlist
-> Correspondingly, if you ask &kmail; to go to the previous unread message. </para>
+<para>This option controls what happens if you press one of the shortcuts to go to the next or previous unread message (&eg; <keycap>Space</keycap>). If you ask &kmail; to go to the next unread message although there is no unread message below the currently selected message then the following happens: <itemizedlist> <listitem> <para>If <guilabel>Do not Loop</guilabel> is selected then nothing will happen. </para> </listitem> <listitem> <para>If <guilabel>Loop in Current Folder</guilabel> is selected then &kmail; will search from the beginning of the current folder for an unread message. If none is found then nothing happens.</para> </listitem> <listitem> <para>If <guilabel>Loop in All Folders</guilabel> is selected then &kmail; will first search in the current folder for another unread message. If none is found then &kmail; will search the next folder containing unread messages. </para> </listitem> </itemizedlist> Correspondingly, if you ask &kmail; to go to the previous unread message. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Jump to first unread message when entering a folder</guilabel
-></term>
+<term><guilabel>Jump to first unread message when entering a folder</guilabel></term>
 <listitem>
-<para
->If this option is enabled &kmail; will go to the first unread message when you enter a folder; if it is not enabled, &kmail; will go to first new message or, if there is no new message, to the message that was selected when you last left the folder.</para>
+<para>If this option is enabled &kmail; will go to the first unread message when you enter a folder; if it is not enabled, &kmail; will go to first new message or, if there is no new message, to the message that was selected when you last left the folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Mark selected message as read after...</guilabel
-></term>
+<term><guilabel>Mark selected message as read after...</guilabel></term>
 <listitem>
-<para
->When you select a <guilabel
->new</guilabel
-> or <guilabel
->unread</guilabel
-> message, &kmail; will change the message's status to <guilabel
->read</guilabel
-> after the number of seconds entered here. If you disable this option, messages will keep their <guilabel
->new</guilabel
-> or <guilabel
->unread</guilabel
-> status.</para>
+<para>When you select a <guilabel>new</guilabel> or <guilabel>unread</guilabel> message, &kmail; will change the message's status to <guilabel>read</guilabel> after the number of seconds entered here. If you disable this option, messages will keep their <guilabel>new</guilabel> or <guilabel>unread</guilabel> status.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Ask for action after dragging messages to another folder</guilabel
-></term>
+<term><guilabel>Ask for action after dragging messages to another folder</guilabel></term>
 <listitem>
-<para
->When you drag a message to a different folder, a small popup will ask you if you want to move or copy the message. If you disable this option, the message will be moved immediately, without a popup.</para>
+<para>When you drag a message to a different folder, a small popup will ask you if you want to move or copy the message. If you disable this option, the message will be moved immediately, without a popup.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->By default, message folders on disk are...</guilabel
-></term>
+<term><guilabel>By default, message folders on disk are...</guilabel></term>
 <listitem>
-<para
->Here you can set the default <link linkend="folders-format"
->folder format</link
-> that is used when you create a new folder.</para>
+<para>Here you can set the default <link linkend="folders-format">folder format</link> that is used when you create a new folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Open this folder on startup</guilabel
-></term>
+<term><guilabel>Open this folder on startup</guilabel></term>
 <listitem>
-<para
->Here you can set the folder that should be selected by default if you start &kmail;. If you use only &imap; folders then you might want to set this to your &imap; inbox folder.</para>
+<para>Here you can set the folder that should be selected by default if you start &kmail;. If you use only &imap; folders then you might want to set this to your &imap; inbox folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Empty wastebin on program exit</guilabel
-></term>
+<term><guilabel>Empty wastebin on program exit</guilabel></term>
 <listitem>
-<para
->The wastebin folder is cleared of messages when you quit &kmail; if this option is selected.</para
-> 
+<para>The wastebin folder is cleared of messages when you quit &kmail; if this option is selected.</para> 
 </listitem>
 </varlistentry>
 
@@ -1768,118 +860,58 @@
 </sect2>
 
 <sect2 id="configure-misc-groupware">
-<title
->Groupware</title>
+<title>Groupware</title>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Enable IMAP resource functionality</guilabel
-></term>
+<term><guilabel>Enable IMAP resource functionality</guilabel></term>
 <listitem>
-<para
->Makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook and KNotes). This option has to be set whenever you are configuring Kontact as a <guilabel
->TDE Kolab client</guilabel
->. This option being enabled you will also need to add the appropriate resources from the <guilabel
->TDE Control Center</guilabel
-> (kcontrol) in the <guilabel
->TDE Resources Configuration</guilabel
-> section. <guilabel
->Kolab</guilabel
-> resources have to be added in case the resource functionality applies to a <guilabel
->TDE Kolab client</guilabel
-> set-up.</para>
+<para>Makes it possible to store the entries from the Kontact applications (KOrganizer, KAddressBook and KNotes). This option has to be set whenever you are configuring Kontact as a <guilabel>TDE Kolab client</guilabel>. This option being enabled you will also need to add the appropriate resources from the <guilabel>TDE Control Center</guilabel> (kcontrol) in the <guilabel>TDE Resources Configuration</guilabel> section. <guilabel>Kolab</guilabel> resources have to be added in case the resource functionality applies to a <guilabel>TDE Kolab client</guilabel> set-up.</para>
 </listitem>
 </varlistentry>
 <varlistentry id="configure-misc-format-groupware-folders">
-<term
-><guilabel
->Format used for the groupware folders</guilabel
-></term>
+<term><guilabel>Format used for the groupware folders</guilabel></term>
 <listitem>
-<para
->Choose the storage format for the groupware folders</para>
+<para>Choose the storage format for the groupware folders</para>
 <itemizedlist>
 <listitem>
-<para
->Default format is <guilabel
->Standard (Ical/Vcard)</guilabel
-> for calendar folders (Ical) and addressbook folders (Vcard). This makes all Kontact features available.</para>
+<para>Default format is <guilabel>Standard (Ical/Vcard)</guilabel> for calendar folders (Ical) and addressbook folders (Vcard). This makes all Kontact features available.</para>
 </listitem>
 <listitem>
-<para
-><guilabel
->Kolab</guilabel
-> users should choose <guilabel
->Kolab XML</guilabel
->. This format uses a custom model that matches more closely to the one used in Microsoft Outlook(tm) and gives better compatibility.</para>
+<para><guilabel>Kolab</guilabel> users should choose <guilabel>Kolab XML</guilabel>. This format uses a custom model that matches more closely to the one used in Microsoft Outlook(tm) and gives better compatibility.</para>
 </listitem>
 </itemizedlist>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Language of the groupware folders</guilabel
-></term>
+<term><guilabel>Language of the groupware folders</guilabel></term>
 <listitem>
-<para
->Choose between the available languages to set the folder names of the <guilabel
->IMAP</guilabel
-> storage to your local language. Note that this option is only aimed for compatibility with Microsoft Outlook(tm). It is not recommended to change its default unless you have to, since it makes changing languages impossible.</para>
+<para>Choose between the available languages to set the folder names of the <guilabel>IMAP</guilabel> storage to your local language. Note that this option is only aimed for compatibility with Microsoft Outlook(tm). It is not recommended to change its default unless you have to, since it makes changing languages impossible.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Resource folders are in account</guilabel
-></term>
+<term><guilabel>Resource folders are in account</guilabel></term>
 <listitem>
-<para
->Select the parent of the <guilabel
->IMAP</guilabel
-> resource folders. You should select the name of your <guilabel
->IMAP/DIMAP</guilabel
-> account. By default the <guilabel
->Kolab</guilabel
-> server sets the <guilabel
->IMAP</guilabel
-> inbox to be the parent.</para>
+<para>Select the parent of the <guilabel>IMAP</guilabel> resource folders. You should select the name of your <guilabel>IMAP/DIMAP</guilabel> account. By default the <guilabel>Kolab</guilabel> server sets the <guilabel>IMAP</guilabel> inbox to be the parent.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Hide groupware folders</guilabel
-></term>
+<term><guilabel>Hide groupware folders</guilabel></term>
 <listitem>
-<para
->You should not need to see the folders that hold the <guilabel
->IMAP</guilabel
-> resources. However if you want to see them, you can set that by enabling this option.</para>
+<para>You should not need to see the folders that hold the <guilabel>IMAP</guilabel> resources. However if you want to see them, you can set that by enabling this option.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Mangle From:/To: headers in replies to invitations</guilabel
-></term>
+<term><guilabel>Mangle From:/To: headers in replies to invitations</guilabel></term>
 <listitem>
-<para
->Enable this option to make Microsoft Outlook(tm) understand your answers to invitations replies.</para>
+<para>Enable this option to make Microsoft Outlook(tm) understand your answers to invitations replies.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Send invitations in the mail body</guilabel
-></term>
+<term><guilabel>Send invitations in the mail body</guilabel></term>
 <listitem>
-<para
->Invitations use to be send as attachments to a mail. By enabling this option, you let the invitation mails to be sent in the text of the mail, which is necessary to send invitations and replies to Microsoft Outlook(tm).</para
-> 
+<para>Invitations use to be send as attachments to a mail. By enabling this option, you let the invitation mails to be sent in the text of the mail, which is necessary to send invitations and replies to Microsoft Outlook(tm).</para> 
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/credits-and-licenses.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/credits-and-licenses.docbook
index 1f8878ab685..119a0f422e6 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/credits-and-licenses.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/credits-and-licenses.docbook
@@ -2,394 +2,114 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->British English English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>British English English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-13</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-13</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Credits and Licences</title>
+<title>Credits and Licences</title>
 
-<para
->&kmail;: Copyright the &kmail; developers, 1997-2004</para>
+<para>&kmail;: Copyright the &kmail; developers, 1997-2004</para>
 &underGPL; &underFDL; <sect1 id="team">
-<title
->Development Team</title>
+<title>Development Team</title>
 <!-- please keep in sync with the authors list on the webpage -->
 
 <!-- don't modify manually, this list is generated: -->
 <itemizedlist>
-<listitem
-><para
->Ingo Kl&ouml;cker (kloecker at kde org): Maintainer</para
-></listitem>
-<listitem
-><para
->Don Sanders (sanders at kde org): Adopter and co-maintainer</para
-></listitem>
-<listitem
-><para
->Stefan Taferner (taferner at kde org): Original author</para
-></listitem>
-<listitem
-><para
->Michael H&auml;ckel (haeckel at kde org): Former maintainer</para
-></listitem>
-<listitem
-><para
->Till Adam (till at adam-lilienthal de): Core developer</para
-></listitem>
-<listitem
-><para
->Carsten Burghardt (burghardt at kde org): Core developer</para
-></listitem>
-<listitem
-><para
->Marc Mutz (mutz at kde org): Core developer</para
-></listitem>
-<listitem
-><para
->Daniel Naber (daniel naber at t-online de): Documentation</para
-></listitem>
-<listitem
-><para
->Zack Rusin (zack at kde org): Core developer</para
-></listitem>
-<listitem
-><para
->Toyohiro Asukai (toyohiro at ksmplus com)</para
-></listitem>
-<listitem
-><para
->Waldo Bastian (bastian at kde org)</para
-></listitem>
-<listitem
-><para
->Ryan Breen (ryan at ryanbreen com): system tray notification</para
-></listitem>
-<listitem
-><para
->Steven Brown (swbrown at ucsd edu)</para
-></listitem>
-<listitem
-><para
->Matthias Kalle Dalheimer (kalle at kde org)</para
-></listitem>
-<listitem
-><para
->Cristi Dumitrescu (cristid at chip ro)</para
-></listitem>
-<listitem
-><para
->David Faure (faure at kde org)</para
-></listitem>
-<listitem
-><para
->Philippe Fremy (pfremy at chez com)</para
-></listitem>
-<listitem
-><para
->Kurt Granroth (granroth at kde org)</para
-></listitem>
-<listitem
-><para
->Andreas Gungl (a gungl at gmx de): PGP 6 support and further enhancements of the encryption support</para
-></listitem>
-<listitem
-><para
->Steffen Hansen (hansen at kde org)</para
-></listitem>
-<listitem
-><para
->Igor Janssen (rm at linux ru net)</para
-></listitem>
-<listitem
-><para
->Matt Johnston (matt at caifex org)</para
-></listitem>
-<listitem
-><para
->Christer Kaivo-oja (whizkid at telia com)</para
-></listitem>
-<listitem
-><para
->Lars Knoll (knoll at kde org): Original encryption support, PGP 2 and PGP 5 support</para
-></listitem>
-<listitem
-><para
->J. Nick Koston (bdraco at darkorb net): GnuPG support</para
-></listitem>
-<listitem
-><para
->Stephan Kulow (coolo at kde org)</para
-></listitem>
-<listitem
-><para
->Guillaume Laurent (glaurent at telegraph-road org)</para
-></listitem>
-<listitem
-><para
->Sam Magnuson (sam at trolltech com)</para
-></listitem>
-<listitem
-><para
->Laurent Montel (lmontel at mandrakesoft com)</para
-></listitem>
-<listitem
-><para
->Matt Newell (newellm at proaxis com)</para
-></listitem>
-<listitem
-><para
->Denis Perchine (dyp at perchine com)</para
-></listitem>
-<listitem
-><para
->Samuel Penn (sam at bifrost demon co uk)</para
-></listitem>
-<listitem
-><para
->Carsten Pfeiffer (pfeiffer at kde org)</para
-></listitem>
-<listitem
-><para
->Sven Radej (radej at kde org)</para
-></listitem>
-<listitem
-><para
->Mark Roberts (mark at taurine demon co uk)</para
-></listitem>
-<listitem
-><para
->Wolfgang Rohdewald (wrohdewald at dplanet ch)</para
-></listitem>
-<listitem
-><para
->Espen Sand (espen at kde org)</para
-></listitem>
-<listitem
-><para
->Aaron J. Seigo (aseigo at olympusproject org)</para
-></listitem>
-<listitem
-><para
->George Staikos (staikos at kde org)</para
-></listitem>
-<listitem
-><para
->Jason Stephenson (panda at mis net)</para
-></listitem>
-<listitem
-><para
->Jacek Stolarczyk (jacek at mer chemia polsl gliwice pl)</para
-></listitem>
-<listitem
-><para
->Roberto S. Teixeira (maragato at kde org)</para
-></listitem>
-<listitem
-><para
->Bo Thorsen (bo at sonofthor dk)</para
-></listitem>
-<listitem
-><para
->Ronen Tzur (rtzur at shani net)</para
-></listitem>
-<listitem
-><para
->Mario Weilguni (mweilguni at sime com)</para
-></listitem>
-<listitem
-><para
->Wynn Wilkes (wynnw at calderasystems com)</para
-></listitem>
-<listitem
-><para
->Robert D. Williams (rwilliams at kde org)</para
-></listitem>
-<listitem
-><para
->Markus W&uuml;bben (markus wuebben at kde org)</para
-></listitem>
-<listitem
-><para
->Karl-Heinz Zimmer (khz at kde org)</para
-></listitem>
+<listitem><para>Ingo Kl&ouml;cker (kloecker at kde org): Maintainer</para></listitem>
+<listitem><para>Don Sanders (sanders at kde org): Adopter and co-maintainer</para></listitem>
+<listitem><para>Stefan Taferner (taferner at kde org): Original author</para></listitem>
+<listitem><para>Michael H&auml;ckel (haeckel at kde org): Former maintainer</para></listitem>
+<listitem><para>Till Adam (till at adam-lilienthal de): Core developer</para></listitem>
+<listitem><para>Carsten Burghardt (burghardt at kde org): Core developer</para></listitem>
+<listitem><para>Marc Mutz (mutz at kde org): Core developer</para></listitem>
+<listitem><para>Daniel Naber (daniel naber at t-online de): Documentation</para></listitem>
+<listitem><para>Zack Rusin (zack at kde org): Core developer</para></listitem>
+<listitem><para>Toyohiro Asukai (toyohiro at ksmplus com)</para></listitem>
+<listitem><para>Waldo Bastian (bastian at kde org)</para></listitem>
+<listitem><para>Ryan Breen (ryan at ryanbreen com): system tray notification</para></listitem>
+<listitem><para>Steven Brown (swbrown at ucsd edu)</para></listitem>
+<listitem><para>Matthias Kalle Dalheimer (kalle at kde org)</para></listitem>
+<listitem><para>Cristi Dumitrescu (cristid at chip ro)</para></listitem>
+<listitem><para>David Faure (faure at kde org)</para></listitem>
+<listitem><para>Philippe Fremy (pfremy at chez com)</para></listitem>
+<listitem><para>Kurt Granroth (granroth at kde org)</para></listitem>
+<listitem><para>Andreas Gungl (a gungl at gmx de): PGP 6 support and further enhancements of the encryption support</para></listitem>
+<listitem><para>Steffen Hansen (hansen at kde org)</para></listitem>
+<listitem><para>Igor Janssen (rm at linux ru net)</para></listitem>
+<listitem><para>Matt Johnston (matt at caifex org)</para></listitem>
+<listitem><para>Christer Kaivo-oja (whizkid at telia com)</para></listitem>
+<listitem><para>Lars Knoll (knoll at kde org): Original encryption support, PGP 2 and PGP 5 support</para></listitem>
+<listitem><para>J. Nick Koston (bdraco at darkorb net): GnuPG support</para></listitem>
+<listitem><para>Stephan Kulow (coolo at kde org)</para></listitem>
+<listitem><para>Guillaume Laurent (glaurent at telegraph-road org)</para></listitem>
+<listitem><para>Sam Magnuson (sam at trolltech com)</para></listitem>
+<listitem><para>Laurent Montel (lmontel at mandrakesoft com)</para></listitem>
+<listitem><para>Matt Newell (newellm at proaxis com)</para></listitem>
+<listitem><para>Denis Perchine (dyp at perchine com)</para></listitem>
+<listitem><para>Samuel Penn (sam at bifrost demon co uk)</para></listitem>
+<listitem><para>Carsten Pfeiffer (pfeiffer at kde org)</para></listitem>
+<listitem><para>Sven Radej (radej at kde org)</para></listitem>
+<listitem><para>Mark Roberts (mark at taurine demon co uk)</para></listitem>
+<listitem><para>Wolfgang Rohdewald (wrohdewald at dplanet ch)</para></listitem>
+<listitem><para>Espen Sand (espen at kde org)</para></listitem>
+<listitem><para>Aaron J. Seigo (aseigo at olympusproject org)</para></listitem>
+<listitem><para>George Staikos (staikos at kde org)</para></listitem>
+<listitem><para>Jason Stephenson (panda at mis net)</para></listitem>
+<listitem><para>Jacek Stolarczyk (jacek at mer chemia polsl gliwice pl)</para></listitem>
+<listitem><para>Roberto S. Teixeira (maragato at kde org)</para></listitem>
+<listitem><para>Bo Thorsen (bo at sonofthor dk)</para></listitem>
+<listitem><para>Ronen Tzur (rtzur at shani net)</para></listitem>
+<listitem><para>Mario Weilguni (mweilguni at sime com)</para></listitem>
+<listitem><para>Wynn Wilkes (wynnw at calderasystems com)</para></listitem>
+<listitem><para>Robert D. Williams (rwilliams at kde org)</para></listitem>
+<listitem><para>Markus W&uuml;bben (markus wuebben at kde org)</para></listitem>
+<listitem><para>Karl-Heinz Zimmer (khz at kde org)</para></listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="credits">
-<title
->Credits</title>
+<title>Credits</title>
 
 <itemizedlist>
-<listitem
-><para
->Heiko Hund (heiko at ist eigentlich net): POP filters</para
-></listitem>
-<listitem
-><para
->Bernhard Reiter (bernhard at intevation de): &Auml;gypten and Kroupware project management</para
-></listitem>
-<listitem
-><para
->Jan Simonson (jan at simonson pp se): beta testing of PGP 6 support</para
-></listitem>
-<listitem
-><para
->Patrick S. Vogt (patrick vogt at unibas ch): timestamp for 'Transmission completed' status messages</para
-></listitem>
-<listitem
-><para
->Jan-Oliver Wagner (jan at intevation de): &Auml;gypten and Kroupware project management</para
-></listitem>
-<listitem
-><para
->Wolfgang Westphal (wolfgang westphal at gmx de): multiple encryption keys per address</para
-></listitem>
-<listitem
-><para
->Thorsten Zachmann (t zachmann at zagge de): POP filters</para
-></listitem>
+<listitem><para>Heiko Hund (heiko at ist eigentlich net): POP filters</para></listitem>
+<listitem><para>Bernhard Reiter (bernhard at intevation de): &Auml;gypten and Kroupware project management</para></listitem>
+<listitem><para>Jan Simonson (jan at simonson pp se): beta testing of PGP 6 support</para></listitem>
+<listitem><para>Patrick S. Vogt (patrick vogt at unibas ch): timestamp for 'Transmission completed' status messages</para></listitem>
+<listitem><para>Jan-Oliver Wagner (jan at intevation de): &Auml;gypten and Kroupware project management</para></listitem>
+<listitem><para>Wolfgang Westphal (wolfgang westphal at gmx de): multiple encryption keys per address</para></listitem>
+<listitem><para>Thorsten Zachmann (t zachmann at zagge de): POP filters</para></listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id="documentation">
-<title
->Documentation</title>
+<title>Documentation</title>
 
-<para
->Update for &kmail; 1.7 by Ingo Kl&ouml;cker <email
->kloecker@kde.de</email
-> and Marc Mutz <email
->mutz@kde.org</email
->, Anti-Spam Wizard chapter by Andreas Gungl <email
->a.gungl@gmx.de</email
->, section about filter log by Andreas Gungl <email
->a.gungl@gmx.de</email
-> and Brad Hards <email
->bradh@frogmouth.net</email
->, additional changes by Daniel Naber <email
->daniel.naber@t-online.de</email
->.</para>
+<para>Update for &kmail; 1.7 by Ingo Kl&ouml;cker <email>kloecker@kde.de</email> and Marc Mutz <email>mutz@kde.org</email>, Anti-Spam Wizard chapter by Andreas Gungl <email>a.gungl@gmx.de</email>, section about filter log by Andreas Gungl <email>a.gungl@gmx.de</email> and Brad Hards <email>bradh@frogmouth.net</email>, additional changes by Daniel Naber <email>daniel.naber@t-online.de</email>.</para>
 
-<para
->Update for &kmail; 1.2 to 1.5 by Daniel Naber <email
->daniel.naber@t-online.de</email
->, <application
->OpenPGP</application
-> chapter by Andreas Gungl <email
->a.gungl@gmx.de</email
-> and Ingo Kl&ouml;cker <email
->kloecker@kde.de</email
->, message filter chapter by Marc Mutz <email
->mutz@kde.org</email
->, download filter chapter by Thorsten Zachmann <email
->T.Zachmann@zagge.de</email
->. Other parts have been contributed by various &kmail; developers.</para>
+<para>Update for &kmail; 1.2 to 1.5 by Daniel Naber <email>daniel.naber@t-online.de</email>, <application>OpenPGP</application> chapter by Andreas Gungl <email>a.gungl@gmx.de</email> and Ingo Kl&ouml;cker <email>kloecker@kde.de</email>, message filter chapter by Marc Mutz <email>mutz@kde.org</email>, download filter chapter by Thorsten Zachmann <email>T.Zachmann@zagge.de</email>. Other parts have been contributed by various &kmail; developers.</para>
 
-<para
->&kmail; 1.0 documentation by David Rugge <email
->davidrugge@mediaone.net</email
->. Original documentation by Markus Wuebben <email
->markus.wuebben@kde.org</email
->, Robert Williams <email
->rwilliams@kde.org</email
-> (Editor).</para>
+<para>&kmail; 1.0 documentation by David Rugge <email>davidrugge@mediaone.net</email>. Original documentation by Markus Wuebben <email>markus.wuebben@kde.org</email>, Robert Williams <email>rwilliams@kde.org</email> (Editor).</para>
 
-<para
->Thanks to Michael Elkins <email
->me@cs.hmc.edu</email
-> for his excellent description of the different &UNIX; mail formats in the <application
->Mutt</application
-> documentation.</para>
+<para>Thanks to Michael Elkins <email>me@cs.hmc.edu</email> for his excellent description of the different &UNIX; mail formats in the <application>Mutt</application> documentation.</para>
 
-<para
->Thanks to the following people for providing directions on using other email client mailboxes with &kmail;:</para>
+<para>Thanks to the following people for providing directions on using other email client mailboxes with &kmail;:</para>
 
 <itemizedlist>
-<listitem
-><para
->Nik Gaffney <email
->nik@f0.am</email
-> (<application
->Mailsmith</application
->)</para
-></listitem>
-<listitem
-><para
->David McMillen <email
->mcmillen@math.bu.edu</email
-> and Mendel Mobach <email
->mendel@mobach.nl</email
-> (&Netscape; mail)</para
-></listitem>
-<listitem
-><para
->Ed Shapard <email
->shapard@bigfoot.com</email
-> (<application
->Pegasus</application
-> Mail)</para
-></listitem>
-<listitem
-><para
->Ray Muir <email
->rjmuir@ibm.net</email
-> (Forte <application
->Agent</application
->)</para
-></listitem>
+<listitem><para>Nik Gaffney <email>nik@f0.am</email> (<application>Mailsmith</application>)</para></listitem>
+<listitem><para>David McMillen <email>mcmillen@math.bu.edu</email> and Mendel Mobach <email>mendel@mobach.nl</email> (&Netscape; mail)</para></listitem>
+<listitem><para>Ed Shapard <email>shapard@bigfoot.com</email> (<application>Pegasus</application> Mail)</para></listitem>
+<listitem><para>Ray Muir <email>rjmuir@ibm.net</email> (Forte <application>Agent</application>)</para></listitem>
 </itemizedlist>
 
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 
 </sect1>
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/faq.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/faq.docbook
index e1f1455aba3..2f59836d914 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/faq.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/faq.docbook
@@ -2,56 +2,18 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-14</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-14</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Frequently Asked Questions (&FAQ;)</title>
-<!-- TODO: split into categories? unfortunately this will produce several files, eg. with <section
-> -->
+<title>Frequently Asked Questions (&FAQ;)</title>
+<!-- TODO: split into categories? unfortunately this will produce several files, eg. with <section> -->
 
 <qandaset id="faq-set">
 
@@ -59,605 +21,218 @@
 ~/Mail (incl. hidden ones) to the new ~/Mail folder -->
 
 <qandaentry>
-<question
-><para
->Why are my filters not applied to incoming messages of IMAP accounts?</para
-></question>
+<question><para>Why are my filters not applied to incoming messages of IMAP accounts?</para></question>
 <answer>
-<para
->Normal IMAP mode does not support filtering, but the new disconnected IMAP account type does. You could try to use server-side filtering (ask your admin for how to install filters on the server and in which format), since IMAP is all about managing your email <emphasis
->on the server</emphasis
->. Unfortunately, although there exists a mail filter language (Sieve, defined in RFC3028), there is no standardised access protocol for installing or editing server-side Sieve scripts. If such a protocol becomes available in the future, &kmail; will most probably include support for it.</para>
+<para>Normal IMAP mode does not support filtering, but the new disconnected IMAP account type does. You could try to use server-side filtering (ask your admin for how to install filters on the server and in which format), since IMAP is all about managing your email <emphasis>on the server</emphasis>. Unfortunately, although there exists a mail filter language (Sieve, defined in RFC3028), there is no standardised access protocol for installing or editing server-side Sieve scripts. If such a protocol becomes available in the future, &kmail; will most probably include support for it.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Using <application
->PGP</application
-> or <application
->GnuPG</application
-> is very slow or it blocks &kmail;.</para
-></question>
+<question><para>Using <application>PGP</application> or <application>GnuPG</application> is very slow or it blocks &kmail;.</para></question>
 <answer>
-<para
->&kmail; accesses <application
->PGP</application
->/<application
->GnuPG</application
-> synchronously, &ie; it blocks while <application
->PGP</application
->/<application
->GnuPG</application
-> works. This means that you might want to disable automatic retrieval of unknown keys from a keyserver to make &kmail; look more responsive. If you are using <application
->GnuPG</application
-> 1.0.7 (or better) or upgraded from an earlier version, then make sure to run <command
->gpg <option
->--rebuild-keydb-caches</option
-></command
-> once and <command
->gpg <option
->--check-trustdb</option
-></command
-> after every import or refresh. Both will speed up <application
->GnuPG</application
-> immensely.</para>
+<para>&kmail; accesses <application>PGP</application>/<application>GnuPG</application> synchronously, &ie; it blocks while <application>PGP</application>/<application>GnuPG</application> works. This means that you might want to disable automatic retrieval of unknown keys from a keyserver to make &kmail; look more responsive. If you are using <application>GnuPG</application> 1.0.7 (or better) or upgraded from an earlier version, then make sure to run <command>gpg <option>--rebuild-keydb-caches</option></command> once and <command>gpg <option>--check-trustdb</option></command> after every import or refresh. Both will speed up <application>GnuPG</application> immensely.</para>
 </answer>
 </qandaentry>
 
 <qandaentry id="pgp-faq">
-<question
-><para
->What should I know if I want to use <application
->PGP</application
->/<application
->GnuPG</application
-> with &kmail;?</para
-></question>
-
-<answer
-><para
->&kmail; provides a simple and easy-to-use interface for the basic functions of these programs; still you should understand how these programs work and what might make their use insecure. Some important issues:</para>
+<question><para>What should I know if I want to use <application>PGP</application>/<application>GnuPG</application> with &kmail;?</para></question>
+
+<answer><para>&kmail; provides a simple and easy-to-use interface for the basic functions of these programs; still you should understand how these programs work and what might make their use insecure. Some important issues:</para>
 
 <itemizedlist>
 <listitem>
-<para
->You <emphasis
->really</emphasis
-> should test if encryption works before you use it. &kmail; partly relies on <application
->PGP</application
->/<application
->GnuPG</application
->'s error strings, which often change between different versions.</para>
+<para>You <emphasis>really</emphasis> should test if encryption works before you use it. &kmail; partly relies on <application>PGP</application>/<application>GnuPG</application>'s error strings, which often change between different versions.</para>
 </listitem>
 <listitem>
-<para
->&kmail; will not encrypt messages with an untrusted (unsigned) public key: if you want to encrypt to such a key you should check the identity of the key owner and only then sign the key with your secret key; if you do not want to or cannot check the identity of the key owner but nevertheless want to encrypt the message then please sign the key locally with <userinput
-><command
->gpg</command
-> <option
->--lsign</option
-> <replaceable
->keyID</replaceable
-></userinput
->.</para>
+<para>&kmail; will not encrypt messages with an untrusted (unsigned) public key: if you want to encrypt to such a key you should check the identity of the key owner and only then sign the key with your secret key; if you do not want to or cannot check the identity of the key owner but nevertheless want to encrypt the message then please sign the key locally with <userinput><command>gpg</command> <option>--lsign</option> <replaceable>keyID</replaceable></userinput>.</para>
 </listitem>
 <listitem>
-<para
->Trusting a foreign public key without checking it is not a good idea.</para>
+<para>Trusting a foreign public key without checking it is not a good idea.</para>
 </listitem>
 <listitem>
-<para
->&kmail; cannot encrypt and sign attachments if you are using the built-in OpenPGP support. For encrypted and signed attachments you need to have <link linkend="configure-security-crypto-backends"
->crypto plugins</link
-> installed and configured.</para>
+<para>&kmail; cannot encrypt and sign attachments if you are using the built-in OpenPGP support. For encrypted and signed attachments you need to have <link linkend="configure-security-crypto-backends">crypto plugins</link> installed and configured.</para>
 </listitem>
 <listitem>
-<para
->Starting with GnuPG 1.0.7 you have to set your own key to ultimate ownertrust: it is no longer implicitly done for you.</para>
+<para>Starting with GnuPG 1.0.7 you have to set your own key to ultimate ownertrust: it is no longer implicitly done for you.</para>
 </listitem>
 </itemizedlist>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Where does &kmail; save my settings and my mail?</para
-></question>
+<question><para>Where does &kmail; save my settings and my mail?</para></question>
 <answer>
-<para
->Most &kmail; settings are stored in <filename
->$<envar
->TDEHOME</envar
->/share/config/kmailrc</filename
->, where $<envar
->TDEHOME</envar
-> is typically <filename class="directory"
->~/.trinity</filename
->; the identities are stored in <filename
->$<envar
->TDEHOME</envar
->/share/config/emailidentities</filename
-> and your mail is saved in <filename class="directory"
->~/Mail</filename
->. Note that some of the files are hidden: remember to also copy those if you want to backup or archive your mails.</para>
+<para>Most &kmail; settings are stored in <filename>$<envar>TDEHOME</envar>/share/config/kmailrc</filename>, where $<envar>TDEHOME</envar> is typically <filename class="directory">~/.trinity</filename>; the identities are stored in <filename>$<envar>TDEHOME</envar>/share/config/emailidentities</filename> and your mail is saved in <filename class="directory">~/Mail</filename>. Note that some of the files are hidden: remember to also copy those if you want to backup or archive your mails.</para>
 </answer>
 </qandaentry>
 
 <qandaentry id="faq-index-regeneration">
-<question
-><para
->Why did &kmail; regenerate the index of a folder?</para
-></question>
+<question><para>Why did &kmail; regenerate the index of a folder?</para></question>
 <answer>
-<para
->&kmail; regenerates the index of a folder whenever the index appears to be out of date, &ie; whenever the contents of a folder are newer than the index. &kmail; regenerates the index in this case in order to prevent the loss or corruption of messages. Unfortunately, currently-deleted messages might reappear and message flags (like important, etc.) might be lost when the index is regenerated.</para>
-<para
->An outdated index can have several causes; the two most important causes are: <itemizedlist>
-<listitem
-><para
->Some other program modified the contents of the folder: if you want to use &kmail; together with procmail then please read <link linkend="faq-procmail"
->this &FAQ;</link
->. If you want to use &kmail; together with another email client then please read <link linkend="faq-other-muas"
->this &FAQ;</link
->.</para
-></listitem>
-<listitem
-><para
->If your mail folder (usually <filename class="directory"
->~/Mail</filename
->) is on a volume which is mounted via NFS and if the clock of the NFS server is ahead of the clock of your computer then the NFS server sometimes reports a wrong file date for the index file. In this case &kmail; assumes that the index is outdated although in reality it is not. To fix this problem you (or your system administrator) have to make sure that the clock of the NFS server and the clock of your computer are always in sync. One way to achieve this is the use of the ntp daemon.</para
-></listitem>
+<para>&kmail; regenerates the index of a folder whenever the index appears to be out of date, &ie; whenever the contents of a folder are newer than the index. &kmail; regenerates the index in this case in order to prevent the loss or corruption of messages. Unfortunately, currently-deleted messages might reappear and message flags (like important, etc.) might be lost when the index is regenerated.</para>
+<para>An outdated index can have several causes; the two most important causes are: <itemizedlist>
+<listitem><para>Some other program modified the contents of the folder: if you want to use &kmail; together with procmail then please read <link linkend="faq-procmail">this &FAQ;</link>. If you want to use &kmail; together with another email client then please read <link linkend="faq-other-muas">this &FAQ;</link>.</para></listitem>
+<listitem><para>If your mail folder (usually <filename class="directory">~/Mail</filename>) is on a volume which is mounted via NFS and if the clock of the NFS server is ahead of the clock of your computer then the NFS server sometimes reports a wrong file date for the index file. In this case &kmail; assumes that the index is outdated although in reality it is not. To fix this problem you (or your system administrator) have to make sure that the clock of the NFS server and the clock of your computer are always in sync. One way to achieve this is the use of the ntp daemon.</para></listitem>
 </itemizedlist>
 </para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->I cannot add addresses to my address book after upgrading to KDE 3.x.</para
-></question>
+<question><para>I cannot add addresses to my address book after upgrading to KDE 3.x.</para></question>
 <answer>
-<para
->You probably copied your old <filename
->kmailrc</filename
-> file manually. That is not necessary, there is a script that will do such things when you run KDE 3.x for the first time. To fix the problem, remove the complete <quote
->[AddressBook]</quote
-> group and the addressbook option in group <quote
->[General]</quote
-> in your <filename
->kmailrc</filename
-> file; however, chances are you will also encounter other problems that the config update script would have solved.</para>
+<para>You probably copied your old <filename>kmailrc</filename> file manually. That is not necessary, there is a script that will do such things when you run KDE 3.x for the first time. To fix the problem, remove the complete <quote>[AddressBook]</quote> group and the addressbook option in group <quote>[General]</quote> in your <filename>kmailrc</filename> file; however, chances are you will also encounter other problems that the config update script would have solved.</para>
 </answer>
 </qandaentry>
 
 <qandaentry id="faq-other-muas">
-<question
-><para
->Can I use &kmail; together with a different email client, &eg; <application
->mutt</application
->?</para
-></question>
+<question><para>Can I use &kmail; together with a different email client, &eg; <application>mutt</application>?</para></question>
 <answer>
-<para
->If you're using the mbox format for your folders it is not possible to use a different email client while &kmail; is running. With <application
->mutt</application
-> there may also be problems even if both programs are not running at the same time. We recommend to use the maildir format in this case, this should solve all problems.</para>
+<para>If you're using the mbox format for your folders it is not possible to use a different email client while &kmail; is running. With <application>mutt</application> there may also be problems even if both programs are not running at the same time. We recommend to use the maildir format in this case, this should solve all problems.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I convert my mailboxes from mbox to maildir?</para
-></question>
+<question><para>How can I convert my mailboxes from mbox to maildir?</para></question>
 <answer>
-<para
->There is no automatic way to do that. You will have to create a new folder in maildir format and copy the messages from the mbox folder into this new folder. Remember to adapt any filter rules connected with the old folder before you delete it.</para>
+<para>There is no automatic way to do that. You will have to create a new folder in maildir format and copy the messages from the mbox folder into this new folder. Remember to adapt any filter rules connected with the old folder before you delete it.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I use a browser other than &konqueror; to open links in messages?</para
-></question>
+<question><para>How can I use a browser other than &konqueror; to open links in messages?</para></question>
 <answer>
-<para
->Change the <guilabel
->File Associations</guilabel
-> for HTML files using &kcontrol;.</para>
+<para>Change the <guilabel>File Associations</guilabel> for HTML files using &kcontrol;.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I remove attachments from messages without removing the message itself?</para
-></question>
+<question><para>How can I remove attachments from messages without removing the message itself?</para></question>
 <answer>
-<para
->This is currently not supported. As a workaround, move the message to the drafts folder, double click on it in order to open it in the composer, remove the attachments, save the message again to the drafts folder, move it back to its folder. The disadvantage of this workaround is that the date will be changed to the current date. Some other headers might also be changed.</para>
+<para>This is currently not supported. As a workaround, move the message to the drafts folder, double click on it in order to open it in the composer, remove the attachments, save the message again to the drafts folder, move it back to its folder. The disadvantage of this workaround is that the date will be changed to the current date. Some other headers might also be changed.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I make &kmail; check for new messages at startup?</para
-></question>
+<question><para>How can I make &kmail; check for new messages at startup?</para></question>
 <answer>
-<para
->If &kmail; should always check for new messages at startup then enable <guilabel
->Check mail on startup</guilabel
-> on the <link linkend="configure-accounts-receiving"
->Accounts configuration page</link
->. Otherwise start &kmail; with <command
->kmail <option
->--check</option
-></command
->.</para>
+<para>If &kmail; should always check for new messages at startup then enable <guilabel>Check mail on startup</guilabel> on the <link linkend="configure-accounts-receiving">Accounts configuration page</link>. Otherwise start &kmail; with <command>kmail <option>--check</option></command>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Why does &kmail; get slow / stop working when I try to send big attachments?</para
-></question>
+<question><para>Why does &kmail; get slow / stop working when I try to send big attachments?</para></question>
 <answer>
 <!-- fixme: update for 3.2 -->
-<para
->&kmail; is known to have problems with large attachments. We are working on a solution for this problem for &kde; 3.2 but currently it temporarily consumes virtual memory of about 10-15 times the size of the attachment. That means that if you attach a 2MB file &kmail; might temporarily need about 20-30 MB of virtual memory (= RAM + swap space). If you do not have enough virtual memory this will lead to problems.</para>
+<para>&kmail; is known to have problems with large attachments. We are working on a solution for this problem for &kde; 3.2 but currently it temporarily consumes virtual memory of about 10-15 times the size of the attachment. That means that if you attach a 2MB file &kmail; might temporarily need about 20-30 MB of virtual memory (= RAM + swap space). If you do not have enough virtual memory this will lead to problems.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Where can I get a list of changes between the versions of &kmail;?</para
-></question>
+<question><para>Where can I get a list of changes between the versions of &kmail;?</para></question>
 <answer>
-<para
->The welcome screen lists all important changes for your version. It is displayed when you select <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->&kmail; Introduction</guimenuitem
-></menuchoice
->.</para>
+<para>The welcome screen lists all important changes for your version. It is displayed when you select <menuchoice><guimenu>Help</guimenu><guimenuitem>&kmail; Introduction</guimenuitem></menuchoice>.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Can I configure the location of my mail folder?</para
-></question>
+<question><para>Can I configure the location of my mail folder?</para></question>
 <answer>
-<para
->Exit &kmail;, make a backup of <filename
->~/.trinity/share/config/kmailrc</filename
->, then open it with an editor and add &eg; <userinput
->folders=/home/username/.mail</userinput
-> to the <quote
->[General]</quote
-> section. Then move all your existing folders (including the hidden index files) to the new location. The next time you start &kmail; will use <filename class="directory"
->/home/username/.mail</filename
-> instead of <filename class="directory"
->/home/username/Mail</filename
->. Note that &kmail; will lose its filters if you change the mail folder's location but forget to move your existing folders.</para>
+<para>Exit &kmail;, make a backup of <filename>~/.trinity/share/config/kmailrc</filename>, then open it with an editor and add &eg; <userinput>folders=/home/username/.mail</userinput> to the <quote>[General]</quote> section. Then move all your existing folders (including the hidden index files) to the new location. The next time you start &kmail; will use <filename class="directory">/home/username/.mail</filename> instead of <filename class="directory">/home/username/Mail</filename>. Note that &kmail; will lose its filters if you change the mail folder's location but forget to move your existing folders.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How can I use mail folders that are not in <filename class="directory"
->~/Mail/</filename
->?</para
-></question>
-
-<answer
-><para
->To add a whole mbox mail folder use <userinput
-><command
->ln</command
-> <option
->-s</option
-> <filename
->/somewhere/Mail/.remotedir.directory</filename
-> <filename class="symlink"
->~/Mail/.mymailboxfile.directory</filename
-></userinput
->. Note that it is not possible to use links to files, only links that point to folders will work.</para
-></answer>
+<question><para>How can I use mail folders that are not in <filename class="directory">~/Mail/</filename>?</para></question>
+
+<answer><para>To add a whole mbox mail folder use <userinput><command>ln</command> <option>-s</option> <filename>/somewhere/Mail/.remotedir.directory</filename> <filename class="symlink">~/Mail/.mymailboxfile.directory</filename></userinput>. Note that it is not possible to use links to files, only links that point to folders will work.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->I'm one of those people whose mails consist of 100 quoted lines and one line written by myself. For some reason this annoys other people. Can &kmail; help me and make everyone's life better?</para
-></question>
-<answer
-><para
->Sure. Just select a short relevant part of the original mail with the mouse before you reply. Only this part will then be quoted in your reply.</para
-></answer>
+<question><para>I'm one of those people whose mails consist of 100 quoted lines and one line written by myself. For some reason this annoys other people. Can &kmail; help me and make everyone's life better?</para></question>
+<answer><para>Sure. Just select a short relevant part of the original mail with the mouse before you reply. Only this part will then be quoted in your reply.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->For some messages the value in the <guilabel
->Date</guilabel
-> field is <guilabel
->unknown</guilabel
-> or it is not correct.</para
-></question>
-<answer
-><para
->Probably the <quote
->Date:</quote
-> header of these messages is broken and &kmail; cannot interpret it. That is not a bug in &kmail; but in the software that sent the mail.</para
-></answer>
+<question><para>For some messages the value in the <guilabel>Date</guilabel> field is <guilabel>unknown</guilabel> or it is not correct.</para></question>
+<answer><para>Probably the <quote>Date:</quote> header of these messages is broken and &kmail; cannot interpret it. That is not a bug in &kmail; but in the software that sent the mail.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->My signature has two dashes above it. What's up?</para
-></question>
+<question><para>My signature has two dashes above it. What's up?</para></question>
 <answer>
-<para
->Separating the signature from the message body with two dashes and a space on a single line is common usage. These symbols permit mail clients who recognise them to trim the signatures from a reply. If your signature does not already have this separator, &kmail; will automatically add it.</para>
+<para>Separating the signature from the message body with two dashes and a space on a single line is common usage. These symbols permit mail clients who recognise them to trim the signatures from a reply. If your signature does not already have this separator, &kmail; will automatically add it.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->&kmail; fetches the same messages over and over again.</para
-></question>
-<answer
-><para
->This happens if you have enabled <guilabel
->Leave fetched messages on the server</guilabel
-> and your POP3 server does not support the UIDL command. There is currently no workaround besides disabling <guilabel
->Leave fetched messages on the server</guilabel
->. A more detailed explanation can be found <ulink url="http://lists.kde.org/?l=kmail&amp;m=99220697415300&amp;w=2"
->in this mailing list post</ulink
->.</para
-></answer>
+<question><para>&kmail; fetches the same messages over and over again.</para></question>
+<answer><para>This happens if you have enabled <guilabel>Leave fetched messages on the server</guilabel> and your POP3 server does not support the UIDL command. There is currently no workaround besides disabling <guilabel>Leave fetched messages on the server</guilabel>. A more detailed explanation can be found <ulink url="http://lists.kde.org/?l=kmail&amp;m=99220697415300&amp;w=2">in this mailing list post</ulink>.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Are there any known bugs in &kmail;?</para
-></question>
+<question><para>Are there any known bugs in &kmail;?</para></question>
 <answer>
-<para
->A list of submitted bugs is linked at <ulink url="http://kmail.kde.org/"
->the &kmail; homepage</ulink
->. Note that not all these bugs are valid. All in all we think that &kmail; is a very robust piece of software.</para>
-<para
-><warning
-><para
->However, you should not run &kmail; while another email client is already accessing the files in <filename class="directory"
->~/Mail</filename
->; if you try to do so, you might lose messages. Note that you should make backups of your messages anyway.</para
-></warning
-></para>
+<para>A list of submitted bugs is linked at <ulink url="http://kmail.kde.org/">the &kmail; homepage</ulink>. Note that not all these bugs are valid. All in all we think that &kmail; is a very robust piece of software.</para>
+<para><warning><para>However, you should not run &kmail; while another email client is already accessing the files in <filename class="directory">~/Mail</filename>; if you try to do so, you might lose messages. Note that you should make backups of your messages anyway.</para></warning></para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->&kmail; does not display <acronym
->HTML</acronym
-> mail properly.</para
-></question>
-<answer
-><para
->References to external content like images, are disabled by default, as they can be used to track whether and when you read a message. Loading external references can be activated in the <guilabel
->Security</guilabel
-> tab in &kmail;'s configuration dialogue; also Plugins (like <trademark class="registered"
->Macromedia</trademark
-> <application
->Flash</application
->), &Java; and JavaScript will not be displayed in &kmail; for security reasons and there is no way to activate them.</para
-></answer>
+<question><para>&kmail; does not display <acronym>HTML</acronym> mail properly.</para></question>
+<answer><para>References to external content like images, are disabled by default, as they can be used to track whether and when you read a message. Loading external references can be activated in the <guilabel>Security</guilabel> tab in &kmail;'s configuration dialogue; also Plugins (like <trademark class="registered">Macromedia</trademark> <application>Flash</application>), &Java; and JavaScript will not be displayed in &kmail; for security reasons and there is no way to activate them.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Can I use two different versions of &kmail; at the same time? Can I go back from a current version of &kmail; to an older one?</para
-></question>
-<answer
-><para
->You can only run one instance of &kmail; at once. We also recommend to stick to a certain version and not switch back and forth between different versions. Downgrading to an older version will probably cause problems, &eg; because the index file formats might have changed. Upgrading should never be a problem.</para
-></answer>
+<question><para>Can I use two different versions of &kmail; at the same time? Can I go back from a current version of &kmail; to an older one?</para></question>
+<answer><para>You can only run one instance of &kmail; at once. We also recommend to stick to a certain version and not switch back and forth between different versions. Downgrading to an older version will probably cause problems, &eg; because the index file formats might have changed. Upgrading should never be a problem.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Does &kmail; support uuencoded files?</para
-></question>
-<answer
-><para
->Uuencoded attachments are supported, but inline uuencoded files are not.</para
-></answer>
+<question><para>Does &kmail; support uuencoded files?</para></question>
+<answer><para>Uuencoded attachments are supported, but inline uuencoded files are not.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->&kmail; crashed while I was writing a mail; is that mail is lost now?</para
-></question>
-<answer
-><para
->&kmail; tries to save your mail to <filename
->~/dead.letter</filename
-> in case of a crash. The next time you start &kmail; the mail composer should appear with your mail again; If it does not, try to open <filename
->~/dead.letter</filename
-> with an editor. If it does not exist then the crash was so bad that &kmail; could not save your mail.</para
-></answer>
+<question><para>&kmail; crashed while I was writing a mail; is that mail is lost now?</para></question>
+<answer><para>&kmail; tries to save your mail to <filename>~/dead.letter</filename> in case of a crash. The next time you start &kmail; the mail composer should appear with your mail again; If it does not, try to open <filename>~/dead.letter</filename> with an editor. If it does not exist then the crash was so bad that &kmail; could not save your mail.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->When I try to set a folder to be mailing list-aware, it does not do anything when receiving an email from the list.</para
-></question>
-<answer
-><para
->Associating a folder with a mailing list has nothing to do with filtering the mailing list messages &mdash; you have to add a new filter rule manually; however, once you associated a folder with a mailing list you can use <menuchoice
-> <guimenu
->Message</guimenu
-><guimenuitem
->Reply to Mailing-List...</guimenuitem
-></menuchoice
-> or <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->New Message to Mailing-List...</guimenuitem
-></menuchoice
-> and the mailing list address will be set in the <guilabel
->To:</guilabel
-> field. </para
-></answer>
+<question><para>When I try to set a folder to be mailing list-aware, it does not do anything when receiving an email from the list.</para></question>
+<answer><para>Associating a folder with a mailing list has nothing to do with filtering the mailing list messages &mdash; you have to add a new filter rule manually; however, once you associated a folder with a mailing list you can use <menuchoice> <guimenu>Message</guimenu><guimenuitem>Reply to Mailing-List...</guimenuitem></menuchoice> or <menuchoice><guimenu>Message</guimenu><guimenuitem>New Message to Mailing-List...</guimenuitem></menuchoice> and the mailing list address will be set in the <guilabel>To:</guilabel> field. </para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->My SMTP server requires authentication; Does &kmail; support this?</para
-></question>
-<answer
-><para
->There are two common techniques used for <acronym
->SMTP</acronym
-> authentication: <quote
->SMTP after POP3</quote
-> and <quote
->SMTP Auth</quote
->. <quote
->SMTP Auth</quote
-> can be set in the <guilabel
->General</guilabel
-> tab of the SMTP configuration dialogue. To use <quote
->SMTP after POP3</quote
-> you have to collect all your messages in the <guilabel
->outbox</guilabel
-> and send them just after you have fetched new mail. You can make &kmail; send the queued messages automatically with the <guilabel
->Send messages in outbox folder</guilabel
-> option on the <link linkend="configure-accounts-sending"
->Accounts configuration page</link
->. </para
-></answer>
+<question><para>My SMTP server requires authentication; Does &kmail; support this?</para></question>
+<answer><para>There are two common techniques used for <acronym>SMTP</acronym> authentication: <quote>SMTP after POP3</quote> and <quote>SMTP Auth</quote>. <quote>SMTP Auth</quote> can be set in the <guilabel>General</guilabel> tab of the SMTP configuration dialogue. To use <quote>SMTP after POP3</quote> you have to collect all your messages in the <guilabel>outbox</guilabel> and send them just after you have fetched new mail. You can make &kmail; send the queued messages automatically with the <guilabel>Send messages in outbox folder</guilabel> option on the <link linkend="configure-accounts-sending">Accounts configuration page</link>. </para></answer>
 </qandaentry>
 
 <qandaentry id="faq-procmail">
-<question
-><para
->Can I use &kmail; and <application
->procmail</application
->?</para
-></question>
-<answer
-><para
->Yes, but it is important to do it the right way or you might lose mail. In order to use <application
->procmail</application
-> and &kmail; you need to set up &kmail; so that it will fetch new mail from the spoolfiles in which <application
->procmail</application
-> drops your mail. Do <emphasis
->not</emphasis
-> set up procmail to deliver mail in a &kmail; folder, this cannot work.</para>
+<question><para>Can I use &kmail; and <application>procmail</application>?</para></question>
+<answer><para>Yes, but it is important to do it the right way or you might lose mail. In order to use <application>procmail</application> and &kmail; you need to set up &kmail; so that it will fetch new mail from the spoolfiles in which <application>procmail</application> drops your mail. Do <emphasis>not</emphasis> set up procmail to deliver mail in a &kmail; folder, this cannot work.</para>
           
-<para
->For each procmail spoolfile you then need to create an account from which &kmail; will fetch new mail; you also need to make sure you specify the right lockfile name for this account. When setting up an account, &kmail; will do some minimal parsing on your <filename
->.procmail</filename
-> file, and will try to list every spoolfile it has found, and also the lockfiles next to the <guilabel
->procmail lockfile</guilabel
-> item. procmail lets the user specify lockfiles in three different ways, so there is no way to establish a correspondence between the spoolfiles and lockfiles; so it's really up to you to make sure you specify the right lockfile for each spoolfile.</para>
+<para>For each procmail spoolfile you then need to create an account from which &kmail; will fetch new mail; you also need to make sure you specify the right lockfile name for this account. When setting up an account, &kmail; will do some minimal parsing on your <filename>.procmail</filename> file, and will try to list every spoolfile it has found, and also the lockfiles next to the <guilabel>procmail lockfile</guilabel> item. procmail lets the user specify lockfiles in three different ways, so there is no way to establish a correspondence between the spoolfiles and lockfiles; so it's really up to you to make sure you specify the right lockfile for each spoolfile.</para>
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Spellchecking does not recognize non-English characters.</para
-></question>
-<answer
-><para
->Before you can use spellchecking the first time, you have to configure it. You can do so in the composer window's menu under <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Spellchecker...</guimenuitem
-></menuchoice
->. You can set the dictionary and the encoding there.</para
-></answer>
+<question><para>Spellchecking does not recognize non-English characters.</para></question>
+<answer><para>Before you can use spellchecking the first time, you have to configure it. You can do so in the composer window's menu under <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Spellchecker...</guimenuitem></menuchoice>. You can set the dictionary and the encoding there.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I use my <application
->Eudora</application
->/&Netscape;/<application
->Outlook</application
->/... mail folders in &kmail;?</para
-></question
-> 
-<answer
-><para
->See the section <link linkend="importing"
->Using other Mailbox files With &kmail;</link
->.</para
-></answer>
+<question><para>How do I use my <application>Eudora</application>/&Netscape;/<application>Outlook</application>/... mail folders in &kmail;?</para></question> 
+<answer><para>See the section <link linkend="importing">Using other Mailbox files With &kmail;</link>.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->Can I use encryption with my normal (non-<acronym
->SSL</acronym
->) POP3 account?</para
-></question>
-<answer
-><para
->If your POP3 server runs an <application
->ssh</application
-> daemon, you can use ssh to tunnel your POP3 connection using the following command:</para>
-
-<para
-><userinput
-><command
->ssh</command
-> <option
->-L 11000:127.0.0.1:110 user@host</option
-></userinput
-></para>
-
-<para
->Modify your &kmail; configuration to fetch the mail via POP3 from <userinput
->localhost</userinput
-> and ssh will tunnel the connection for you. <note
-><para
->If non-encrypted messages have already been sent via Internet, the only advantage of using <application
->ssh</application
-> is that your <emphasis
->password</emphasis
-> will be sent encrypted to the POP3 server.</para
-></note>
+<question><para>Can I use encryption with my normal (non-<acronym>SSL</acronym>) POP3 account?</para></question>
+<answer><para>If your POP3 server runs an <application>ssh</application> daemon, you can use ssh to tunnel your POP3 connection using the following command:</para>
+
+<para><userinput><command>ssh</command> <option>-L 11000:127.0.0.1:110 user@host</option></userinput></para>
+
+<para>Modify your &kmail; configuration to fetch the mail via POP3 from <userinput>localhost</userinput> and ssh will tunnel the connection for you. <note><para>If non-encrypted messages have already been sent via Internet, the only advantage of using <application>ssh</application> is that your <emphasis>password</emphasis> will be sent encrypted to the POP3 server.</para></note>
 
 <!-- fixme: add link to http://www.linuxdoc.org/HOWTO/mini/Secure-POP+SSH.html -->
 
@@ -666,215 +241,59 @@
 </qandaentry>
 
 <qandaentry id="faq-file-locking">
-<question
-><para
->Does &kmail; lock the folders it uses?</para
-></question>
-<answer
-><para
->&kmail; does not lock the files in <filename class="directory"
->~/Mail</filename
->.</para>
-<para
->To avoid the risk of losing mail <emphasis
->if using a local account</emphasis
-> it is necessary to ensure that &kmail; uses the same type of locking as your mail delivery agent.</para>
-
-<para
->There are five different locking options you can use:</para>
+<question><para>Does &kmail; lock the folders it uses?</para></question>
+<answer><para>&kmail; does not lock the files in <filename class="directory">~/Mail</filename>.</para>
+<para>To avoid the risk of losing mail <emphasis>if using a local account</emphasis> it is necessary to ensure that &kmail; uses the same type of locking as your mail delivery agent.</para>
+
+<para>There are five different locking options you can use:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Procmail lockfile</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Mutt dotlock</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->Mutt dotlock privileged</guilabel
-></para
-></listitem>
-<listitem
-><para
-><guilabel
->FCNTL</guilabel
-> (default)</para
-></listitem>
-<listitem
-><para
-><guilabel
->none (use with care)</guilabel
-></para
-></listitem>
+<listitem><para><guilabel>Procmail lockfile</guilabel></para></listitem>
+<listitem><para><guilabel>Mutt dotlock</guilabel></para></listitem>
+<listitem><para><guilabel>Mutt dotlock privileged</guilabel></para></listitem>
+<listitem><para><guilabel>FCNTL</guilabel> (default)</para></listitem>
+<listitem><para><guilabel>none (use with care)</guilabel></para></listitem>
 </itemizedlist>
 
-<para
-><guilabel
->Procmail lockfile</guilabel
-> will use a small utility that comes with <application
->procmail</application
-> called <command
->lockfile</command
->. You can use this if your mail folder is in a folder where you have write permission. This will not work on your <filename class="directory"
->/var/spool/mail/user</filename
-> file in most cases. It will create <filename
->.lock</filename
-> files on your account when &kmail; is checking for new mail. Please note that this will only work if <application
->procmail</application
-> is installed on your system.</para>
-
-<para
-><guilabel
->Mutt dotlock</guilabel
-> and <guilabel
->Mutt dotlock privileged</guilabel
-> will both use a small utility that comes with <application
->mutt</application
-> called <command
->mutt_dotlock</command
->. <guilabel
->Mutt dotlock</guilabel
-> can be used in the same way as the <guilabel
->Procmail lockfile</guilabel
-> option, with the same limitation with regards to the <filename class="directory"
->/var/spool/mail/</filename
-> folders. However, the <guilabel
->Mutt dotlock privileged</guilabel
-> option can create lock files in the <filename class="directory"
->/var/spool/mail</filename
-> folder. <command
->mutt_dotlock</command
-> is a setgid program and this option will run it in setgid mode. Please note that these options will only work if <application
->mutt</application
-> is installed on your system.</para>
-
-<para
-><guilabel
->FCNTL</guilabel
-> will use the <function
->fcntl()</function
-> system call.</para>
-
-<warning
-><para
->Usage of FCNTL locking might cause system lockups when the mail spool file is on an NFS mounted device.</para
-></warning>
-
-<para
->If you do not want to use any locking, the <guilabel
->none</guilabel
-> option is what you want. However, there are risks of losing mail when no locking is used.</para>
+<para><guilabel>Procmail lockfile</guilabel> will use a small utility that comes with <application>procmail</application> called <command>lockfile</command>. You can use this if your mail folder is in a folder where you have write permission. This will not work on your <filename class="directory">/var/spool/mail/user</filename> file in most cases. It will create <filename>.lock</filename> files on your account when &kmail; is checking for new mail. Please note that this will only work if <application>procmail</application> is installed on your system.</para>
+
+<para><guilabel>Mutt dotlock</guilabel> and <guilabel>Mutt dotlock privileged</guilabel> will both use a small utility that comes with <application>mutt</application> called <command>mutt_dotlock</command>. <guilabel>Mutt dotlock</guilabel> can be used in the same way as the <guilabel>Procmail lockfile</guilabel> option, with the same limitation with regards to the <filename class="directory">/var/spool/mail/</filename> folders. However, the <guilabel>Mutt dotlock privileged</guilabel> option can create lock files in the <filename class="directory">/var/spool/mail</filename> folder. <command>mutt_dotlock</command> is a setgid program and this option will run it in setgid mode. Please note that these options will only work if <application>mutt</application> is installed on your system.</para>
+
+<para><guilabel>FCNTL</guilabel> will use the <function>fcntl()</function> system call.</para>
+
+<warning><para>Usage of FCNTL locking might cause system lockups when the mail spool file is on an NFS mounted device.</para></warning>
+
+<para>If you do not want to use any locking, the <guilabel>none</guilabel> option is what you want. However, there are risks of losing mail when no locking is used.</para>
 
 </answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I leave messages on the server?</para
-></question>
-<answer
-><para
->See the <link linkend="popfilters"
->Download filters</link
-> chapter. If you want to leave all messages on the server: open up the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kmail;...</guimenuitem
-> </menuchoice
-> window. Click on the <guilabel
->Network</guilabel
-> page. Select your account from the account list and click the <guibutton
->Modify...</guibutton
-> button. This dialogue contains the <guilabel
->Leave fetched messages on the server</guilabel
-> setting which you must enable.</para
-></answer>
+<question><para>How do I leave messages on the server?</para></question>
+<answer><para>See the <link linkend="popfilters">Download filters</link> chapter. If you want to leave all messages on the server: open up the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem> </menuchoice> window. Click on the <guilabel>Network</guilabel> page. Select your account from the account list and click the <guibutton>Modify...</guibutton> button. This dialogue contains the <guilabel>Leave fetched messages on the server</guilabel> setting which you must enable.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I automatically insert a text footer within my messages?</para
-></question>
-<answer
-><para
->The text footer is also called a signature (not to be confused with a cryptographic signature). Select <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
-> Look in the <guilabel
->Identity</guilabel
-> page for the <guilabel
->Signature</guilabel
-> tab and add your signature there. Then go to the <guilabel
->General</guilabel
-> tab on the <guilabel
->Composer</guilabel
-> page and enable <xref linkend="configure-composer-general-append-signature"/></para
-></answer
-> 
+<question><para>How do I automatically insert a text footer within my messages?</para></question>
+<answer><para>The text footer is also called a signature (not to be confused with a cryptographic signature). Select <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> Look in the <guilabel>Identity</guilabel> page for the <guilabel>Signature</guilabel> tab and add your signature there. Then go to the <guilabel>General</guilabel> tab on the <guilabel>Composer</guilabel> page and enable <xref linkend="configure-composer-general-append-signature"/></para></answer> 
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->How do I set up &Sendmail; to work with &kmail; if I have a dial-up connection?</para
-></question
-> 
+<question><para>How do I set up &Sendmail; to work with &kmail; if I have a dial-up connection?</para></question> 
 
-<answer
-><para
->First you should check if your distribution can do this for you. It probably has already been set up during installation.</para>
+<answer><para>First you should check if your distribution can do this for you. It probably has already been set up during installation.</para>
 
-<para
->If that is not the case, you may want to have a look at <ulink url="http://en.tldp.org/HOWTO/mini/Mail-Queue.html"
->the Mail Queue HOWTO</ulink
->.</para
-></answer>
+<para>If that is not the case, you may want to have a look at <ulink url="http://en.tldp.org/HOWTO/mini/Mail-Queue.html">the Mail Queue HOWTO</ulink>.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->I've seen demonstrations of remote control behavior with &kmail;. Is there any documentation on the available interfaces?</para
-></question>
-<answer
-><para
->You can get a list of functions by using this command in a shell: <userinput
-><command
->dcop</command
-> <option
->kmail KMailIface</option
-></userinput
->. Some documentation is also available in <filename
->tdenetwork/kmail/kmailIface.h</filename
-> and <filename
->tdenetwork/kmail/mailcomposerIface.h</filename
->.</para
-></answer>
+<question><para>I've seen demonstrations of remote control behavior with &kmail;. Is there any documentation on the available interfaces?</para></question>
+<answer><para>You can get a list of functions by using this command in a shell: <userinput><command>dcop</command> <option>kmail KMailIface</option></userinput>. Some documentation is also available in <filename>tdenetwork/kmail/kmailIface.h</filename> and <filename>tdenetwork/kmail/mailcomposerIface.h</filename>.</para></answer>
 </qandaentry>
 
 <qandaentry>
-<question
-><para
->When I reply to a message, only a part of the message is quoted. How come?</para
-></question>
-<answer
-><para
->This can happen when the message contains two dashes and a space on a single line. This is seen as the start of the signature. The remaining part of the message will not be quoted, because when you reply to a message KMail strips the signature.</para
-></answer>
+<question><para>When I reply to a message, only a part of the message is quoted. How come?</para></question>
+<answer><para>This can happen when the message contains two dashes and a space on a single line. This is seen as the start of the signature. The remaining part of the message will not be quoted, because when you reply to a message KMail strips the signature.</para></answer>
 </qandaentry>
 
 </qandaset>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/getting-started.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/getting-started.docbook
index 7ce32399782..4d5d512e6d1 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/getting-started.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/getting-started.docbook
@@ -2,581 +2,132 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->Michel</firstname
-> <surname
->Boyer de la Giroday</surname
-> <affiliation
-><address
-> <email
->michel@klaralvdalens-datakonsult.se</email>
-</address
-></affiliation>
+<author><firstname>Michel</firstname> <surname>Boyer de la Giroday</surname> <affiliation><address> <email>michel@klaralvdalens-datakonsult.se</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->British English English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>British English English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-13</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
-
-<title
->Getting Started</title>
-
-<para
->This is a short introduction to &kmail; and its usage so you can start working with it right away. For more in-depth information see the <link linkend="using-kmail"
->Using &kmail;</link
-> section. Note that &kmail;'s installation is described in <link linkend="installation"
->the appendix</link
->.</para>
-
-<para
->Invoking &kmail; for the first time creates a folder called <filename class="directory"
->Mail</filename
-> in your home folder. This folder contains the initial folders (<filename class="directory"
->inbox</filename
->, <filename class="directory"
->outbox</filename
->, <filename class="directory"
->sent-mail</filename
->, <filename class="directory"
->wastebin</filename
-> and <filename class="directory"
->drafts</filename
->). Use <menuchoice
-> <guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-> </menuchoice
-> to enter some initial information so &kmail; will be able to properly retrieve and send your messages.</para>
-
-<para
->The Configure window consists of six sections: <guilabel
->Identities</guilabel
->, <guilabel
->Network</guilabel
->, <guilabel
->Appearance</guilabel
->, <guilabel
->Composer</guilabel
->, <guilabel
->Security</guilabel
-> and <guilabel
->Misc</guilabel
->.</para>
-
-<para
->To begin sending and receiving messages you will only have to change some settings in the <guilabel
->Identities</guilabel
-> and <guilabel
->Network</guilabel
-> pages.</para>
+<date>2004-07-13</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
+
+<title>Getting Started</title>
+
+<para>This is a short introduction to &kmail; and its usage so you can start working with it right away. For more in-depth information see the <link linkend="using-kmail">Using &kmail;</link> section. Note that &kmail;'s installation is described in <link linkend="installation">the appendix</link>.</para>
+
+<para>Invoking &kmail; for the first time creates a folder called <filename class="directory">Mail</filename> in your home folder. This folder contains the initial folders (<filename class="directory">inbox</filename>, <filename class="directory">outbox</filename>, <filename class="directory">sent-mail</filename>, <filename class="directory">wastebin</filename> and <filename class="directory">drafts</filename>). Use <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem> </menuchoice> to enter some initial information so &kmail; will be able to properly retrieve and send your messages.</para>
+
+<para>The Configure window consists of six sections: <guilabel>Identities</guilabel>, <guilabel>Network</guilabel>, <guilabel>Appearance</guilabel>, <guilabel>Composer</guilabel>, <guilabel>Security</guilabel> and <guilabel>Misc</guilabel>.</para>
+
+<para>To begin sending and receiving messages you will only have to change some settings in the <guilabel>Identities</guilabel> and <guilabel>Network</guilabel> pages.</para>
 
   <sect1 id="setting-your-identity">
-    <title
->Setting your Identity </title>
-
-    <para
->The settings in the <guilabel
->Identities</guilabel
-> page are fairly straightforward. Select your default identity and click <guibutton
->Modify</guibutton
->. Fill in the <guilabel
->Your name</guilabel
-> field with your full name (&eg; <userinput
->John Doe</userinput
->) and the <guilabel
->Organisation</guilabel
-> field (optional) with the appropriate information. </para>
-    <para
->Next, fill in the <guilabel
->Email address</guilabel
-> field with your email address (&eg; <userinput
->john@example.net</userinput
->). </para>
-    <para
->If you are using <application
->PGP</application
-> or <application
->GnuPG</application
-> you can set your &openpgp; keys and/or &smime; certificates in the <link linkend="configure-identity-cryptography"
-><guilabel
->Cryptography</guilabel
-></link
-> tab. </para>
-    <para
->Optionally, go to the <guilabel
->Signature</guilabel
-> tab and enter your signature. This is a short text that will be automatically appended to all your messages. It has nothing to do with <emphasis
->digital signatures</emphasis
->. </para>
+    <title>Setting your Identity </title>
+
+    <para>The settings in the <guilabel>Identities</guilabel> page are fairly straightforward. Select your default identity and click <guibutton>Modify</guibutton>. Fill in the <guilabel>Your name</guilabel> field with your full name (&eg; <userinput>John Doe</userinput>) and the <guilabel>Organisation</guilabel> field (optional) with the appropriate information. </para>
+    <para>Next, fill in the <guilabel>Email address</guilabel> field with your email address (&eg; <userinput>john@example.net</userinput>). </para>
+    <para>If you are using <application>PGP</application> or <application>GnuPG</application> you can set your &openpgp; keys and/or &smime; certificates in the <link linkend="configure-identity-cryptography"><guilabel>Cryptography</guilabel></link> tab. </para>
+    <para>Optionally, go to the <guilabel>Signature</guilabel> tab and enter your signature. This is a short text that will be automatically appended to all your messages. It has nothing to do with <emphasis>digital signatures</emphasis>. </para>
 
   </sect1>
 
 <sect1 id="setting-up-your-account">
-<title
->Setting up your Account</title>
+<title>Setting up your Account</title>
 
-<para
->The <guilabel
->Network</guilabel
-> page contains the settings that tell &kmail; how to send and receive your email messages. Many of these settings can vary greatly depending on the setup of your system and on the kind of network that your mail server is located in. If you do not know what setting to choose or what to put in a field, consult your Internet Service Provider (<acronym
->ISP</acronym
->) or system administrator.</para>
+<para>The <guilabel>Network</guilabel> page contains the settings that tell &kmail; how to send and receive your email messages. Many of these settings can vary greatly depending on the setup of your system and on the kind of network that your mail server is located in. If you do not know what setting to choose or what to put in a field, consult your Internet Service Provider (<acronym>ISP</acronym>) or system administrator.</para>
 
 <sect2 id="sending-mail">
-<title
->Sending Messages</title>
-
-<para
->The <guilabel
->Sending</guilabel
-> tab provides a list of ways to send messages. The first item in the list is the default way to send messages. Using the <guibutton
->Add...</guibutton
-> button you can choose between two different ways of sending messages: <guilabel
->SMTP</guilabel
-> and <guilabel
->Sendmail</guilabel
->. &Sendmail; here means a local software installation -- this has a reputation of being difficult to set up, so if you do not already have a working &Sendmail; configuration, choose <guilabel
->SMTP</guilabel
-> and fill in the <guilabel
->Name</guilabel
-> field with a descriptive name (&eg; <userinput
->My Mail Account</userinput
->) and the <guilabel
->Host</guilabel
-> field with the name and domain of your mail server (&eg; <userinput
->smtp.provider.com</userinput
->). You will probably not need to change the <guilabel
->Port</guilabel
-> setting (the default is <userinput
->25</userinput
->).</para>
+<title>Sending Messages</title>
+
+<para>The <guilabel>Sending</guilabel> tab provides a list of ways to send messages. The first item in the list is the default way to send messages. Using the <guibutton>Add...</guibutton> button you can choose between two different ways of sending messages: <guilabel>SMTP</guilabel> and <guilabel>Sendmail</guilabel>. &Sendmail; here means a local software installation -- this has a reputation of being difficult to set up, so if you do not already have a working &Sendmail; configuration, choose <guilabel>SMTP</guilabel> and fill in the <guilabel>Name</guilabel> field with a descriptive name (&eg; <userinput>My Mail Account</userinput>) and the <guilabel>Host</guilabel> field with the name and domain of your mail server (&eg; <userinput>smtp.provider.com</userinput>). You will probably not need to change the <guilabel>Port</guilabel> setting (the default is <userinput>25</userinput>).</para>
 
 <!-- TODO: more specific link -->
-<para
->If you do want to use &Sendmail; and you are using a dial-up connection, follow the instructions for setting up sendmail for a dial-up connection in the <link linkend="faq"
->&FAQ;</link
-> section.</para>
-
-<para
->The way of sending messages configured here will be used for your default identity and for all other identities that have no own way of sending messages. You can use different ways of sending messages for different identities by selecting the <guilabel
->Special transport</guilabel
-> checkbox in the <guilabel
->Advanced</guilabel
-> tab of the <guilabel
->Identities</guilabel
-> section.</para>
-
-<para
->A description of the other options can be found in the <link linkend="configure-accounts-sending"
->Configuration</link
-> chapter.</para>
+<para>If you do want to use &Sendmail; and you are using a dial-up connection, follow the instructions for setting up sendmail for a dial-up connection in the <link linkend="faq">&FAQ;</link> section.</para>
+
+<para>The way of sending messages configured here will be used for your default identity and for all other identities that have no own way of sending messages. You can use different ways of sending messages for different identities by selecting the <guilabel>Special transport</guilabel> checkbox in the <guilabel>Advanced</guilabel> tab of the <guilabel>Identities</guilabel> section.</para>
+
+<para>A description of the other options can be found in the <link linkend="configure-accounts-sending">Configuration</link> chapter.</para>
 
 
 <sect3 id="sending-mail-kolab">
-<title
->Options relevant to <acronym
->Kolab</acronym
-> server</title>
-
-<para
->When configuring a <guilabel
->SMTP</guilabel
-> account with a <guilabel
->Kolab</guilabel
-> server Host, you need to check the <guilabel
->Server requires authentification</guilabel
-> option and to fill in your <guilabel
->Kolab</guilabel
-> user's email address and password in the <guilabel
->Login</guilabel
-> and <guilabel
->Password</guilabel
-> fields. Select then the <guilabel
->Security</guilabel
-> tab and click on the <guibutton
->Check What the Server Supports</guibutton
-> for automated setup of your <guilabel
->Security</guilabel
-> configuration. The default should be <guilabel
->TLS/PLAIN</guilabel
->. The <guilabel
->Kolab</guilabel
-> server supports <guilabel
->SSL/PLAIN</guilabel
-> as well. Those settings may of course be configured manually.</para>
+<title>Options relevant to <acronym>Kolab</acronym> server</title>
+
+<para>When configuring a <guilabel>SMTP</guilabel> account with a <guilabel>Kolab</guilabel> server Host, you need to check the <guilabel>Server requires authentification</guilabel> option and to fill in your <guilabel>Kolab</guilabel> user's email address and password in the <guilabel>Login</guilabel> and <guilabel>Password</guilabel> fields. Select then the <guilabel>Security</guilabel> tab and click on the <guibutton>Check What the Server Supports</guibutton> for automated setup of your <guilabel>Security</guilabel> configuration. The default should be <guilabel>TLS/PLAIN</guilabel>. The <guilabel>Kolab</guilabel> server supports <guilabel>SSL/PLAIN</guilabel> as well. Those settings may of course be configured manually.</para>
 </sect3>
 </sect2>
 
 <sect2 id="receiving-mail">
-<title
->Receiving Messages</title>
-
-<para
->To set up an account so you can receive mail, press the <guibutton
->Add...</guibutton
-> button in the <guilabel
->Receiving</guilabel
-> tab. You will then be prompted for the type of your email account. Most users should select <guilabel
->POP3</guilabel
-> or <guilabel
->IMAP</guilabel
->. If you want to use a local mailbox file, please see the <link linkend="faq-file-locking"
->FAQ about file locking</link
->.</para>
+<title>Receiving Messages</title>
+
+<para>To set up an account so you can receive mail, press the <guibutton>Add...</guibutton> button in the <guilabel>Receiving</guilabel> tab. You will then be prompted for the type of your email account. Most users should select <guilabel>POP3</guilabel> or <guilabel>IMAP</guilabel>. If you want to use a local mailbox file, please see the <link linkend="faq-file-locking">FAQ about file locking</link>.</para>
         
-<para
->You will then be presented with the <guilabel
->Add account</guilabel
-> window. First, fill in the <guilabel
->Name</guilabel
-> field to name your account. You can choose any name you like. <guilabel
->Login</guilabel
->, <guilabel
->Password</guilabel
->, and <guilabel
->Host</guilabel
-> should be filled in with the appropriate information from your <acronym
->ISP</acronym
-> or system administrator. You should not need to change the <guilabel
->Port</guilabel
-> setting (the default for POP3 is <userinput
->110</userinput
->, the default for <acronym
->IMAP</acronym
-> is <userinput
->143</userinput
->).</para>
+<para>You will then be presented with the <guilabel>Add account</guilabel> window. First, fill in the <guilabel>Name</guilabel> field to name your account. You can choose any name you like. <guilabel>Login</guilabel>, <guilabel>Password</guilabel>, and <guilabel>Host</guilabel> should be filled in with the appropriate information from your <acronym>ISP</acronym> or system administrator. You should not need to change the <guilabel>Port</guilabel> setting (the default for POP3 is <userinput>110</userinput>, the default for <acronym>IMAP</acronym> is <userinput>143</userinput>).</para>
 
 <sect3 id="receiving-mail-kolab">
-<title
->Options relevant to <acronym
->Kolab</acronym
-> server</title>
-<para
->select <guilabel
->Disconnected IMAP</guilabel
-> when choosing your <guilabel
->Account Type</guilabel
->. Fill in the <guilabel
->Login</guilabel
-> and <guilabel
->Password</guilabel
-> fields with respectively your user email address and password on the <guilabel
->Kolab</guilabel
-> server. In the <guilabel
->Security</guilabel
-> section click on the <guilabel
->Check What the Server Support</guilabel
-> button for automated set-up of your <guilabel
->Security</guilabel
-> configuration. The default should be <guilabel
->TLS/PLAIN</guilabel
->. The <guilabel
->Kolab</guilabel
-> server supports <guilabel
->SSL/PLAIN</guilabel
-> as well. Those settings may of course be configured manually.</para>
-<para
->If you want to use the <guilabel
->"Out of Office" Replies</guilabel
-> functionality of the <guilabel
->Kolab</guilabel
-> server, set-up the <guilabel
->Filtering</guilabel
-> section of you <guilabel
->DIMAP</guilabel
-> account by checking the <guilabel
->Server supports Sieve</guilabel
-> option as well as <guilabel
->Reuse host and login configuration</guilabel
->, <guilabel
->Managesieve port</guilabel
-> should be set to 2000 as default. </para>
+<title>Options relevant to <acronym>Kolab</acronym> server</title>
+<para>select <guilabel>Disconnected IMAP</guilabel> when choosing your <guilabel>Account Type</guilabel>. Fill in the <guilabel>Login</guilabel> and <guilabel>Password</guilabel> fields with respectively your user email address and password on the <guilabel>Kolab</guilabel> server. In the <guilabel>Security</guilabel> section click on the <guilabel>Check What the Server Support</guilabel> button for automated set-up of your <guilabel>Security</guilabel> configuration. The default should be <guilabel>TLS/PLAIN</guilabel>. The <guilabel>Kolab</guilabel> server supports <guilabel>SSL/PLAIN</guilabel> as well. Those settings may of course be configured manually.</para>
+<para>If you want to use the <guilabel>"Out of Office" Replies</guilabel> functionality of the <guilabel>Kolab</guilabel> server, set-up the <guilabel>Filtering</guilabel> section of you <guilabel>DIMAP</guilabel> account by checking the <guilabel>Server supports Sieve</guilabel> option as well as <guilabel>Reuse host and login configuration</guilabel>, <guilabel>Managesieve port</guilabel> should be set to 2000 as default. </para>
 </sect3>
 
 <sect3 id="receiving-mail-dimap-misc">
-<title
->Options only relevant to DIMAP (<acronym
->Kolab</acronym
-> server)</title>
-<para
->After having configured your <guilabel
->Disconnect IMAP</guilabel
-> account, you need to activate the <guilabel
->Groupware</guilabel
-> functionalities and set-up the <guilabel
->Misc</guilabel
-> page for <guilabel
->KMail</guilabel
->. </para>
-<para
->In the <guilabel
->Misc</guilabel
-> page, of the <guilabel
->Configure</guilabel
-> dialogue, choose the <guilabel
->Groupware</guilabel
-> tab. Check the <guilabel
->Enable IMAP resource functionality</guilabel
-> option and select <guilabel
->Kolab (XML)</guilabel
-> as <guilabel
->Format used for the groupware folders</guilabel
->. The <guilabel
->Resource folders are in account</guilabel
-> combo-box should be set on the <guilabel
->Receiving</guilabel
-> (kolab user) account of your choice (if you happen to have several accounts).You may if you wish hide the groupware folder by checking this option. It is recommended to check both <guilabel
->Groupware Compatibility and Legacy Options</guilabel
-> for compatibility with an eventual <guilabel
->Kolab</guilabel
-> Microsoft Outlook client for sending invitations and replies from a <guilabel
->Kolab</guilabel
-> KDE client. </para>
+<title>Options only relevant to DIMAP (<acronym>Kolab</acronym> server)</title>
+<para>After having configured your <guilabel>Disconnect IMAP</guilabel> account, you need to activate the <guilabel>Groupware</guilabel> functionalities and set-up the <guilabel>Misc</guilabel> page for <guilabel>KMail</guilabel>. </para>
+<para>In the <guilabel>Misc</guilabel> page, of the <guilabel>Configure</guilabel> dialogue, choose the <guilabel>Groupware</guilabel> tab. Check the <guilabel>Enable IMAP resource functionality</guilabel> option and select <guilabel>Kolab (XML)</guilabel> as <guilabel>Format used for the groupware folders</guilabel>. The <guilabel>Resource folders are in account</guilabel> combo-box should be set on the <guilabel>Receiving</guilabel> (kolab user) account of your choice (if you happen to have several accounts).You may if you wish hide the groupware folder by checking this option. It is recommended to check both <guilabel>Groupware Compatibility and Legacy Options</guilabel> for compatibility with an eventual <guilabel>Kolab</guilabel> Microsoft Outlook client for sending invitations and replies from a <guilabel>Kolab</guilabel> KDE client. </para>
 </sect3>
         
 <sect3 id="receiving-mail-imap">
-<title
->Options only relevant to <acronym
->IMAP</acronym
-></title>
-<para
->If you are using <acronym
->IMAP</acronym
->, you can optionally specify a path in the <guilabel
->Prefix to folders</guilabel
-> field. This tells &kmail; where it can find your folders on the server. If you also have a shell account on the server and the messages are stored in your home folder it might be useful to store the messages in a subfolder <filename class="directory"
->Mail</filename
->. Use this as a value in the <guilabel
->Prefix to folders</guilabel
-> field so that &kmail; does not mix up mailbox files and other files. If you are not interested in this feature, simple leave the field blank.</para>
-
-<para
->If you check <guilabel
->Automatically compact folders</guilabel
-> &kmail; removes the messages you deleted from the server as soon as you leave a folder. Otherwise the messages are only marked as deleted and it is up to you to compact the folders manually by using the menu item <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Compact All Folders</guimenuitem
-></menuchoice
->.</para>
-<para
->If you check <guilabel
->Show hidden folders</guilabel
->, folders whose name starts with a dot are also displayed.</para>
+<title>Options only relevant to <acronym>IMAP</acronym></title>
+<para>If you are using <acronym>IMAP</acronym>, you can optionally specify a path in the <guilabel>Prefix to folders</guilabel> field. This tells &kmail; where it can find your folders on the server. If you also have a shell account on the server and the messages are stored in your home folder it might be useful to store the messages in a subfolder <filename class="directory">Mail</filename>. Use this as a value in the <guilabel>Prefix to folders</guilabel> field so that &kmail; does not mix up mailbox files and other files. If you are not interested in this feature, simple leave the field blank.</para>
+
+<para>If you check <guilabel>Automatically compact folders</guilabel> &kmail; removes the messages you deleted from the server as soon as you leave a folder. Otherwise the messages are only marked as deleted and it is up to you to compact the folders manually by using the menu item <menuchoice><guimenu>File</guimenu><guimenuitem>Compact All Folders</guimenuitem></menuchoice>.</para>
+<para>If you check <guilabel>Show hidden folders</guilabel>, folders whose name starts with a dot are also displayed.</para>
 </sect3>
 
 
 <sect3 id="receiving-mail-pop3">
-<title
->Options only relevant to POP3</title>
-
-<para
->Select <guilabel
->Leave fetched messages on the server</guilabel
-> if you want to leave your messages on the server after you downloaded them.</para>
-
-<para
->Select <guilabel
->Exclude from &quot;Check Mail&quot;</guilabel
-> if you do not want to check this account whenever you use <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail</guimenuitem
-></menuchoice
->. You can still check for new messages on this account with <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail In</guimenuitem
-></menuchoice
->.</para>
-
-<para
->Select <guilabel
->Enable interval mail checking</guilabel
-> if you want &kmail; to check for new messages automatically. The interval can be specified below under <guilabel
->Check interval</guilabel
->.</para>
-
-<para
-><guilabel
->inbox</guilabel
-> is the default folder for incoming messages. If you want to change that for some reason, you can do so with <guilabel
->Destination folder</guilabel
->. But what you probably want is a <link linkend="filters"
->filter</link
->, which has nothing to do with this option.</para>
-
-<para
->With <guilabel
->Precommand</guilabel
-> you can specify any program that &kmail; will execute just before fetching mail. Please specify the full path (do not use <quote
->~</quote
->) and note that &kmail; will not continue until the program returns.</para>
-
-<para
->On the <guilabel
->Extras</guilabel
-> tab you can select <guilabel
->Use pipelining for faster mail download</guilabel
-> if this is supported by your server. You should carefully test this to make sure it works safely.</para>
+<title>Options only relevant to POP3</title>
+
+<para>Select <guilabel>Leave fetched messages on the server</guilabel> if you want to leave your messages on the server after you downloaded them.</para>
+
+<para>Select <guilabel>Exclude from &quot;Check Mail&quot;</guilabel> if you do not want to check this account whenever you use <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>. You can still check for new messages on this account with <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail In</guimenuitem></menuchoice>.</para>
+
+<para>Select <guilabel>Enable interval mail checking</guilabel> if you want &kmail; to check for new messages automatically. The interval can be specified below under <guilabel>Check interval</guilabel>.</para>
+
+<para><guilabel>inbox</guilabel> is the default folder for incoming messages. If you want to change that for some reason, you can do so with <guilabel>Destination folder</guilabel>. But what you probably want is a <link linkend="filters">filter</link>, which has nothing to do with this option.</para>
+
+<para>With <guilabel>Precommand</guilabel> you can specify any program that &kmail; will execute just before fetching mail. Please specify the full path (do not use <quote>~</quote>) and note that &kmail; will not continue until the program returns.</para>
+
+<para>On the <guilabel>Extras</guilabel> tab you can select <guilabel>Use pipelining for faster mail download</guilabel> if this is supported by your server. You should carefully test this to make sure it works safely.</para>
 </sect3>
 
 <sect3 id="receiving-mail-imap-pop3">
-<title
->Options for both <acronym
->IMAP</acronym
-> and POP3</title>
+<title>Options for both <acronym>IMAP</acronym> and POP3</title>
 
 <!-- TODO: move all this, this isn't important for beginners?! -->
-<para
->If you select <guilabel
->Store POP password in configuration file</guilabel
-> or <guilabel
->Store IMAP password in configuration file</guilabel
-> &kmail; will remember your password so you will not have to type it every time you start &kmail; and fetch new mail.</para>
-
-<warning
-><para
->Be warned that &kmail; cannot really encrypt your password, so people who can access your configuration files (&eg; system administrators) can easily get your password if you select this option.</para
-></warning>
-
-<para
->&kmail; supports encryption via <guilabel
->SSL</guilabel
-> and <guilabel
->TLS</guilabel
-> (<guilabel
->TLS</guilabel
-> should be preferred if it is available).</para>
-
-<para
->For POP3 &kmail; supports:</para>
+<para>If you select <guilabel>Store POP password in configuration file</guilabel> or <guilabel>Store IMAP password in configuration file</guilabel> &kmail; will remember your password so you will not have to type it every time you start &kmail; and fetch new mail.</para>
+
+<warning><para>Be warned that &kmail; cannot really encrypt your password, so people who can access your configuration files (&eg; system administrators) can easily get your password if you select this option.</para></warning>
+
+<para>&kmail; supports encryption via <guilabel>SSL</guilabel> and <guilabel>TLS</guilabel> (<guilabel>TLS</guilabel> should be preferred if it is available).</para>
+
+<para>For POP3 &kmail; supports:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guilabel
->Clear text</guilabel
->, </para
-></listitem>
-<listitem
-><para
-><guilabel
->PLAIN</guilabel
->, </para
-></listitem>
-<listitem
-><para
-><guilabel
->LOGIN</guilabel
->, </para
-></listitem>
-<listitem
-><para
-><guilabel
->CRAM-MD5</guilabel
-> (recommended if <guilabel
->DIGEST-MD5</guilabel
-> is not available),</para
-></listitem>
-<listitem
-><para
-><guilabel
->DIGEST-MD5</guilabel
-> (recommended) and</para
-></listitem>
-<listitem
-><para
-><guilabel
->APOP</guilabel
-> authentication.</para
-></listitem>
+<listitem><para><guilabel>Clear text</guilabel>, </para></listitem>
+<listitem><para><guilabel>PLAIN</guilabel>, </para></listitem>
+<listitem><para><guilabel>LOGIN</guilabel>, </para></listitem>
+<listitem><para><guilabel>CRAM-MD5</guilabel> (recommended if <guilabel>DIGEST-MD5</guilabel> is not available),</para></listitem>
+<listitem><para><guilabel>DIGEST-MD5</guilabel> (recommended) and</para></listitem>
+<listitem><para><guilabel>APOP</guilabel> authentication.</para></listitem>
 </itemizedlist>
 
-<para
-><guilabel
->DIGEST-MD5</guilabel
->, <guilabel
->CRAM-MD5</guilabel
-> and <guilabel
->APOP</guilabel
-> are secure on their own, the other options are only secure when used together with <guilabel
->SSL</guilabel
-> or <guilabel
->TLS</guilabel
->. You should only use <guilabel
->Clear text</guilabel
-> if your server does not support any of the other authentication methods. Additionally, for <acronym
->IMAP</acronym
-> <guilabel
->Anonymous</guilabel
-> is supported, but <guilabel
->APOP</guilabel
-> is not. Use the <guibutton
->Check what the server supports</guibutton
-> button on the <guilabel
->Extras</guilabel
-> or <guilabel
->Security</guilabel
-> tab to automatically select the most secure settings supported by your server.</para>
-
-<para
->You are now ready to send and receive mail. For <acronym
->IMAP</acronym
->, just open your folders in the folder tree in &kmail;'s main window. &kmail; then connects to your server and displays the messages it finds. For POP3 use <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail</guimenuitem
-></menuchoice
->.</para>
+<para><guilabel>DIGEST-MD5</guilabel>, <guilabel>CRAM-MD5</guilabel> and <guilabel>APOP</guilabel> are secure on their own, the other options are only secure when used together with <guilabel>SSL</guilabel> or <guilabel>TLS</guilabel>. You should only use <guilabel>Clear text</guilabel> if your server does not support any of the other authentication methods. Additionally, for <acronym>IMAP</acronym> <guilabel>Anonymous</guilabel> is supported, but <guilabel>APOP</guilabel> is not. Use the <guibutton>Check what the server supports</guibutton> button on the <guilabel>Extras</guilabel> or <guilabel>Security</guilabel> tab to automatically select the most secure settings supported by your server.</para>
+
+<para>You are now ready to send and receive mail. For <acronym>IMAP</acronym>, just open your folders in the folder tree in &kmail;'s main window. &kmail; then connects to your server and displays the messages it finds. For POP3 use <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>.</para>
 
 </sect3>
 
@@ -585,50 +136,11 @@
 </sect1>
 
 <sect1 id="testing-your-setup">
-<title
->Testing your Setup</title>
-
-<para
->First, you should send yourself a message to test your configuration. To send a message, either hit <keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
->, select the <guiicon
->New Message</guiicon
-> icon or select the <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->New Message...</guimenuitem
-></menuchoice
-> menu item. The <link linkend="the-composer-window"
->composer window</link
-> will appear. Fill in the <guilabel
->To:</guilabel
-> field with your email address and type something in the <guilabel
->Subject</guilabel
-> field. Send the message by selecting <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Send</guimenuitem
-> </menuchoice
->.</para>
+<title>Testing your Setup</title>
+
+<para>First, you should send yourself a message to test your configuration. To send a message, either hit <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>, select the <guiicon>New Message</guiicon> icon or select the <menuchoice><guimenu>Message</guimenu><guimenuitem>New Message...</guimenuitem></menuchoice> menu item. The <link linkend="the-composer-window">composer window</link> will appear. Fill in the <guilabel>To:</guilabel> field with your email address and type something in the <guilabel>Subject</guilabel> field. Send the message by selecting <menuchoice><guimenu>Message</guimenu> <guimenuitem>Send</guimenuitem> </menuchoice>.</para>
       
-<para
->To check your email, select <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail</guimenuitem
-></menuchoice
->. In the lower right corner of the main window, a progress bar will indicate how many messages are being downloaded. If you receive the message you just sent, then congratulations! If, however, you receive any error messages while testing your setup, make sure that your network connection is working and recheck your settings at <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
->.</para>
+<para>To check your email, select <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice>. In the lower right corner of the main window, a progress bar will indicate how many messages are being downloaded. If you receive the message you just sent, then congratulations! If, however, you receive any error messages while testing your setup, make sure that your network connection is working and recheck your settings at <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem></menuchoice>.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/importing.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/importing.docbook
index 3f0e0fc5f18..5cf77a7bbef 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/importing.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/importing.docbook
@@ -2,376 +2,127 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2002-10-03</date
-> <releaseinfo
->1.5</releaseinfo
-> </chapterinfo>
+<date>2002-10-03</date> <releaseinfo>1.5</releaseinfo> </chapterinfo>
 
-<title
->Using other Mailbox Files with &kmail;</title>
+<title>Using other Mailbox Files with &kmail;</title>
 
-<para
->&kmail; offers an import tool for the messages and address books of some other email clients. You can access it using <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Import...</guimenuitem
-></menuchoice
->. Please make sure that you compact your folders in the other email client, no matter if you are going to use the import utility or if you are going to copy files manually. You only need to read this chapter if this tool does not work for you.</para>
+<para>&kmail; offers an import tool for the messages and address books of some other email clients. You can access it using <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Import...</guimenuitem></menuchoice>. Please make sure that you compact your folders in the other email client, no matter if you are going to use the import utility or if you are going to copy files manually. You only need to read this chapter if this tool does not work for you.</para>
 
-<para
->This section is for all of the users who need to move email messages from their previous email client over to &kmail;. &kmail; can store its messages using <quote
->mbox</quote
-> or <quote
->maildir</quote
-> formats, which are the most widely-used mailbox formats on &UNIX; systems. Mbox mailboxes store messages in one file, identifying where messages start and end with a <literal
->From</literal
-> line (do not mix this up with the <literal
->From:</literal
-> header that contains the message's sender); Maildir uses one file per message. For many &UNIX; email clients, all you must do is move your mailboxes to <filename class="directory"
->~/Mail</filename
-> (or make <filename class="symlink"
->Mail</filename
-> a symbolic link to the folder containing your mailboxes), make sure they are writable by your user, and launch &kmail;. The mailboxes should now show up correctly in &kmail;.</para>
+<para>This section is for all of the users who need to move email messages from their previous email client over to &kmail;. &kmail; can store its messages using <quote>mbox</quote> or <quote>maildir</quote> formats, which are the most widely-used mailbox formats on &UNIX; systems. Mbox mailboxes store messages in one file, identifying where messages start and end with a <literal>From</literal> line (do not mix this up with the <literal>From:</literal> header that contains the message's sender); Maildir uses one file per message. For many &UNIX; email clients, all you must do is move your mailboxes to <filename class="directory">~/Mail</filename> (or make <filename class="symlink">Mail</filename> a symbolic link to the folder containing your mailboxes), make sure they are writable by your user, and launch &kmail;. The mailboxes should now show up correctly in &kmail;.</para>
 
-<para
->Please have a look at the <ulink url="http://kmail.kde.org/tools.html"
->Tools section of &kmail;'s homepage</ulink
-> first, to see if there is a tool that imports your mailbox and maybe even address book.</para>
+<para>Please have a look at the <ulink url="http://kmail.kde.org/tools.html">Tools section of &kmail;'s homepage</ulink> first, to see if there is a tool that imports your mailbox and maybe even address book.</para>
 
-<warning
-><para
->Do not use a second email client that accesses the files in <filename class="directory"
->~/Mail</filename
-> while &kmail; is running or you might lose messages. This section only explains how to import mailboxes to &kmail; once; it is not useful to you if you're planning to use several email clients for your mailboxes in the future.</para
-></warning>
+<warning><para>Do not use a second email client that accesses the files in <filename class="directory">~/Mail</filename> while &kmail; is running or you might lose messages. This section only explains how to import mailboxes to &kmail; once; it is not useful to you if you're planning to use several email clients for your mailboxes in the future.</para></warning>
 
 <variablelist>
 
 <varlistentry>
-<term
-><application
->Eudora Lite</application
->/<application
->Eudora Pro</application
-></term>
+<term><application>Eudora Lite</application>/<application>Eudora Pro</application></term>
 <listitem>
-<para
-><application
->Eudora</application
-> uses the mbox format in its mail files. To use them with &kmail;, make sure that your <application
->Eudora</application
-> mailboxes have been compacted, then copy the <literal role="extension"
->.mbx</literal
-> files (&Windows; <application
->Eudora</application
->) or <application
->Eudora</application
-> mailbox files (&Mac; <application
->Eudora</application
->) to your <filename class="directory"
->~/Mail</filename
-> folder. You do not need to copy the <filename
->index</filename
-> files. Once you start &kmail;, the mailboxes should appear in the Folders pane and the messages should be accessible in the Headers pane.</para>
-<para
->If messages do not appear in the Headers pane, your mailbox files may still contain &Windows; or &Mac; line-feed characters. Use your favourite text editor, the <application
->recode</application
-> command or a scripting language to change the &Windows; or &Mac; line feeds to &UNIX; line feeds.</para>
+<para><application>Eudora</application> uses the mbox format in its mail files. To use them with &kmail;, make sure that your <application>Eudora</application> mailboxes have been compacted, then copy the <literal role="extension">.mbx</literal> files (&Windows; <application>Eudora</application>) or <application>Eudora</application> mailbox files (&Mac; <application>Eudora</application>) to your <filename class="directory">~/Mail</filename> folder. You do not need to copy the <filename>index</filename> files. Once you start &kmail;, the mailboxes should appear in the Folders pane and the messages should be accessible in the Headers pane.</para>
+<para>If messages do not appear in the Headers pane, your mailbox files may still contain &Windows; or &Mac; line-feed characters. Use your favourite text editor, the <application>recode</application> command or a scripting language to change the &Windows; or &Mac; line feeds to &UNIX; line feeds.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><application
->Mailsmith</application
-></term>
+<term><application>Mailsmith</application></term>
 <listitem>
-<para
-><application
->Mailsmith</application
-> runs on &Mac; and uses its own database format; however it is possible to export mail into mbox format using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Export Mail</guimenuitem
-></menuchoice
-> on a selected mailbox or on selected messages. Once the messages have been exported, translate the &Mac; line breaks to &UNIX; line breaks using your favourite editor, or using the following command under &Linux;:</para>
+<para><application>Mailsmith</application> runs on &Mac; and uses its own database format; however it is possible to export mail into mbox format using <menuchoice><guimenu>File</guimenu><guimenuitem>Export Mail</guimenuitem></menuchoice> on a selected mailbox or on selected messages. Once the messages have been exported, translate the &Mac; line breaks to &UNIX; line breaks using your favourite editor, or using the following command under &Linux;:</para>
 
-<para
-><userinput
-><command
->cat</command
-> <option
->mail-mac.txt</option
-> | perl -e 'while (&lt;STDIN&gt;) { s/\r/\n/gi; print $_ ;}' &gt; mail-unix.txt</userinput
-></para>
+<para><userinput><command>cat</command> <option>mail-mac.txt</option> | perl -e 'while (&lt;STDIN&gt;) { s/\r/\n/gi; print $_ ;}' &gt; mail-unix.txt</userinput></para>
 
-<para
->&kmail; will only recognise mboxes placed directly in the <filename class="directory"
->~/Mail/</filename
-> folder. This means that a folder hierarchy cannot be preserved by simply moving files into the <filename class="directory"
->~/Mail/</filename
-> folder, but will need to be reconstructed within &kmail; manually.</para>
+<para>&kmail; will only recognise mboxes placed directly in the <filename class="directory">~/Mail/</filename> folder. This means that a folder hierarchy cannot be preserved by simply moving files into the <filename class="directory">~/Mail/</filename> folder, but will need to be reconstructed within &kmail; manually.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->MMDF</term>
+<term>MMDF</term>
 <listitem>
-<para
->This format is close enough to the mailbox format that &kmail; should be able to use these mailboxes if you just copy them to your <filename class="directory"
->~/Mail</filename
-> folder; however, MMDF mailboxes have not been tested with &kmail;, so your results may vary. If you can get this format to work with &kmail;, please let us know so we can include more specific directions in the next documentation release.</para>
+<para>This format is close enough to the mailbox format that &kmail; should be able to use these mailboxes if you just copy them to your <filename class="directory">~/Mail</filename> folder; however, MMDF mailboxes have not been tested with &kmail;, so your results may vary. If you can get this format to work with &kmail;, please let us know so we can include more specific directions in the next documentation release.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->MH mailboxes</term>
+<term>MH mailboxes</term>
 <listitem>
-<para
->MH mailboxes are directories containing files that correspond to each message in that mailbox. A shell script to convert MH mailboxes to mbox mailboxes, <command
->mh2kmail</command
->, is included at least in the source releases of &kmail;, but maybe not in the packaged releases. Running this script on a MH folder will convert it to an mbox file. We strongly suggest that you back up your MH mail folders before you use this script.</para>
+<para>MH mailboxes are directories containing files that correspond to each message in that mailbox. A shell script to convert MH mailboxes to mbox mailboxes, <command>mh2kmail</command>, is included at least in the source releases of &kmail;, but maybe not in the packaged releases. Running this script on a MH folder will convert it to an mbox file. We strongly suggest that you back up your MH mail folders before you use this script.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Forte <application
->Agent</application
-></term>
+<term>Forte <application>Agent</application></term>
 <listitem>
-<para
->In <application
->Agent</application
->:</para>
+<para>In <application>Agent</application>:</para>
 <procedure>
 <step>
-<para
->Select the messages to export</para>
+<para>Select the messages to export</para>
 </step>
 <step>
-<para
->Select <menuchoice
-><guimenu
->FILE</guimenu
-><guimenuitem
->SAVE MESSAGES AS</guimenuitem
-></menuchoice
-></para>
+<para>Select <menuchoice><guimenu>FILE</guimenu><guimenuitem>SAVE MESSAGES AS</guimenuitem></menuchoice></para>
 </step>
 <step>
-<para
->Mark the <guilabel
->UNIX FORMAT</guilabel
-> and <guilabel
->SAVE RAW</guilabel
-> boxes</para>
+<para>Mark the <guilabel>UNIX FORMAT</guilabel> and <guilabel>SAVE RAW</guilabel> boxes</para>
 </step>
 <step>
-<para
->Give File a <literal role="extension"
->.txt</literal
-> extension and save.</para>
+<para>Give File a <literal role="extension">.txt</literal> extension and save.</para>
 </step>
 </procedure>
 
-<para
->In &kde;:</para>
+<para>In &kde;:</para>
 
 <procedure>
 <step>
-<para
->Move the previously-saved file to the correct <filename class="directory"
->~/Mail</filename
-> folder</para>
+<para>Move the previously-saved file to the correct <filename class="directory">~/Mail</filename> folder</para>
 </step>
 <step>
-<para
->Rename file without <literal role="extension"
->.txt</literal
-> extension</para>
+<para>Rename file without <literal role="extension">.txt</literal> extension</para>
 </step>
 </procedure>
-<para
->When you open &kmail; the new folder with appropriate messages will be there.</para>
+<para>When you open &kmail; the new folder with appropriate messages will be there.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->&Netscape; Mail</term>
+<term>&Netscape; Mail</term>
 <listitem>
 
-<para
->If you are using &Netscape; 4.x, the mail files should be found in <filename class="directory"
->~/nsmail</filename
->; if you are using &Netscape; 6.x, they're buried in a folder deep in the <filename class="directory"
->~/.mozilla</filename
-> subfolder, something like: <filename class="directory"
->/home/user_name/.mozilla/user_name/2ts1ixha.slt/Mail/Mail/server_name</filename
-> (the <filename class="directory"
->2ts1ixha.slt</filename
-> string will probably vary, so check it on your own system.) The <filename class="directory"
->[...]/Mail/Mail</filename
-> folder contains one subfolder for each account from which you receive mail through Netscape (&eg; <filename class="directory"
->[...]/Mail/Mail/math.university.edu</filename
->); you will need to copy files from each of them if you want everything to be accessible under &kmail;.</para>
+<para>If you are using &Netscape; 4.x, the mail files should be found in <filename class="directory">~/nsmail</filename>; if you are using &Netscape; 6.x, they're buried in a folder deep in the <filename class="directory">~/.mozilla</filename> subfolder, something like: <filename class="directory">/home/user_name/.mozilla/user_name/2ts1ixha.slt/Mail/Mail/server_name</filename> (the <filename class="directory">2ts1ixha.slt</filename> string will probably vary, so check it on your own system.) The <filename class="directory">[...]/Mail/Mail</filename> folder contains one subfolder for each account from which you receive mail through Netscape (&eg; <filename class="directory">[...]/Mail/Mail/math.university.edu</filename>); you will need to copy files from each of them if you want everything to be accessible under &kmail;.</para>
 
-<para
->If you have no subfolders, just copy all of the &Netscape; files to <filename class="directory"
->~/Mail</filename
->, make sure that they are writable (only by your user, of course) and restart &kmail;: all of the messages will now appear in &kmail; folders. (Note that if you use a command like <command
->cp <parameter
->*</parameter
-> <parameter
->~/Mail</parameter
-></command
->, you should follow it with <command
->rm <option
->-f</option
-> <parameter
->~/Mail/*.msf</parameter
-></command
->; every &Netscape; 6 folder has a corresponding <filename
->.msf</filename
-> file, and if you do not get rid of them you will have a bunch of spurious empty folders).</para>
+<para>If you have no subfolders, just copy all of the &Netscape; files to <filename class="directory">~/Mail</filename>, make sure that they are writable (only by your user, of course) and restart &kmail;: all of the messages will now appear in &kmail; folders. (Note that if you use a command like <command>cp <parameter>*</parameter> <parameter>~/Mail</parameter></command>, you should follow it with <command>rm <option>-f</option> <parameter>~/Mail/*.msf</parameter></command>; every &Netscape; 6 folder has a corresponding <filename>.msf</filename> file, and if you do not get rid of them you will have a bunch of spurious empty folders).</para>
 
-<para
->If you were using subfolders under &Netscape; (&eg; a main folder called <replaceable
->Work</replaceable
-> with subfolders called <replaceable
->Jim</replaceable
-> and <replaceable
->Nancy</replaceable
->), there are additional steps required. First, create the main folder (<replaceable
->Work</replaceable
->) in &kmail; and create a temporary child folder under it (by right-clicking on the folder name and selecting <guilabel
->Create child folder</guilabel
->); it does not matter what you call this folder -- <replaceable
->dummy</replaceable
-> or the default <replaceable
->unnamed</replaceable
->, for example. Once a child folder has been requested, &kmail; creates a hidden folder in <filename class="directory"
->~/Mail</filename
-> called (in this example) <filename class="directory"
->.Work.directory</filename
->. You can then copy your &Netscape; subfolder files (<replaceable
->Jim</replaceable
-> and <replaceable
->Nancy</replaceable
->) into <filename class="directory"
->~/Mail/.Work.directory</filename
->, and restart &kmail;; the child folders will appear under the main folder <replaceable
->Work</replaceable
->. Of course, this procedure may be extended for sub-subfolders, to any depth. (You can remove the temporary child folders afterwards, unless it amuses you to have a <replaceable
->Work</replaceable
-> subfolder called <replaceable
->dummy</replaceable
->).</para>
+<para>If you were using subfolders under &Netscape; (&eg; a main folder called <replaceable>Work</replaceable> with subfolders called <replaceable>Jim</replaceable> and <replaceable>Nancy</replaceable>), there are additional steps required. First, create the main folder (<replaceable>Work</replaceable>) in &kmail; and create a temporary child folder under it (by right-clicking on the folder name and selecting <guilabel>Create child folder</guilabel>); it does not matter what you call this folder -- <replaceable>dummy</replaceable> or the default <replaceable>unnamed</replaceable>, for example. Once a child folder has been requested, &kmail; creates a hidden folder in <filename class="directory">~/Mail</filename> called (in this example) <filename class="directory">.Work.directory</filename>. You can then copy your &Netscape; subfolder files (<replaceable>Jim</replaceable> and <replaceable>Nancy</replaceable>) into <filename class="directory">~/Mail/.Work.directory</filename>, and restart &kmail;; the child folders will appear under the main folder <replaceable>Work</replaceable>. Of course, this procedure may be extended for sub-subfolders, to any depth. (You can remove the temporary child folders afterwards, unless it amuses you to have a <replaceable>Work</replaceable> subfolder called <replaceable>dummy</replaceable>).</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><application
->Pegasus Mail</application
-></term>
+<term><application>Pegasus Mail</application></term>
 <listitem>
-<para
-><application
->Pegasus</application
-> for win32 uses single files for Mail folders similar to &kmail;. <application
->Pegasus mail</application
-> folder files have the extension <literal role="extension"
->.pmm</literal
-> but they are the same format as mbox except the messages do not start with the <literal
->From</literal
-> header, but with a control character. To work around this, replace each instance of the control character with <literal
->From aaa@aaa Mon Jan 01 00:00:00 1997</literal
->. This <literal
->From</literal
-> line should be the first line of every message, before the <literal
->Received:</literal
-> and other headers. Make sure to use a text editor that lets you save the files in &UNIX; format or create new folders in <application
->Pegasus</application
-> that are in &UNIX; format and copy your messages there.</para>
+<para><application>Pegasus</application> for win32 uses single files for Mail folders similar to &kmail;. <application>Pegasus mail</application> folder files have the extension <literal role="extension">.pmm</literal> but they are the same format as mbox except the messages do not start with the <literal>From</literal> header, but with a control character. To work around this, replace each instance of the control character with <literal>From aaa@aaa Mon Jan 01 00:00:00 1997</literal>. This <literal>From</literal> line should be the first line of every message, before the <literal>Received:</literal> and other headers. Make sure to use a text editor that lets you save the files in &UNIX; format or create new folders in <application>Pegasus</application> that are in &UNIX; format and copy your messages there.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Maildir / Outlook Express / xfmail</term>
+<term>Maildir / Outlook Express / xfmail</term>
 <listitem>
-<para
->Tools to convert these formats are available at the <ulink url="http://kmail.kde.org/tools.html"
->Tools section of &kmail;'s homepage</ulink
->.</para>
+<para>Tools to convert these formats are available at the <ulink url="http://kmail.kde.org/tools.html">Tools section of &kmail;'s homepage</ulink>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Lotus <application
->Notes</application
->, BeOS Mail files, <application
->cc: Mail</application
->, &etc;...</term>
+<term>Lotus <application>Notes</application>, BeOS Mail files, <application>cc: Mail</application>, &etc;...</term>
 <listitem>
-<para
->First you should have a look at <ulink url="http://kmail.kde.org/tools.html"
->Tools section of &kmail;'s homepage</ulink
-> if there are tools to convert your messages.</para>
-<para
->Mail programs not listed here or on the homepage probably do not work with &kmail; as they use proprietary mail formats that &kmail; cannot understand. However, there is no harm in trying! If the mailbox file looks similar to the mbox format, try copying the mailbox file (remember, the index file is not needed) to your <filename class="directory"
->~/Mail</filename
-> folder and see what happens if you start &kmail;. If you get mailboxes from your favorite email client to work in &kmail;, please tell us how you did it so that we can include directions in a future revision of this documentation. </para>
+<para>First you should have a look at <ulink url="http://kmail.kde.org/tools.html">Tools section of &kmail;'s homepage</ulink> if there are tools to convert your messages.</para>
+<para>Mail programs not listed here or on the homepage probably do not work with &kmail; as they use proprietary mail formats that &kmail; cannot understand. However, there is no harm in trying! If the mailbox file looks similar to the mbox format, try copying the mailbox file (remember, the index file is not needed) to your <filename class="directory">~/Mail</filename> folder and see what happens if you start &kmail;. If you get mailboxes from your favorite email client to work in &kmail;, please tell us how you did it so that we can include directions in a future revision of this documentation. </para>
 </listitem>
 </varlistentry>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/index.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/index.docbook
index 112a6cfc795..d5825eb2da6 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/index.docbook
@@ -11,50 +11,27 @@
   <!ENTITY kmail-importing SYSTEM "importing.docbook">
   <!ENTITY kmail-credits-and-licenses SYSTEM "credits-and-licenses.docbook">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
-  <!ENTITY html "<acronym
->HTML</acronym
->">
-  <!ENTITY gpg "<application
->GPG</application
->">
-  <!ENTITY gpgsm "<application
->GpgSM</application
->">
-  <!ENTITY mdn "<acronym
->MDN</acronym
->">
-  <!ENTITY acl "<acronym
->ACL</acronym
->">
-  <!ENTITY imap "<acronym
->IMAP</acronym
->">
-  <!ENTITY nntp "<acronym
->NNTP</acronym
->">
-  <!ENTITY openpgp "<acronym
->OpenPGP</acronym
->">
-  <!ENTITY smime "<acronym
->S/MIME</acronym
->">
-  <!ENTITY kolab "<acronym
->Kolab</acronym
->">
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
+  <!ENTITY html "<acronym>HTML</acronym>">
+  <!ENTITY gpg "<application>GPG</application>">
+  <!ENTITY gpgsm "<application>GpgSM</application>">
+  <!ENTITY mdn "<acronym>MDN</acronym>">
+  <!ENTITY acl "<acronym>ACL</acronym>">
+  <!ENTITY imap "<acronym>IMAP</acronym>">
+  <!ENTITY nntp "<acronym>NNTP</acronym>">
+  <!ENTITY openpgp "<acronym>OpenPGP</acronym>">
+  <!ENTITY smime "<acronym>S/MIME</acronym>">
+  <!ENTITY kolab "<acronym>Kolab</acronym>">
 ]>
 <book lang="&language;">
 <bookinfo>
-<title
->The &kmail; Handbook</title>
+<title>The &kmail; Handbook</title>
 
  <!-- Note:
 * please do not mix up the formatting more than necessary so that
   "cvs diff" makes useful output
 * no short forms
-* use <warning
-> instead of <caution>
+* use <warning> instead of <caution>
 -->
 
 <!-- TODO:
@@ -71,12 +48,8 @@
 * fix my adverb vs. adjective mistakes
 
 * coherent wording for section / tab / ...
-* <menuchoice
-><guimenu
->xxx , or is <guimenu
->xxx enough?
-* <guiicon
-> vs. <guibutton>
+* <menuchoice><guimenu>xxx , or is <guimenu>xxx enough?
+* <guiicon> vs. <guibutton>
 * spelling:  popup vs pop up, frontend vs front end
 
 * message vs. mail vs. email -> using "message" everywhere
@@ -86,110 +59,55 @@
 -->
 
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
 
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
 
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
->   
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit>   
 
 </authorgroup>
 
-<date
->2004-07-13</date>
-<releaseinfo
->1.7</releaseinfo>
+<date>2004-07-13</date>
+<releaseinfo>1.7</releaseinfo>
 
 <copyright>
-<year
->1999</year>
-<year
->2000</year>
-<year
->2001</year>
-<year
->2002</year>
-<holder
->David Rugge</holder>
+<year>1999</year>
+<year>2000</year>
+<year>2001</year>
+<year>2002</year>
+<holder>David Rugge</holder>
 </copyright>
 <copyright>
-<year
->2003</year>
-<holder
->Daniel Naber</holder>
+<year>2003</year>
+<holder>Daniel Naber</holder>
 </copyright>
 <copyright>
-<year
->2004</year>
-<holder
->Daniel Naber</holder>
-<holder
->Ingo Kl&ouml;cker</holder>
+<year>2004</year>
+<holder>Daniel Naber</holder>
+<holder>Ingo Kl&ouml;cker</holder>
 </copyright>
 
 <abstract>
 	
-<para
->&kmail; is &kde;'s powerful and user friendly email client.</para>
+<para>&kmail; is &kde;'s powerful and user friendly email client.</para>
 
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Mail</keyword>
-<keyword
->email</keyword>
-<keyword
->Client</keyword>
-<keyword
->POP3</keyword>
-<keyword
->IMAP</keyword>
-<keyword
->PGP</keyword>
-<keyword
->GnuPG</keyword>
-<keyword
->GPG</keyword>
-<keyword
->Kolab</keyword>
+<keyword>KDE</keyword>
+<keyword>Mail</keyword>
+<keyword>email</keyword>
+<keyword>Client</keyword>
+<keyword>POP3</keyword>
+<keyword>IMAP</keyword>
+<keyword>PGP</keyword>
+<keyword>GnuPG</keyword>
+<keyword>GPG</keyword>
+<keyword>Kolab</keyword>
 </keywordset>
 </bookinfo>
 
@@ -203,17 +121,14 @@
 &kmail-credits-and-licenses;
 
 <appendix id="installation">
-<title
->Installation</title>
+<title>Installation</title>
 
 <sect1 id="getting-kmail">
-<title
->How to obtain &kmail;</title>
+<title>How to obtain &kmail;</title>
 &install.intro.documentation; </sect1>
 
 <sect1 id="compilation">
-<title
->Compilation and Installation</title>
+<title>Compilation and Installation</title>
 &install.compile.documentation; </sect1>
 
 </appendix>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/intro.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/intro.docbook
index 73a9047757d..5432fa12a5a 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/intro.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/intro.docbook
@@ -2,83 +2,34 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->British English English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>British English English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-13</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-13</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->The &kmail; Team welcomes you to &kmail;, a user-friendly email client for the K Desktop Environment. Our goal is to make &kmail; a program that is beautiful and intuitive without sacrificing power. </para>
+<para>The &kmail; Team welcomes you to &kmail;, a user-friendly email client for the K Desktop Environment. Our goal is to make &kmail; a program that is beautiful and intuitive without sacrificing power. </para>
 
-<para
->If you have never set up an email client on a &UNIX; system before, we suggest that you read through the <link linkend="getting-started"
->Getting Started</link
-> section first so that your setup goes smoothly.</para>
+<para>If you have never set up an email client on a &UNIX; system before, we suggest that you read through the <link linkend="getting-started">Getting Started</link> section first so that your setup goes smoothly.</para>
 
-<para
->Since most people do not read documentation anyway, here is a collection of the most helpful tips:</para>
+<para>Since most people do not read documentation anyway, here is a collection of the most helpful tips:</para>
 
 <itemizedlist>
 <listitem>
-<para
->You do not have to use your mouse to use &kmail;. Everything can be done by using <link linkend="keyboard-shortcuts"
->Keyboard Shortcuts</link
->.</para>
+<para>You do not have to use your mouse to use &kmail;. Everything can be done by using <link linkend="keyboard-shortcuts">Keyboard Shortcuts</link>.</para>
 </listitem>
 <listitem>
-<para
->Although &kmail; can be considered reliable you should keep backups of your messages, &ie; just copy the files and folders in <filename class="directory"
->~/Mail</filename
-> (including the hidden ones that start with a dot) to a safe place.</para>
+<para>Although &kmail; can be considered reliable you should keep backups of your messages, &ie; just copy the files and folders in <filename class="directory">~/Mail</filename> (including the hidden ones that start with a dot) to a safe place.</para>
 </listitem>
 <!-- TODO: add other tips for "invisible" features here -->
 
 </itemizedlist>
 
-<para
->&kmail;'s homepage can be found at <ulink url="http://kmail.kde.org"
->http://kmail.kde.org</ulink
->. There you will find useful links, &eg; to the user and developer mailing lists. Please report bugs in &kmail; using <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->Report Bug...</guimenuitem
-></menuchoice
->.</para>
+<para>&kmail;'s homepage can be found at <ulink url="http://kmail.kde.org">http://kmail.kde.org</ulink>. There you will find useful links, &eg; to the user and developer mailing lists. Please report bugs in &kmail; using <menuchoice><guimenu>Help</guimenu><guimenuitem>Report Bug...</guimenuitem></menuchoice>.</para>
 
-<para
->We hope you will enjoy &kmail;!</para>
+<para>We hope you will enjoy &kmail;!</para>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook
index 1157641c3f5..870f7489c06 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/menus.docbook
@@ -2,292 +2,129 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->David</firstname
-> <surname
->Rugge</surname
-> <affiliation
-><address
-> <email
->davidrugge@mediaone.net</email>
-</address
-></affiliation>
+<author><firstname>David</firstname> <surname>Rugge</surname> <affiliation><address> <email>davidrugge@mediaone.net</email>
+</address></affiliation>
 </author>
-<author
-><firstname
->Michel</firstname
-> <surname
->Boyer de la Giroday</surname
-> <affiliation
-><address
-> <email
->michel@klaralvdalens-datakonsult.se</email>
-</address
-></affiliation>
+<author><firstname>Michel</firstname> <surname>Boyer de la Giroday</surname> <affiliation><address> <email>michel@klaralvdalens-datakonsult.se</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->British English English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>British English English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-07-11</date
-> <releaseinfo
->1.7</releaseinfo
-> </chapterinfo>
+<date>2004-07-11</date> <releaseinfo>1.7</releaseinfo> </chapterinfo>
 
-<title
->Menu Entries</title>
+<title>Menu Entries</title>
 
-<para
->Each menu item is discussed below. When there is a keyboard shortcut that performs a menu item function, the default shortcut is listed with the menu item.</para>
+<para>Each menu item is discussed below. When there is a keyboard shortcut that performs a menu item function, the default shortcut is listed with the menu item.</para>
 
 <sect1 id="main-mail-reader-window">
-<title
->The Main Window</title>
+<title>The Main Window</title>
 
 <sect2 id="reader-file-menu">
-<title
-><guimenu
->File</guimenu
-> Menu</title>
+<title><guimenu>File</guimenu> Menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->New Window</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>New Window</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Creates a new main window.</para>
+<para>Creates a new main window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->O</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Open...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Open...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to open files which contain email messages.</para>
+<para>Allows you to open files which contain email messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save As...</guimenuitem
-> </menuchoice>
+<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 text file, including all the headers and attachments.</para>
+<para>Saves the currently displayed message to a text file, including all the headers and attachments.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Print...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Print...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Display a dialogue that lets you prints the currently displayed message.</para>
+<para>Display a dialogue that lets you prints the currently displayed message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Compact All Folders</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Compact All Folders</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Will compact all folders, &ie; it will really move and delete the messages on disk according to how you have moved and deleted them in &kmail;.</para>
+<para>Will compact all folders, &ie; it will really move and delete the messages on disk according to how you have moved and deleted them in &kmail;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Expire All Folders</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Expire All Folders</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Delete old messages from all folders, according to the rules in each folder's <link linkend="folders-properties-window"
->Properties dialogue</link
-> (the default is not to delete old messages at all).</para>
+<para>Delete old messages from all folders, according to the rules in each folder's <link linkend="folders-properties-window">Properties dialogue</link> (the default is not to delete old messages at all).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Refresh Local &imap; Cache</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Refresh Local &imap; Cache</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->This will remove all changes that you have done locally to your IMAP folders and re-download everything from the server. Use this if the local cache was corrupted.</para>
+<para>This will remove all changes that you have done locally to your IMAP folders and re-download everything from the server. Use this if the local cache was corrupted.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Empty All Wastebin Folders</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Empty All Wastebin Folders</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Use this to empty all wastebin folders, &ie; the local wastebin folder and all wastebin folders that you might have on &imap; servers.</para>
+<para>Use this to empty all wastebin folders, &ie; the local wastebin folder and all wastebin folders that you might have on &imap; servers.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Check Mail</guimenuitem
-> </menuchoice>
+<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, except those that have <guilabel
->Exclude from &quot;Check Mail&quot;</guilabel
-> enabled.</para>
+<listitem><para>Checks for new messages in all your accounts, except those that have <guilabel>Exclude from &quot;Check Mail&quot;</guilabel> enabled.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guisubmenu
->Check Mail In</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guisubmenu>Check Mail In</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Submenu that lets you check for new messages from a particular account.</para>
+<para>Submenu that lets you check for new messages from a particular account.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Send Queued Messages</guimenuitem
-> </menuchoice
-></term>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Send Queued Messages</guimenuitem> </menuchoice></term>
 <listitem>
-<para
->Sends the messages that are in your outbox.</para>
+<para>Sends the messages that are in your outbox.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Closes the current main window or exits &kmail; if there is only this one window.</para>
+<para>Closes the current main window or exits &kmail; if there is only this one window.</para>
 </listitem>
 </varlistentry>
 
@@ -297,178 +134,79 @@
 
 
 <sect2 id="reader-edit-menu">
-<title
-><guimenu
->Edit</guimenu
-> Menu</title>
+<title><guimenu>Edit</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Revokes your last move or delete action. Note that you cannot undo a deletion from the wastebin.</para>
+<para>Revokes your last move or delete action. Note that you cannot undo a deletion from the wastebin.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Copies selected text to the clipboard.</para>
+<para>Copies selected text to the clipboard.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->T</keycap
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Edit Message</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>T</keycap></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Edit Message</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Edits the selected message if it is editable. Only messages in the <guilabel
->outbox</guilabel
-> and <guilabel
->drafts</guilabel
-> folder can be edited.</para>
+<para>Edits the selected message if it is editable. Only messages in the <guilabel>outbox</guilabel> and <guilabel>drafts</guilabel> folder can be edited.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->D</keycap
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Move to Wastebin</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>D</keycap></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Move to Wastebin</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Moves the selected messages to the wastebin folder. If the selected messages are already in the wastebin folder, they will really be deleted.</para>
+<para>Moves the selected messages to the wastebin folder. If the selected messages are already in the wastebin folder, they will really be deleted.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Shift;<keycap
->Delete</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Delete</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>Delete</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Delete</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Deletes the selected messages. There is no way to recover the messages once they are deleted with this command.</para>
+<para>Deletes the selected messages. There is no way to recover the messages once they are deleted with this command.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find in Message...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find in Message...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Lets you search for a string in the currently displayed message.</para>
+<para>Lets you search for a string in the currently displayed message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Select All Messages</guimenuitem
-> </menuchoice>
+<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>
+<para>Selects all messages in the current folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Select Message Text</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Select Message Text</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Selects the text of the currently displayed message.</para>
+<para>Selects the text of the currently displayed message.</para>
 </listitem>
 </varlistentry>
 
@@ -478,237 +216,106 @@
 
 
 <sect2 id="reader-view-menu">
-<title
-><guimenu
->View</guimenu
-> Menu</title>
+<title><guimenu>View</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Headers</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Headers</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Changes the format of the message header in the <guilabel
->Message pane</guilabel
->.</para>
+<para>Changes the format of the message header in the <guilabel>Message pane</guilabel>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Attachments</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Attachments</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Changes the way attachments appear in the <guilabel
->Message pane</guilabel
-> (independent of the MIME Tree). With <guimenuitem
->Icons</guimenuitem
-> all attachments appear as icons at the bottom of the message. <guimenuitem
->Smart</guimenuitem
-> will show attachments as icons, unless the message suggests that they should be displayed inline. You can suggest that certain attachments should be shown inline in your own messages when you select <guilabel
->Suggest automatic display</guilabel
-> in the attachment's properties dialogue. <guimenuitem
->Inline</guimenuitem
-> shows the contents of the attachments at the bottom of the message. Attachments that cannot be displayed, &eg; compressed files, will still be shown as an icon. <guimenuitem
->Hide</guimenuitem
-> will not show attachments. </para>
+<para>Changes the way attachments appear in the <guilabel>Message pane</guilabel> (independent of the MIME Tree). With <guimenuitem>Icons</guimenuitem> all attachments appear as icons at the bottom of the message. <guimenuitem>Smart</guimenuitem> will show attachments as icons, unless the message suggests that they should be displayed inline. You can suggest that certain attachments should be shown inline in your own messages when you select <guilabel>Suggest automatic display</guilabel> in the attachment's properties dialogue. <guimenuitem>Inline</guimenuitem> shows the contents of the attachments at the bottom of the message. Attachments that cannot be displayed, &eg; compressed files, will still be shown as an icon. <guimenuitem>Hide</guimenuitem> will not show attachments. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Unread Column</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Unread Column</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to specify whether the number of unread messages should be shown in brackets next to the folder name (<guilabel
->View After Folder Name</guilabel
->) or in a separate column (<guilabel
->View in Separate Column</guilabel
->)</para>
+<para>Allows you to specify whether the number of unread messages should be shown in brackets next to the folder name (<guilabel>View After Folder Name</guilabel>) or in a separate column (<guilabel>View in Separate Column</guilabel>)</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Total Column</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Total Column</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Display a column in the list of folders which shows the number of messages per folder.</para>
+<para>Display a column in the list of folders which shows the number of messages per folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->.</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Expand Thread</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>.</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Expand Thread</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Thread Messages</guimenuitem
-> </menuchoice
-> is activated, this will display the thread of the current message, &ie; all messages that are replies to the current message.</para>
+<para>If <menuchoice><guimenu>Folder</guimenu><guimenuitem>Thread Messages</guimenuitem> </menuchoice> is activated, this will display the thread of the current message, &ie; all messages that are replies to the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->,</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Collapse Thread</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>,</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Collapse Thread</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Thread Messages</guimenuitem
-> </menuchoice
-> is activated, this will hide the thread of the current message, &ie; it will hide all messages that are replies to the current message.</para>
+<para>If <menuchoice><guimenu>Folder</guimenu><guimenuitem>Thread Messages</guimenuitem> </menuchoice> is activated, this will hide the thread of the current message, &ie; it will hide all messages that are replies to the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->.</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Expand All Threads</guimenuitem
-> </menuchoice>
+<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>
+<para>Expands all threads in the current folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->,</keycap
-></keycombo
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Collapse All Threads</guimenuitem
-> </menuchoice>
+<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>
+<para>Collapses all threads in the current folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->V</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->View Source</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>V</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>View Source</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Shows the message and its complete headers in plain text format in a new window. This can be useful to find out the origin of a mail. You should know that it is easy to fake the <literal
->From:</literal
-> header of a mail, but one can still find out which mail servers have been used to send the message by looking at the <literal
->Received:</literal
-> lines in the header.</para>
+<para>Shows the message and its complete headers in plain text format in a new window. This can be useful to find out the origin of a mail. You should know that it is easy to fake the <literal>From:</literal> header of a mail, but one can still find out which mail servers have been used to send the message by looking at the <literal>Received:</literal> lines in the header.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Use Fixed Font</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Use Fixed Font</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Uses a fixed width (monospaced) font to display the messages in the current folder. The font to be used can be configured in the <guilabel
->Appearance</guilabel
-> section of &kmail;'s configuration dialogue.</para>
+<para>Uses a fixed width (monospaced) font to display the messages in the current folder. The font to be used can be configured in the <guilabel>Appearance</guilabel> section of &kmail;'s configuration dialogue.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Set Encoding</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Set Encoding</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Lets you choose the character encoding to be used in the Message Pane. The default, <guilabel
->Auto</guilabel
->, should work in almost all cases.</para>
+<para>Lets you choose the character encoding to be used in the Message Pane. The default, <guilabel>Auto</guilabel>, should work in almost all cases.</para>
 </listitem>
 </varlistentry>
 
@@ -718,149 +325,70 @@
 
 
 <sect2 id="reader-go-menu">
-<title
-><guimenu
->Go</guimenu
-> Menu</title>
+<title><guimenu>Go</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->N</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next Message</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>N</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next Message</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Selects the next message in the message list. The keyboard shortcut <keycap
->Right Arrow</keycap
-> also performs this action.</para>
+<para>Selects the next message in the message list. The keyboard shortcut <keycap>Right Arrow</keycap> also performs this action.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->+</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next Unread Message</guimenuitem
-> </menuchoice>
+<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 is no unread message below the currently selected message then the behaviour depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
+<para>Selects the next unread message in the message list. If there is no unread message below the currently selected message then the behaviour depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->P</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous Message</guimenuitem
-> </menuchoice>
+<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>
+<para>Selects the previous message in the message list.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->-</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous Unread Message</guimenuitem
-> </menuchoice>
+<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 behaviour depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
+<para>Selects the previous unread message in the message list. If there is no unread message above the currently selected message then the behaviour depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->+</keycap
-></keycombo
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next Unread Folder</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next Unread Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Jumps to the the next folder with unread messages.</para>
+<para>Jumps to the the next folder with unread messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->-</keycap
-></keycombo
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous Unread Folder</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo></shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous Unread Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Jumps to the the previous folder with unread messages.</para>
+<para>Jumps to the the previous folder with unread messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->Space</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next Unread Text</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>Space</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next Unread Text</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Scrolls down if you are not yet at the bottom of a message, otherwise jumps to the next unread message.</para>
+<para>Scrolls down if you are not yet at the bottom of a message, otherwise jumps to the next unread message.</para>
 </listitem>
 </varlistentry>
 
@@ -870,228 +398,125 @@
 
 
 <sect2 id="reader-folder-menu">
-<title
-><guimenu
->Folder</guimenu
-> Menu</title>
+<title><guimenu>Folder</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->New Folder...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>New Folder...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the <link linkend="folders-properties-window"
->Folder Properties</link
-> dialogue that lets you create a new folder.</para>
+<para>Opens the <link linkend="folders-properties-window">Folder Properties</link> dialogue that lets you create a new folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Mark All Messages as Read</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Mark All Messages as Read</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Sets the status of all new and unread messages in the current folder to read.</para
-> 
+<para>Sets the status of all new and unread messages in the current folder to read.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Compact</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Compact</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Compacts the folder file to reduce its disk space usage. Usually &kmail; compacts all folders automatically, but under certain circumstances you might want to compact a folder manually.</para>
+<para>Compacts the folder file to reduce its disk space usage. Usually &kmail; compacts all folders automatically, but under certain circumstances you might want to compact a folder manually.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Expire</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Expire</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Deletes old messages from the current folder or moves them to another folder, according to the rules in the folder's <guilabel
->Properties</guilabel
-> dialogue (the default is not to delete or move old messages). Usually &kmail; does this automatically, but under certain circumstances you might want to expire a folder manually..</para>
+<para>Deletes old messages from the current folder or moves them to another folder, according to the rules in the folder's <guilabel>Properties</guilabel> dialogue (the default is not to delete or move old messages). Usually &kmail; does this automatically, but under certain circumstances you might want to expire a folder manually..</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->*</keycap
-></keycombo
-></shortcut
-> <guimenu
->Folder</guimenu
-> <guimenuitem
->Remove Duplicate Messages</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo></shortcut> <guimenu>Folder</guimenu> <guimenuitem>Remove Duplicate Messages</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Searches the folder for duplicate messages and deletes the duplicates.</para>
+<para>Searches the folder for duplicate messages and deletes the duplicates.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->F5</keycap
-></shortcut
-> <guimenu
->Folder</guimenu
-> <guimenuitem
->Check Mail in This Folder</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>F5</keycap></shortcut> <guimenu>Folder</guimenu> <guimenuitem>Check Mail in This Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Checks whether new mail arrived in the currently selected folder. This is only available for &imap; folders.</para>
+<para>Checks whether new mail arrived in the currently selected folder. This is only available for &imap; folders.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Move All Messages to the Wastebin</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Move All Messages to the Wastebin</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Moves all of the messages in the selected folder into the wastebin folder. This is only available if the currently selected folder is not a wastebin folder.</para>
+<para>Moves all of the messages in the selected folder into the wastebin folder. This is only available if the currently selected folder is not a wastebin folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Empty Wastebin</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Empty Wastebin</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Permanently deletes all messages. This is only available if the currently selected folder is a wastebin folder.</para>
+<para>Permanently deletes all messages. This is only available if the currently selected folder is a wastebin folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Delete Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Delete Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Removes the selected folder and all its contents, including subfolders.</para>
-<warning
-><para
->Note that there is no way to access the contents of a folder after it has been removed.</para
-></warning>
+<para>Removes the selected folder and all its contents, including subfolders.</para>
+<warning><para>Note that there is no way to access the contents of a folder after it has been removed.</para></warning>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Prefer HTML to Plain Text</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Prefer HTML to Plain Text</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled then &html; messages in this folders will be shown using &html; rendering. For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para
-> 
+<para>If enabled then &html; messages in this folders will be shown using &html; rendering. For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Thread Messages</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Thread Messages</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled then the messages in the message list are shown in a tree-like list, with replies showing up directly under the message they reply to.</para>
+<para>If enabled then the messages in the message list are shown in a tree-like list, with replies showing up directly under the message they reply to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Thread Messages also by Subject</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Thread Messages also by Subject</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled then the messages are not only grouped according to special information included in the messages but also according to their subject, &ie; messages with the same subject are considered as being related. If many messages are threaded below unrelated messages then you might want to disable this option. </para>
+<para>If enabled then the messages are not only grouped according to special information included in the messages but also according to their subject, &ie; messages with the same subject are considered as being related. If many messages are threaded below unrelated messages then you might want to disable this option. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Properties</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Properties</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the <link linkend="folders-properties-window"
->Properties dialogue</link
-> which lets you change the settings for the selected folder.</para
-> 
+<para>Opens up the <link linkend="folders-properties-window">Properties dialogue</link> which lets you change the settings for the selected folder.</para> 
 </listitem>
 </varlistentry>
 
@@ -1100,402 +525,183 @@
 </sect2>
 
 <sect2 id="reader-message-menu">
-<title
-><guimenu
->Message</guimenu
-> Menu</title>
+<title><guimenu>Message</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->New Message...</guimenuitem
-> </menuchoice>
+<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>
+<para>Opens the <link linkend="the-composer-window">composer window</link> so you can write a new message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->New Message to Mailing-List...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>New Message to Mailing-List...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the composer window so you can write a new mail. If the current folder holds a mailing list and has a posting address defined, this address will be the default <guilabel
->To:</guilabel
-> address.</para>
+<para>Opens the composer window so you can write a new mail. If the current folder holds a mailing list and has a posting address defined, this address will be the default <guilabel>To:</guilabel> address.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->R</keycap
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>R</keycap></shortcut> <guimenu>Message</guimenu> <guimenuitem>Reply...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel
->To:</guilabel
-> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender. If you want to control which address the <guilabel
->To:</guilabel
-> field is preset with then you should either use <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Reply to Author...</guimenuitem
-></menuchoice
-> or <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Reply to Mailing-List...</guimenuitem
-></menuchoice
->. Your identity will automatically be set to the one which this message was sent to.</para>
+<para>Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel>To:</guilabel> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender. If you want to control which address the <guilabel>To:</guilabel> field is preset with then you should either use <menuchoice><guimenu>Message</guimenu><guimenuitem>Reply to Author...</guimenuitem></menuchoice> or <menuchoice><guimenu>Message</guimenu><guimenuitem>Reply to Mailing-List...</guimenuitem></menuchoice>. Your identity will automatically be set to the one which this message was sent to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->A</keycap
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply to All...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>A</keycap></shortcut> <guimenu>Message</guimenu> <guimenuitem>Reply to All...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel
->To:</guilabel
-> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender. The <guilabel
->Copy to (CC):</guilabel
-> field is preset with the addresses of all other recipients of the currently selected message excluding your own addresses. Your identity will automatically be set to the one which this message was sent to.</para>
+<para>Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel>To:</guilabel> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender. The <guilabel>Copy to (CC):</guilabel> field is preset with the addresses of all other recipients of the currently selected message excluding your own addresses. Your identity will automatically be set to the one which this message was sent to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Shift;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply to Author...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>A</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Reply to Author...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel
->To:</guilabel
-> field with the preferred reply address of the sender. Your identity will automatically be set to the one which this message was sent to.</para>
+<para>Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel>To:</guilabel> field with the preferred reply address of the sender. Your identity will automatically be set to the one which this message was sent to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->L</keycap
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply to Mailing-List...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>L</keycap></shortcut> <guimenu>Message</guimenu> <guimenuitem>Reply to Mailing-List...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel
->To:</guilabel
-> field with the mailing-list address. If you did not specify a mailing-list address for the currently selected folder and &kmail; cannot determine the posting address from the currently selected message then the <guilabel
->To:</guilabel
-> field will be empty. Your identity will automatically be set to the one which this message was sent to.</para>
+<para>Opens up the composer window, inserts the quoted text of the currently selected message and presets the <guilabel>To:</guilabel> field with the mailing-list address. If you did not specify a mailing-list address for the currently selected folder and &kmail; cannot determine the posting address from the currently selected message then the <guilabel>To:</guilabel> field will be empty. Your identity will automatically be set to the one which this message was sent to.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Shift;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Reply Without Quote...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>R</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <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>
+<para>Works just like <guimenuitem>Reply...</guimenuitem> except that the text of the currently selected message is not quoted.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Forward</guimenuitem
-> </menuchoice>
+<term><menuchoice><guimenu>Message</guimenu> <guimenuitem>Forward</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Forwards the message to a new recipient. Using <guimenuitem
->Inline</guimenuitem
->, the message's text and some important header fields will be copied to the body of the new message with a text marking the forwarded part. Attachments will be forwarded as attachments of the new message. Using <guimenuitem
->As Attachment</guimenuitem
-> the message and its attachments will become an attachment of the new message. The original message headers will be included in the forwarded message, too. <guimenuitem
->Redirect</guimenuitem
-> 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
-> 
+<para>Forwards the message to a new recipient. Using <guimenuitem>Inline</guimenuitem>, the message's text and some important header fields will be copied to the body of the new message with a text marking the forwarded part. Attachments will be forwarded as attachments of the new message. Using <guimenuitem>As Attachment</guimenuitem> the message and its attachments will become an attachment of the new message. The original message headers will be included in the forwarded message, too. <guimenuitem>Redirect</guimenuitem> works like forward, except that the message stays the same (even the <guilabel>From:</guilabel> field). The user who redirected the message is added in special header fields (<literal>Redirect-From</literal>, <literal>Redirect-Date</literal>, <literal>Redirect-To</literal>, &etc;).</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Bounce...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Bounce...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Sends the message back to the sender with a notice that it cannot be delivered. This is nearly exactly the message you get from a mail relay if the user does not exist. This option was originally added to reply to spam, but as spam today comes almost only from faked email addresses, it should not be used on spam. The same is true for messages that contain a virus: some <acronym
->ISP</acronym
->s check if an outgoing message contains a virus. Bouncing messages containing a virus is a very bad idea, you could end up disconnected by your <acronym
->ISP</acronym
->.</para
-> 
+<para>Sends the message back to the sender with a notice that it cannot be delivered. This is nearly exactly the message you get from a mail relay if the user does not exist. This option was originally added to reply to spam, but as spam today comes almost only from faked email addresses, it should not be used on spam. The same is true for messages that contain a virus: some <acronym>ISP</acronym>s check if an outgoing message contains a virus. Bouncing messages containing a virus is a very bad idea, you could end up disconnected by your <acronym>ISP</acronym>.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Send Again...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Send Again...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a composer window with the currently selected message so it can be sent again. This is only available for messages which you have sent or, more precisely, for messages which have the <guilabel
->sent</guilabel
-> status.</para>
+<para>Opens a composer window with the currently selected message so it can be sent again. This is only available for messages which you have sent or, more precisely, for messages which have the <guilabel>sent</guilabel> status.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Copy To</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Copy To</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Copies the selected messages to a certain folder.</para>
+<para>Copies the selected messages to a certain folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Move To</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Move To</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Moves the selected messages to a certain folder.</para>
+<para>Moves the selected messages to a certain folder.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Mark Message</guisubmenu
-> </menuchoice>
+<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>
+<para>Allows you to change the status of the selected message to one of the following states:</para>
 <!-- TODO: I think it is worth adding inline images here, at some point. LW. -->
 <informaltable>
 <tgroup cols="2">
 <thead>
 <row>
-<entry
->Status</entry>
-<entry
->Symbol</entry>
-<entry
->Meaning</entry>
+<entry>Status</entry>
+<entry>Symbol</entry>
+<entry>Meaning</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
-><guimenuitem
->Read</guimenuitem
-></entry>
-<entry
->Sheet of paper before an envelope</entry>
-<entry
->The message has been read.</entry>
+<entry><guimenuitem>Read</guimenuitem></entry>
+<entry>Sheet of paper before an envelope</entry>
+<entry>The message has been read.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->New</guimenuitem
-></entry>
-<entry
->Closed envelope with a star</entry>
-<entry
->The message is new to &kmail; and you.</entry>
+<entry><guimenuitem>New</guimenuitem></entry>
+<entry>Closed envelope with a star</entry>
+<entry>The message is new to &kmail; and you.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Unread</guimenuitem
-></entry>
-<entry
->Close envelope</entry>
-<entry
->The message is not new to &kmail; but has not been read yet.</entry>
+<entry><guimenuitem>Unread</guimenuitem></entry>
+<entry>Close envelope</entry>
+<entry>The message is not new to &kmail; but has not been read yet.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Important</guimenuitem
-></entry>
-<entry
->Flag</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>
+<entry><guimenuitem>Important</guimenuitem></entry>
+<entry>Flag</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
->Replied</guimenuitem
-></entry>
-<entry
->Blue u-turn arrow</entry>
-<entry
->A reply to this message has been sent.</entry>
+<entry><guimenuitem>Replied</guimenuitem></entry>
+<entry>Blue u-turn arrow</entry>
+<entry>A reply to this message has been sent.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Forwarded</guimenuitem
-></entry>
-<entry
->Blue arrow</entry>
-<entry
->The message has been forwarded to someone else.</entry>
+<entry><guimenuitem>Forwarded</guimenuitem></entry>
+<entry>Blue arrow</entry>
+<entry>The message has been forwarded to someone else.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Queued</guimenuitem
-></entry>
-<entry
->Envelope</entry>
-<entry
->The message has been queued in the outbox to be sent later.</entry>
+<entry><guimenuitem>Queued</guimenuitem></entry>
+<entry>Envelope</entry>
+<entry>The message has been queued in the outbox to be sent later.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Sent</guimenuitem
-></entry>
-<entry
->Angled envelope</entry>
-<entry
->The message has been sent.</entry>
+<entry><guimenuitem>Sent</guimenuitem></entry>
+<entry>Angled envelope</entry>
+<entry>The message has been sent.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Spam</guimenuitem
-></entry>
-<entry
->Round recycle symbol</entry>
-<entry
->This status will not be set automatically by &kmail;. You can use it to mark spam messages.</entry>
+<entry><guimenuitem>Spam</guimenuitem></entry>
+<entry>Round recycle symbol</entry>
+<entry>This status will not be set automatically by &kmail;. You can use it to mark spam messages.</entry>
 </row>
 <row>
-<entry
-><guimenuitem
->Ham</guimenuitem
-></entry>
-<entry
->Green check mark</entry>
-<entry
->This status will not be set automatically by &kmail;. You can use it to mark messages which are not spam.</entry>
+<entry><guimenuitem>Ham</guimenuitem></entry>
+<entry>Green check mark</entry>
+<entry>This status will not be set automatically by &kmail;. You can use it to mark messages which are not spam.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1506,90 +712,46 @@
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Mark Thread</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Mark Thread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to change the status of all messages in a thread. The possible states are the same as for <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Mark Message</guimenuitem
-></menuchoice
->.</para>
+<para>Allows you to change the status of all messages in a thread. The possible states are the same as for <menuchoice><guimenu>Message</guimenu> <guimenuitem>Mark Message</guimenuitem></menuchoice>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Watch Thread</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Watch Thread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Use this to mark threads which you want to keep an eye on for further contributions to the discussion.</para>
+<para>Use this to mark threads which you want to keep an eye on for further contributions to the discussion.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guisubmenu
->Ignore Thread</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guisubmenu>Ignore Thread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Use this to mark threads you are not interested in. New contributions to this thread will automatically be marked as read.</para>
+<para>Use this to mark threads you are not interested in. New contributions to this thread will automatically be marked as read.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->J</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filters</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>J</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Apply Filters</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Applies your filters to the selected messages.</para>
+<para>Applies your filters to the selected messages.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filter</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filter</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to apply an individual filter to the selected messages. Only filters for which you enabled the <guilabel
->Add this filter to the Apply Filter menu</guilabel
-> option will be available.</para>
+<para>Allows you to apply an individual filter to the selected messages. Only filters for which you enabled the <guilabel>Add this filter to the Apply Filter menu</guilabel> option will be available.</para>
 </listitem>
 </varlistentry>
 
@@ -1599,132 +761,62 @@
 
 
 <sect2 id="reader-tools-menu">
-<title
-><guimenu
->Tools</guimenu
-> Menu</title>
+<title><guimenu>Tools</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->S</keycap
-></shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Find Messages...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>S</keycap></shortcut> <guimenu>Tools</guimenu> <guimenuitem>Find Messages...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up a search window that lets you search for messages with certain characteristics, &eg; a certain subject. Start the search by entering some values and press <guibutton
->Search</guibutton
->. Click on one of the resulting messages and it will appear in the <guilabel
->Message pane</guilabel
->.</para>
+<para>Opens up a search window that lets you search for messages with certain characteristics, &eg; a certain subject. Start the search by entering some values and press <guibutton>Search</guibutton>. Click on one of the resulting messages and it will appear in the <guilabel>Message pane</guilabel>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Address Book</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Address Book</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Starts up <ulink url="/kaddressbook/"
->&kaddressbook;</ulink
->, the &kde; address book.</para>
+<para>Starts up <ulink url="/kaddressbook/">&kaddressbook;</ulink>, the &kde; address book.</para>
 </listitem>
 </varlistentry>
 
 	<varlistentry id="reader-tools-certificate-manager">
 	  <term>
-	    <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Certificate Manager...</guimenuitem
-> </menuchoice>
+	    <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Certificate Manager...</guimenuitem> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->Starts <ulink url="/kleopatra"
-><application
->Kleopatra</application
-></ulink
->, the &kde; certificate manager. </para>
+	    <para>Starts <ulink url="/kleopatra"><application>Kleopatra</application></ulink>, the &kde; certificate manager. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="reader-tools-gnupg-log-viewer">
 	  <term>
-	    <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->GnuPG Log Viewer</guimenuitem
-> </menuchoice>
+	    <menuchoice><guimenu>Tools</guimenu> <guimenuitem>GnuPG Log Viewer</guimenuitem> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->Starts <ulink url="/kwatchgnupg"
-><application
->KWatchGnuPG</application
-></ulink
->, a tool to present the debug output of <application
->GnuPG</application
-> application. If signing, encryption, or verification mysteriously stop working, you might find out why by looking at the log. </para>
+	    <para>Starts <ulink url="/kwatchgnupg"><application>KWatchGnuPG</application></ulink>, a tool to present the debug output of <application>GnuPG</application> application. If signing, encryption, or verification mysteriously stop working, you might find out why by looking at the log. </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry id="reader-tools-import-messages">
 	  <term>
-	    <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Import Messages...</guimenuitem
-> </menuchoice>
+	    <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Import Messages...</guimenuitem> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->Starts up <application
->kmailcvt</application
-> (which is part of tdepim). This application lets you import messages from several email clients &kmail;. </para>
+	    <para>Starts up <application>kmailcvt</application> (which is part of tdepim). This application lets you import messages from several email clients &kmail;. </para>
 	  </listitem>
 	</varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Edit "Out of Office" Replies...</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guisubmenu>Edit "Out of Office" Replies...</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Launch the <guilabel
->Configure "Out of Office" Replies</guilabel
-> dialogue, which allow you to set-up vacation notifications.</para>
+<para>Launch the <guilabel>Configure "Out of Office" Replies</guilabel> dialogue, which allow 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 <guilabel
->IMAP</guilabel
-> account set-up. </para>
+<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 <guilabel>IMAP</guilabel> account set-up. </para>
 </note>
 </listitem>
 </varlistentry>
@@ -1732,50 +824,28 @@
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Create Filter</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guisubmenu>Create Filter</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the <link linkend="filter-dialog-id"
->Filter dialogue</link
-> with a new filter added. This new filter is based on fields of the current mail, depending on which sub menu item you select.</para>
+<para>Opens up the <link linkend="filter-dialog-id">Filter dialogue</link> with a new filter added. This new filter is based on fields of the current mail, depending on which sub menu item you select.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Filter Log Viewer...</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guisubmenu>Filter Log Viewer...</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up the viewer window for the filter log; there you find some options to control the logging of the filtering process. In the log you will find valuable information about what filter rules were used, what was the result of the evaluation of those rules and which filter actions were applied to a message.</para>
+<para>Opens up the viewer window for the filter log; there you find some options to control the logging of the filtering process. In the log you will find valuable information about what filter rules were used, what was the result of the evaluation of those rules and which filter actions were applied to a message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Anti-Spam Wizard...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Anti-Spam Wizard...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->It starts a <link linkend="the-anti-spam-wizard"
->wizard</link
-> which can help you to set up spam filtering.</para>
+<para>It starts a <link linkend="the-anti-spam-wizard">wizard</link> which can help you to set up spam filtering.</para>
 </listitem>
 </varlistentry>
 
@@ -1783,17 +853,12 @@
 <varlistentry>
 <term>
 <menuchoice>
-<guimenu
->Tools</guimenu>
-<guimenuitem
->Anti-Virus Wizard...</guimenuitem>
+<guimenu>Tools</guimenu>
+<guimenuitem>Anti-Virus Wizard...</guimenuitem>
 </menuchoice>
 </term>
 <listitem>
-<para
->It starts a <link linkend="the-anti-virus-wizard"
->wizard</link
-> which can help 
+<para>It starts a <link linkend="the-anti-virus-wizard">wizard</link> which can help 
 you to set up scanning messages for virusses.</para>
 </listitem>
 </varlistentry>
@@ -1805,136 +870,79 @@ you to set up scanning messages for virusses.</para>
 
 
 <sect2 id="reader-settings-menu">
-<title
-><guimenu
->Settings</guimenu
-> Menu</title>
+<title><guimenu>Settings</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled, the Toolbar is visible (the Toolbar is the one with the icon to compose a new message &etc;).</para>
+<para>If enabled, the Toolbar is visible (the Toolbar is the one with the icon to compose a new message &etc;).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Quick Search</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Quick Search</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled, the Quick Search bar which allows you to quickly search for messages matching a search text is visible.</para>
+<para>If enabled, the Quick Search bar which allows you to quickly search for messages matching a search text is visible.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Filters...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Filters...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the <link linkend="filters"
->Message Filters</link
-> window.</para>
+<para>Opens the <link linkend="filters">Message Filters</link> window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure POP Filters...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure POP Filters...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the <link linkend="popfilters"
->Configure Pop Filters</link
-> window.</para>
+<para>Opens the <link linkend="popfilters">Configure Pop Filters</link> window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a window that lets you configure the keyboard shortcuts for many menu commands.</para>
+<para>Opens a window that lets you configure the keyboard shortcuts for many menu commands.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Notifications...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Notifications...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a window that lets you configure what happens when new mail arrives, like playing a sound.</para>
+<para>Opens a window that lets you configure what happens when new mail arrives, like playing a sound.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a window that lets you choose which icons are visible in the toolbar.</para>
+<para>Opens a window that lets you choose which icons are visible in the toolbar.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens the <link linkend="configure"
->Configure</link
-> window.</para>
+<para>Opens the <link linkend="configure">Configure</link> window.</para>
 </listitem>
 </varlistentry>
 
@@ -1943,47 +951,28 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="reader-help-menu">
-<title
-><guimenu
->Help</guimenu
-> Menu</title>
-
-<para
->These are the &kde; standard items for the <guimenu
->Help</guimenu
-> menu:</para>
-&help.menu.documentation; <para
->Additionally &kmail; offers these items:</para>
+<title><guimenu>Help</guimenu> Menu</title>
+
+<para>These are the &kde; standard items for the <guimenu>Help</guimenu> menu:</para>
+&help.menu.documentation; <para>Additionally &kmail; offers these items:</para>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->&kmail; Introduction</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Help</guimenu> <guimenuitem>&kmail; Introduction</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This displays the welcome screen, which lists the most important differences between your version of &kmail; and the previous one.</para>
+<para>This displays the welcome screen, which lists the most important differences between your version of &kmail; and the previous one.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Help</guimenu
-> <guimenuitem
->Tip of the Day</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Help</guimenu> <guimenuitem>Tip of the Day</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This displays a dialogue with useful hints for using &kmail;.</para>
+<para>This displays a dialogue with useful hints for using &kmail;.</para>
 </listitem>
 </varlistentry>
 
@@ -1993,172 +982,82 @@ you to set up scanning messages for virusses.</para>
 </sect1>
 
 <sect1 id="composer-window-menus">
-<title
->The Composer Window</title>
+<title>The Composer Window</title>
 
 <sect2 id="composer-file-menu">
-<title
-><guimenu
->Message</guimenu
-> Menu</title>
+<title><guimenu>Message</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->N</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->New Composer</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>New Composer</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up a new composer window.</para>
+<para>Opens up a new composer window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->New Main Window</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>New Main Window</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Creates a new main window.</para>
+<para>Creates a new main window.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Return</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Send</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Send</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Sends the message immediately. If you use SMTP to send your messages and the SMTP server is not reachable, the message will be put into the outbox and you will get an error message. You can then later send the messages in the outbox using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Queued</guimenuitem
-></menuchoice
->.</para>
+<para>Sends the message immediately. If you use SMTP to send your messages and the SMTP server is not reachable, the message will be put into the outbox and you will get an error message. You can then later send the messages in the outbox using <menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued</guimenuitem></menuchoice>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Queue</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Queue</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Queues the message in the outbox for sending it later using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Queued</guimenuitem
-></menuchoice
->. </para>
+<para>Queues the message in the outbox for sending it later using <menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued</guimenuitem></menuchoice>. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Save in Drafts Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Message</guimenu> <guimenuitem>Save in Drafts Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Save the message in the <guilabel
->drafts</guilabel
-> folder so you can later edit and send it.</para>
+<para>Save the message in the <guilabel>drafts</guilabel> folder so you can later edit and send it.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Messages</guimenu
-> <guimenuitem
->Insert File...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Messages</guimenu> <guimenuitem>Insert File...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Inserts a text file into the message text, starting at the cursor position.</para>
+<para>Inserts a text file into the message text, starting at the cursor position.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Print...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Print...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Prints the current text.</para>
+<para>Prints the current text.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->W</keycap
-></keycombo
-></shortcut
-> <guimenu
->Message</guimenu
-> <guimenuitem
->Close</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo></shortcut> <guimenu>Message</guimenu> <guimenuitem>Close</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Closes this composer window.</para>
+<para>Closes this composer window.</para>
 </listitem>
 </varlistentry>
 
@@ -2168,259 +1067,124 @@ you to set up scanning messages for virusses.</para>
 
 
 <sect2 id="composer-edit-menu">
-<title
-><guimenu
->Edit</guimenu
-> Menu</title>
+<title><guimenu>Edit</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Undo your steps in editing the current message.</para>
+<para>Undo your steps in editing the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;&Shift;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Redo</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Redo</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Redo your steps in editing the current message.</para>
+<para>Redo your steps in editing the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Cut</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Cut</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Cutting text works as with most editors: the selected text is removed and put into the clipboard. Note that you can also select text and drag it to a new position.</para>
+<para>Cutting text works as with most editors: the selected text is removed and put into the clipboard. Note that you can also select text and drag it to a new position.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Copying text works as with most editors: the selected text is copied to the clipboard. Note that you can also select text while holding the &Ctrl; key and drag it to a new position to copy it.</para>
+<para>Copying text works as with most editors: the selected text is copied to the clipboard. Note that you can also select text while holding the &Ctrl; key and drag it to a new position to copy it.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Paste</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Pasting works the same as with most editors: the text from the clipboard is pasted at the current cursor position.</para>
+<para>Pasting works the same as with most editors: the text from the clipboard is pasted at the current cursor position.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Select All</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Select All</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Selects all of the text in your message.</para>
+<para>Selects all of the text in your message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a dialogue to search for strings in the current message.</para>
+<para>Opens a dialogue to search for strings in the current message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find Next</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find Next</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Goes to the next occurrence of the previously searched string.</para>
+<para>Goes to the next occurrence of the previously searched string.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Replace...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Replace...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a dialogue that lets you replace strings in your message with other strings.</para>
+<para>Opens a dialogue that lets you replace strings in your message with other strings.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Clean Spaces</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Clean Spaces</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->This replaces multiple line breaks or spaces with single line breaks or spaces. It works on the current selection or on the complete message if there is no selection.</para>
+<para>This replaces multiple line breaks or spaces with single line breaks or spaces. It works on the current selection or on the complete message if there is no selection.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Paste as Quotation</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Paste as Quotation</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Pastes the text from the clipboard marked as quotation.</para>
+<para>Pastes the text from the clipboard marked as quotation.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Add Quote Characters</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Add Quote Characters</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Prepends the selected text with quotation marks.</para>
+<para>Prepends the selected text with quotation marks.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Remove Quote Characters</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Remove Quote Characters</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Removes the left-most quotation marks from the selected text.</para>
+<para>Removes the left-most quotation marks from the selected text.</para>
 </listitem>
 </varlistentry>
 
@@ -2429,104 +1193,57 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="composer-view-menu">
-<title
-><guimenu
->View</guimenu
-> Menu</title>
+<title><guimenu>View</guimenu> Menu</title>
 
-<para
->This menu lets you toggle the display of the header fields and other options in this composer window.</para>
+<para>This menu lets you toggle the display of the header fields and other options in this composer window.</para>
 
-<para
->Options available are:</para>
+<para>Options available are:</para>
 
 <itemizedlist>
 <listitem>
-<para
-><guimenuitem
->All Fields</guimenuitem
-></para>
+<para><guimenuitem>All Fields</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Identity</guimenuitem
-></para>
+<para><guimenuitem>Identity</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Dictionary</guimenuitem
-></para>
+<para><guimenuitem>Dictionary</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Sent-Mail folder</guimenuitem
-></para>
+<para><guimenuitem>Sent-Mail folder</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Mail Transport</guimenuitem
-></para>
+<para><guimenuitem>Mail Transport</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->From</guimenuitem
-></para>
+<para><guimenuitem>From</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Reply To</guimenuitem
-></para>
+<para><guimenuitem>Reply To</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->To</guimenuitem
-></para>
+<para><guimenuitem>To</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->CC</guimenuitem
-></para>
+<para><guimenuitem>CC</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->BCC</guimenuitem
-></para>
+<para><guimenuitem>BCC</guimenuitem></para>
 </listitem>
 <listitem>
-<para
-><guimenuitem
->Subject</guimenuitem
-></para>
+<para><guimenuitem>Subject</guimenuitem></para>
 </listitem>
 </itemizedlist>
 
-<para
->Currently visible items have a checkmark shown next to their name in the menu.</para>
+<para>Currently visible items have a checkmark shown next to their name in the menu.</para>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Use Fixed Font</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Use Fixed Font</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Uses a fixed width (monospaced) font to display the currently edited message. The font to be used can be configured in the <guilabel
->Appearance</guilabel
-> section of &kmail;'s configuration dialogue.</para>
+<para>Uses a fixed width (monospaced) font to display the currently edited message. The font to be used can be configured in the <guilabel>Appearance</guilabel> section of &kmail;'s configuration dialogue.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -2534,159 +1251,89 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="composer-options-menu">
-<title
-><guimenu
->Options</guimenu
-> Menu</title>
+<title><guimenu>Options</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Urgent</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Urgent</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Sets the priority of the message to Urgent. The receiver's email client has to support this or it will have no effect. &kmail; itself does not support priorities for incoming messages.</para>
+<para>Sets the priority of the message to Urgent. The receiver's email client has to support this or it will have no effect. &kmail; itself does not support priorities for incoming messages.</para>
 </listitem>
 </varlistentry>
 
 	<varlistentry id="composer-options-request-mdn">
 	  <term>
-	    <menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Request Disposition Notification</guimenuitem
-> </menuchoice>
+	    <menuchoice><guimenu>Options</guimenu> <guimenuitem>Request Disposition Notification</guimenuitem> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->If you choose this option, you request a confirmation email once your message is downloaded and read by its recipient. This has to be supported and enabled by the receiver's email client in order to work. </para>
-	    <para
->See <xref linkend="configure-security-reading-mdns"/> for background information and ways to customise the read receipts that &kmail; itself sends. </para>
+	    <para>If you choose this option, you request a confirmation email once your message is downloaded and read by its recipient. This has to be supported and enabled by the receiver's email client in order to work. </para>
+	    <para>See <xref linkend="configure-security-reading-mdns"/> for background information and ways to customise the read receipts that &kmail; itself sends. </para>
 	  </listitem>
 	</varlistentry>
 
 <varlistentry id="composer-options-sign-message">
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Sign Message</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guisubmenu>Sign Message</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Digitally sign the message using <application
->OpenPGP</application
->. You can learn more about this in the <link linkend="pgp"
->chapter on OpenPGP</link
->.</para>
+<para>Digitally sign the message using <application>OpenPGP</application>. You can learn more about this in the <link linkend="pgp">chapter on OpenPGP</link>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="composer-options-encrypt-message">
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Encrypt Message</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guisubmenu>Encrypt Message</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Encrypt the message using <application
->OpenPGP</application
->. You can learn more about this in the <link linkend="pgp"
->chapter on OpenPGP</link
->.</para>
+<para>Encrypt the message using <application>OpenPGP</application>. You can learn more about this in the <link linkend="pgp">chapter on OpenPGP</link>.</para>
 </listitem>
 </varlistentry>
 
 	<varlistentry id="composer-options-select-crypto-message-format">
 	  <term>
-	    <menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Select Cryptographic Message Format</guisubmenu
-> </menuchoice>
+	    <menuchoice><guimenu>Options</guimenu> <guisubmenu>Select Cryptographic Message Format</guisubmenu> </menuchoice>
 	  </term>
 	  <listitem>
-	    <para
->Choose the cryptographic message format to use to digitally sign and/or encrypt the message in. See <link linkend="cryptographic-message-formats"
->the previous description of each option</link
-> for more information. </para>
+	    <para>Choose the cryptographic message format to use to digitally sign and/or encrypt the message in. See <link linkend="cryptographic-message-formats">the previous description of each option</link> for more information. </para>
 	  </listitem>
 	</varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Formatting (HTML)</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guisubmenu>Formatting (HTML)</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Enables &html; editing.</para>
+<para>Enables &html; editing.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guisubmenu
->Set Encoding</guisubmenu
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guisubmenu>Set Encoding</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the charset encoding of this message. The chosen encoding will appear in the header of the outgoing mail. You can use <guilabel
->Auto</guilabel
-> for almost all cases, &kmail; will tell you if you need to select a different encoding manually.</para>
+<para>Set the charset encoding of this message. The chosen encoding will appear in the header of the outgoing mail. You can use <guilabel>Auto</guilabel> for almost all cases, &kmail; will tell you if you need to select a different encoding manually.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Wordwrap</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Wordwrap</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Toggles the automatic wordwrap. It may be useful to turn it off if you want to paste long lines that should not wrap.</para>
+<para>Toggles the automatic wordwrap. It may be useful to turn it off if you want to paste long lines that should not wrap.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Automatic Spellchecking</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Automatic Spellchecking</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Toggles automatic spellchecking. Note that in &html;-editing mode automatic spellchecking is not available.</para>
+<para>Toggles automatic spellchecking. Note that in &html;-editing mode automatic spellchecking is not available.</para>
 </listitem>
 </varlistentry>
 
@@ -2696,131 +1343,73 @@ you to set up scanning messages for virusses.</para>
 
 
 <sect2 id="composer-attach-menu">
-<title
-><guimenu
->Attach</guimenu
-> Menu</title>
+<title><guimenu>Attach</guimenu> Menu</title>
 
-<para
->This menu lets you select attachment options.</para>
+<para>This menu lets you select attachment options.</para>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Append Signature</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Append Signature</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Appends your signature (<quote
->footer</quote
->) to the end of the message. </para>
+<para>Appends your signature (<quote>footer</quote>) to the end of the message. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attach Public Key...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attach Public Key...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Attaches the corresponding <application
->PGP</application
->/<application
->GnuPG</application
-> key to your message.</para>
+<para>Attaches the corresponding <application>PGP</application>/<application>GnuPG</application> key to your message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="composer-attach-attach-my-public-key">
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attach My Public Key</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attach My Public Key</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Attaches your <application
->PGP</application
->/<application
->GnuPG</application
-> public key to your message.</para>
+<para>Attaches your <application>PGP</application>/<application>GnuPG</application> public key to your message.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attach File...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attach File...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Attaches one or more files to the current message.</para>
+<para>Attaches one or more files to the current message.</para>
 <!-- fixme: not encrypted unless... -->
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Remove Attachment</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Remove Attachment</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Removes the attachment that is selected in the attachment part of the composer.</para>
+<para>Removes the attachment that is selected in the attachment part of the composer.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Save Attachment As...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Save Attachment As...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Saves the attachment that is selected in the attachment window to a file.</para>
+<para>Saves the attachment that is selected in the attachment window to a file.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attachment Properties</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attachment Properties</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Displays the <link linkend="attachments"
->properties of the attachment</link
-> that is selected in the attachment window.</para>
+<para>Displays the <link linkend="attachments">properties of the attachment</link> that is selected in the attachment window.</para>
 </listitem>
 </varlistentry>
 
@@ -2829,50 +1418,25 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="composer-tools-menu">
-<title
-><guimenu
->Tools</guimenu
-> Menu</title>
+<title><guimenu>Tools</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Uses <ulink url="/tdespell/"
->&tdespell;</ulink
-> to check the spelling in the body of your message. Note that you have to configure &tdespell; with <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Spellchecker...</guimenuitem
-></menuchoice
-> if you use it for the first time.</para>
+<para>Uses <ulink url="/tdespell/">&tdespell;</ulink> to check the spelling in the body of your message. Note that you have to configure &tdespell; with <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Spellchecker...</guimenuitem></menuchoice> if you use it for the first time.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Addressbook...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Addressbook...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens up <ulink url="/kaddressbook/"
->&kaddressbook;</ulink
->.</para>
+<para>Opens up <ulink url="/kaddressbook/">&kaddressbook;</ulink>.</para>
 </listitem>
 </varlistentry>
 
@@ -2881,104 +1445,61 @@ you to set up scanning messages for virusses.</para>
 </sect2>
 
 <sect2 id="composer-settings-menu">
-<title
-><guimenu
->Settings</guimenu
-> Menu</title>
+<title><guimenu>Settings</guimenu> Menu</title>
 
 <variablelist>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Main Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Main Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled, the Main Toolbar is visible, &ie; the one with the icon to send the message &etc;.</para>
+<para>If enabled, the Main Toolbar is visible, &ie; the one with the icon to send the message &etc;.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show HTML Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show HTML Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->If enabled, the &html; Toolbar is visible, &ie; the one which with the tools to change certain properties of the composed text.</para>
+<para>If enabled, the &html; Toolbar is visible, &ie; the one which with the tools to change certain properties of the composed text.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Spellchecker...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Spellchecker...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Allows you to configure <ulink url="/tdespell/"
->&tdespell;</ulink
->, &kde;'s spellchecker.</para>
+<para>Allows you to configure <ulink url="/tdespell/">&tdespell;</ulink>, &kde;'s spellchecker.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a window that lets you configure the keyboard shortcuts for many menu commands.</para>
+<para>Opens a window that lets you configure the keyboard shortcuts for many menu commands.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens a window that allows you to decide which icons appear in the toolbar.</para>
+<para>Opens a window that allows you to decide which icons appear in the toolbar.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Opens &kmail;'s <link linkend="configure"
->configuration dialogue</link
->.</para>
+<para>Opens &kmail;'s <link linkend="configure">configuration dialogue</link>.</para>
 </listitem>
 </varlistentry>
 
@@ -2987,15 +1508,9 @@ you to set up scanning messages for virusses.</para>
 
 
 <sect2 id="composer-help-menu">
-<title
-><guimenu
->Help</guimenu
-> Menu</title>
-
-<para
->The entries in this menu have the same meaning as <link linkend="reader-help-menu"
->the entries in the main window's help menu</link
->.</para>
+<title><guimenu>Help</guimenu> Menu</title>
+
+<para>The entries in this menu have the same meaning as <link linkend="reader-help-menu">the entries in the main window's help menu</link>.</para>
 
 </sect2>
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook b/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook
index 9bbf43f48a7..12f1fcd3e67 100644
--- a/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/kmail/using-kmail.docbook
@@ -2,113 +2,37 @@
 
 <chapterinfo>
 <authorgroup>
-<author
-><firstname
->Daniel</firstname
-> <surname
->Naber</surname
-> <affiliation
-><address
-> <email
->daniel.naber@t-online.de</email>
-</address
-></affiliation>
+<author><firstname>Daniel</firstname> <surname>Naber</surname> <affiliation><address> <email>daniel.naber@t-online.de</email>
+</address></affiliation>
 </author>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 </authorgroup>
-<date
->2004-09-24</date
-> <releaseinfo
->1.7.50</releaseinfo
-> </chapterinfo>
+<date>2004-09-24</date> <releaseinfo>1.7.50</releaseinfo> </chapterinfo>
 
-<title
->Using &kmail;</title>
+<title>Using &kmail;</title>
 
 <sect1 id="the-mail-reader-window">
-<title
->The Main Window</title>
+<title>The Main Window</title>
 
-<para
->The main window is the window that appears when &kmail; is started. It is by default divided into three panes:</para>
+<para>The main window is the window that appears when &kmail; is started. It is by default divided into three panes:</para>
 
 <variablelist>
 <varlistentry>
-<term
->Folder list (on the left)</term>
+<term>Folder list (on the left)</term>
 <listitem>
-<para
->This pane contains the list of your message folders (other email programs may call them mailboxes). To select a folder, simply click on it. The messages contained in the folder will now appear in the Headers pane. The folder list can be displayed in both a short view, which takes up only a small portion of the left side of the screen, and a long view, which takes up the entire left side of the screen but is able to show more mailboxes. You can toggle between these two views under <guilabel
->Appearance</guilabel
->/<guilabel
->Layout</guilabel
-> in the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
-> dialogue. Also see the <link linkend="folders"
->Folders Section</link
-> for more information about how to use folders.</para>
+<para>This pane contains the list of your message folders (other email programs may call them mailboxes). To select a folder, simply click on it. The messages contained in the folder will now appear in the Headers pane. The folder list can be displayed in both a short view, which takes up only a small portion of the left side of the screen, and a long view, which takes up the entire left side of the screen but is able to show more mailboxes. You can toggle between these two views under <guilabel>Appearance</guilabel>/<guilabel>Layout</guilabel> in the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> dialogue. Also see the <link linkend="folders">Folders Section</link> for more information about how to use folders.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Message list (in the upper right by default)</term>
+<term>Message list (in the upper right by default)</term>
 <listitem>
-<para
->This pane lists header information (message Status Flags, Sender, Subject, Date, and other optional columns like Size, Attachment Flag, Important Flag etc.) for the messages in the currently selected folder. Clicking on a header will select that message and display it in the Message pane; you can also select more than one message by holding down the &Ctrl; key when clicking on messages. You may sort the messages by clicking on the column that you wish to sort; if you click on the same column more than once, sort order will toggle between ascending/descending and some alternative sorting criteria will become available (like sorting by Status when you click on the header of the Subject column). Clicking the <mousebutton
->right</mousebutton
-> mousebutton on the list header shows a popup menu, which allows to show or hide several columns in the list. </para>
+<para>This pane lists header information (message Status Flags, Sender, Subject, Date, and other optional columns like Size, Attachment Flag, Important Flag etc.) for the messages in the currently selected folder. Clicking on a header will select that message and display it in the Message pane; you can also select more than one message by holding down the &Ctrl; key when clicking on messages. You may sort the messages by clicking on the column that you wish to sort; if you click on the same column more than once, sort order will toggle between ascending/descending and some alternative sorting criteria will become available (like sorting by Status when you click on the header of the Subject column). Clicking the <mousebutton>right</mousebutton> mousebutton on the list header shows a popup menu, which allows to show or hide several columns in the list. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Message preview pane (in the lower right by default)</term>
+<term>Message preview pane (in the lower right by default)</term>
 <listitem>
-<para
->This pane displays the currently selected message. Attachments appear at the bottom of the message, either as icons or embedded in the message, depending on <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Attachments</guimenuitem
-></menuchoice
->. For complex messages the structure of the message is shown in the message structure viewer below the preview pane. The placement of the preview pane as well as the placement of the structure viewer can be changed under <guilabel
->Appearance</guilabel
->/<guilabel
->Layout</guilabel
-> in the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
-> dialogue. Moreover, you can disable the preview pane and you can choose when the message structure viewer should be shown. You can scroll through the message page-by-page using the <keycap
->Page Up</keycap
-> and <keycap
->Page down</keycap
-> keys, or line-by-line using the <keycap
->up arrow</keycap
-> and <keycap
->down arrow</keycap
-> keys; you can also use <link linkend="keyboard-shortcuts"
->key shortcuts</link
-> to skip through your messages without having to use the mouse.</para>
+<para>This pane displays the currently selected message. Attachments appear at the bottom of the message, either as icons or embedded in the message, depending on <menuchoice><guimenu>View</guimenu> <guimenuitem>Attachments</guimenuitem></menuchoice>. For complex messages the structure of the message is shown in the message structure viewer below the preview pane. The placement of the preview pane as well as the placement of the structure viewer can be changed under <guilabel>Appearance</guilabel>/<guilabel>Layout</guilabel> in the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> dialogue. Moreover, you can disable the preview pane and you can choose when the message structure viewer should be shown. You can scroll through the message page-by-page using the <keycap>Page Up</keycap> and <keycap>Page down</keycap> keys, or line-by-line using the <keycap>up arrow</keycap> and <keycap>down arrow</keycap> keys; you can also use <link linkend="keyboard-shortcuts">key shortcuts</link> to skip through your messages without having to use the mouse.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -116,1043 +40,486 @@
 </sect1>
 
 <sect1 id="keyboard-shortcuts">
-<title
->Keyboard Shortcuts</title>
+<title>Keyboard Shortcuts</title>
 
-<para
->The following keyboard shortcuts are supported in the main window:</para>
+<para>The following keyboard shortcuts are supported in the main window:</para>
 
 <informaltable>
 <tgroup cols="2">
 <thead>
 <row>
-<entry
->Keyboard Shortcut</entry>
-<entry
->Action</entry>
+<entry>Keyboard Shortcut</entry>
+<entry>Action</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
-><keycap
->Space</keycap
-></entry>
-<entry
->Scroll down in the current message or go to the next unread message if you are already at the bottom.</entry>
+<entry><keycap>Space</keycap></entry>
+<entry>Scroll down in the current message or go to the next unread message if you are already at the bottom.</entry>
 </row>
 <row>
-<entry
-><keycap
->Right Arrow</keycap
-> or <keycap
->N</keycap
-></entry>
-<entry
->Go to the next message in the current folder.</entry>
+<entry><keycap>Right Arrow</keycap> or <keycap>N</keycap></entry>
+<entry>Go to the next message in the current folder.</entry>
 </row>
 <row>
-<entry
-><keycap
->Left Arrow</keycap
-> key or <keycap
->P</keycap
-></entry>
-<entry
->Go to the previous message in the current folder.</entry>
+<entry><keycap>Left Arrow</keycap> key or <keycap>P</keycap></entry>
+<entry>Go to the previous message in the current folder.</entry>
 </row>
 <row>
-<entry
-><keycap
->+</keycap
-></entry>
-<entry
->Go to the next unread message in the current folder.</entry>
+<entry><keycap>+</keycap></entry>
+<entry>Go to the next unread message in the current folder.</entry>
 </row>
 <row>
-<entry
-><keycap
->-</keycap
-></entry>
-<entry
->Go to the previous unread message in the current folder.</entry>
+<entry><keycap>-</keycap></entry>
+<entry>Go to the previous unread message in the current folder.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->+</keycap
-></keycombo
-></entry>
-<entry
->Go to the next folder with unread messages.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>+</keycap></keycombo></entry>
+<entry>Go to the next folder with unread messages.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->-</keycap
-></keycombo
-></entry>
-<entry
->Go to the previous folder with unread messages.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>-</keycap></keycombo></entry>
+<entry>Go to the previous folder with unread messages.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Up Arrow</keycap
-></keycombo
-></entry>
-<entry
->Go to the next folder in the folder list (if the folder list has focus).</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Up Arrow</keycap></keycombo></entry>
+<entry>Go to the next folder in the folder list (if the folder list has focus).</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Down Arrow</keycap
-></keycombo
-></entry>
-<entry
->Go to the previous folder in the folder list (if the folder list has focus).</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Down Arrow</keycap></keycombo></entry>
+<entry>Go to the previous folder in the folder list (if the folder list has focus).</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Left Arrow</keycap
-></keycombo
-></entry>
-<entry
->Walk upwards in the list of folders. Use <keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-> to actually enter the folder.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Left Arrow</keycap></keycombo></entry>
+<entry>Walk upwards in the list of folders. Use <keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo> to actually enter the folder.</entry>
 <!-- TODO: or wait for timeout so the folder is selected? -->
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Right Arrow</keycap
-></keycombo
-></entry>
-<entry
->Walk downwards in the list of folders. Use <keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-> to actually enter the folder.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Right Arrow</keycap></keycombo></entry>
+<entry>Walk downwards in the list of folders. Use <keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo> to actually enter the folder.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-></entry>
-<entry
->Enter the folder that has focus, &ie; the folder that you navigated to using <keycombo action="simul"
->&Ctrl;<keycap
->Left Arrow</keycap
-></keycombo
-> or <keycombo action="simul"
->&Ctrl;<keycap
->Right Arrow</keycap
-></keycombo
->.</entry>
+<entry><keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo></entry>
+<entry>Enter the folder that has focus, &ie; the folder that you navigated to using <keycombo action="simul">&Ctrl;<keycap>Left Arrow</keycap></keycombo> or <keycombo action="simul">&Ctrl;<keycap>Right Arrow</keycap></keycombo>.</entry>
 </row>
 <row>
-<entry
-><keycombo action="simul"
->&Shift;<keycap
->Left Arrow</keycap
-></keycombo
-> and <keycombo action="simul"
->&Shift;<keycap
->Right Arrow</keycap
-></keycombo
-></entry>
-<entry
->Select messages in the header pane, starting with the current message.</entry>
+<entry><keycombo action="simul">&Shift;<keycap>Left Arrow</keycap></keycombo> and <keycombo action="simul">&Shift;<keycap>Right Arrow</keycap></keycombo></entry>
+<entry>Select messages in the header pane, starting with the current message.</entry>
 </row>
 </tbody>
 </tgroup>
 </informaltable>
 
-<para
->For more keyboard shortcuts have a look at the <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts...</guimenuitem
-></menuchoice
-> dialogue.</para>
+<para>For more keyboard shortcuts have a look at the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice> dialogue.</para>
 
 </sect1>
 
 <sect1 id="the-composer-window">
-<title
->The Composer Window</title>
-
-<para
->The composer window is used to write new messages; it can be invoked via <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->New Message...</guimenuitem
-></menuchoice
-> menu or from the <guiicon
->New Message</guiicon
-> icon on the main window.</para>
+<title>The Composer Window</title>
+
+<para>The composer window is used to write new messages; it can be invoked via <menuchoice><guimenu>Message</guimenu> <guimenuitem>New Message...</guimenuitem></menuchoice> menu or from the <guiicon>New Message</guiicon> icon on the main window.</para>
 
 <sect2 id="composing-a-message">
-<title
->Composing a Message</title>
-
-<para
->To write your message, fill in the appropriate fields in the composer window. Use the <guimenu
->View</guimenu
-> menu to select which header fields are displayed. The <guimenuitem
->Identity</guimenuitem
-> field offers a <guibutton
->Sticky</guibutton
-> option; if it is checked, the current identity will become the default identity when you open a new composer next time.</para>
-
-<para
->There are a variety of shortcuts to help you with writing your messages. The <guibutton
->...</guibutton
-> buttons next to the <guilabel
->To:</guilabel
->, <guilabel
->CC:</guilabel
-> and <guilabel
->BCC:</guilabel
-> fields will call up the address book so that you can select addresses from there.</para>
-
-<para
->When you start typing an address in the <guilabel
->To:</guilabel
->/<guilabel
->CC:</guilabel
->/<guilabel
->BCC:</guilabel
-> fields, a popup will appear that offers matching addresses that have been used recently and matching addresses from your address book; if you do not like the automatic popup you can disable it by clicking with the &RMB; on the field and choosing a different completion mode.</para>
-
-<para
->Whenever you want to add more than one recipient in one of the fields, use a comma to separate each address from the next one. You may need to specify fully qualified addresses (&ie; <userinput
->user@domain.com</userinput
->) even for local users, depending on your system configuration.</para>
-
-<para
->When you are finished with your message, click the <guiicon
->Send</guiicon
-> icon (the envelope) to send the message now, or click the <guiicon
->Queue</guiicon
-> icon to put the message in the outbox. If your message is not finished yet, select <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Save in Drafts Folder</guimenuitem
-></menuchoice
->. </para
-></sect2>
+<title>Composing a Message</title>
+
+<para>To write your message, fill in the appropriate fields in the composer window. Use the <guimenu>View</guimenu> menu to select which header fields are displayed. The <guimenuitem>Identity</guimenuitem> field offers a <guibutton>Sticky</guibutton> option; if it is checked, the current identity will become the default identity when you open a new composer next time.</para>
+
+<para>There are a variety of shortcuts to help you with writing your messages. The <guibutton>...</guibutton> buttons next to the <guilabel>To:</guilabel>, <guilabel>CC:</guilabel> and <guilabel>BCC:</guilabel> fields will call up the address book so that you can select addresses from there.</para>
+
+<para>When you start typing an address in the <guilabel>To:</guilabel>/<guilabel>CC:</guilabel>/<guilabel>BCC:</guilabel> fields, a popup will appear that offers matching addresses that have been used recently and matching addresses from your address book; if you do not like the automatic popup you can disable it by clicking with the &RMB; on the field and choosing a different completion mode.</para>
+
+<para>Whenever you want to add more than one recipient in one of the fields, use a comma to separate each address from the next one. You may need to specify fully qualified addresses (&ie; <userinput>user@domain.com</userinput>) even for local users, depending on your system configuration.</para>
+
+<para>When you are finished with your message, click the <guiicon>Send</guiicon> icon (the envelope) to send the message now, or click the <guiicon>Queue</guiicon> icon to put the message in the outbox. If your message is not finished yet, select <menuchoice><guimenu>Message</guimenu><guimenuitem>Save in Drafts Folder</guimenuitem></menuchoice>. </para></sect2>
 
 <sect2 id="encrypt-sign">
-<title
->Signing and Encrypting Messages</title>
-
-<para
->If you want to send an <link linkend="pgp-encrypt-your-messages"
->encrypted</link
-> or <link linkend="pgp-sign-your-messages"
->digitally signed</link
-> message, select the <guiicon
->Sign Message</guiicon
-> or <guiicon
->Encrypt Message</guiicon
-> icons in the toolbar. Moreover you can select the format that should be used to sign and/or encrypt the message. Depending on the installed encryption programs you can choose between: </para>
+<title>Signing and Encrypting Messages</title>
+
+<para>If you want to send an <link linkend="pgp-encrypt-your-messages">encrypted</link> or <link linkend="pgp-sign-your-messages">digitally signed</link> message, select the <guiicon>Sign Message</guiicon> or <guiicon>Encrypt Message</guiicon> icons in the toolbar. Moreover you can select the format that should be used to sign and/or encrypt the message. Depending on the installed encryption programs you can choose between: </para>
 
 <variablelist id="cryptographic-message-formats">
 <varlistentry>
-<term
-><guilabel
->Any</guilabel
-></term>
+<term><guilabel>Any</guilabel></term>
 <listitem>
-<para
->KMail will use a format which is understood by all recipients of the message. The preferred format of the recipients can be specified in the KDE Address Book.</para
-></listitem>
+<para>KMail will use a format which is understood by all recipients of the message. The preferred format of the recipients can be specified in the KDE Address Book.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Inline OpenPGP (deprecated)</guilabel
-></term>
+<term><guilabel>Inline OpenPGP (deprecated)</guilabel></term>
 <listitem>
-<para
->This format is outdated. If you use this format then only the message text will be signed and/or encrypted. <emphasis
->Attachments will neither be signed nor encrypted.</emphasis
-> HTML messages cannot be signed with this format. You should only use this format if necessary, &ie; if you send messages to users of email clients that cannot handle the more advanced formats.</para
-></listitem>
+<para>This format is outdated. If you use this format then only the message text will be signed and/or encrypted. <emphasis>Attachments will neither be signed nor encrypted.</emphasis> HTML messages cannot be signed with this format. You should only use this format if necessary, &ie; if you send messages to users of email clients that cannot handle the more advanced formats.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->PGP/MIME</guilabel
-></term>
+<term><guilabel>PGP/MIME</guilabel></term>
 <listitem>
-<para
->This format is the successor of the inline OpenPGP format. If you use this format then the message text and all attachments will be signed and/or encrypted (at least by default). This is the recommended format if you use OpenPGP.</para
-></listitem>
+<para>This format is the successor of the inline OpenPGP format. If you use this format then the message text and all attachments will be signed and/or encrypted (at least by default). This is the recommended format if you use OpenPGP.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->S/MIME</guilabel
-></term>
+<term><guilabel>S/MIME</guilabel></term>
 <listitem>
-<para
->This format is an alternative format to PGP/MIME. If you use this format then the message text and all attachments will be signed and/or encrypted (at least by default). This format is mostly used by corporations.</para
-></listitem>
+<para>This format is an alternative format to PGP/MIME. If you use this format then the message text and all attachments will be signed and/or encrypted (at least by default). This format is mostly used by corporations.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->S/MIME opaque</guilabel
-></term>
+<term><guilabel>S/MIME opaque</guilabel></term>
 <listitem>
-<para
->This format is a variant of the S/MIME format. It should only be used if necessary.</para
-></listitem>
+<para>This format is a variant of the S/MIME format. It should only be used if necessary.</para></listitem>
 </varlistentry>
 </variablelist>
 
 </sect2>
 
 <sect2 id="html-mails">
-<title
->Creating HTML Messages</title>
+<title>Creating HTML Messages</title>
 
-<para
->Note that HTML messages are often regarded as an annoyance; therefore, you should avoid sending HTML messages if possible. Particularly, you should never send HTML messages to a mailing list unless HTML messages are explicitly allowed.</para>
+<para>Note that HTML messages are often regarded as an annoyance; therefore, you should avoid sending HTML messages if possible. Particularly, you should never send HTML messages to a mailing list unless HTML messages are explicitly allowed.</para>
 
-<para
->In order to be able to create HTML messages you first have to enable the markup tools. To do this enable <guimenuitem
->Formatting (HTML)</guimenuitem
-> in the <menuchoice
-><guimenu
->Options</guimenu
-></menuchoice
-> menu. A toolbar with several tools to format the message will appear. Via the drop down box you can select between standard text and six different types of lists (three bulleted lists with different symbols and three numbered lists with different numbering). Moreover, you can select the font family, the font size, the font style (bold, italic, underlined) and the text colour. Last but not least, you can select the alignment of the text (left aligned, centred, right aligned).</para>
+<para>In order to be able to create HTML messages you first have to enable the markup tools. To do this enable <guimenuitem>Formatting (HTML)</guimenuitem> in the <menuchoice><guimenu>Options</guimenu></menuchoice> menu. A toolbar with several tools to format the message will appear. Via the drop down box you can select between standard text and six different types of lists (three bulleted lists with different symbols and three numbered lists with different numbering). Moreover, you can select the font family, the font size, the font style (bold, italic, underlined) and the text colour. Last but not least, you can select the alignment of the text (left aligned, centred, right aligned).</para>
 
-<para
->Creating tables and embedding images is currently not possible.</para>
+<para>Creating tables and embedding images is currently not possible.</para>
 
 </sect2>
 
 <sect2 id="attachments">
-<title
->Adding Attachments</title>
+<title>Adding Attachments</title>
 
-<para
->You can attach files to your message by using one of the methods below:</para>
+<para>You can attach files to your message by using one of the methods below:</para>
 
 <itemizedlist>
 <listitem>
-<para
->Click the <guiicon
->Attach File</guiicon
-> (paper clip) icon and select the file you wish to attach;</para>
+<para>Click the <guiicon>Attach File</guiicon> (paper clip) icon and select the file you wish to attach;</para>
 </listitem>
 <listitem>
-<para
->Drag a file from the desktop or another folder into the composer window;</para
-> 
+<para>Drag a file from the desktop or another folder into the composer window;</para> 
 </listitem>
 <listitem>
-<para
->Drag a message from &kmail;'s message list into the composer window -- that message will then be attached;</para>
+<para>Drag a message from &kmail;'s message list into the composer window -- that message will then be attached;</para>
 </listitem>
 <listitem>
-<para
->Select one of the options in the <menuchoice
-><guimenu
->Attach</guimenu
-></menuchoice
-> menu.</para>
+<para>Select one of the options in the <menuchoice><guimenu>Attach</guimenu></menuchoice> menu.</para>
 </listitem>
 </itemizedlist>
 
-<para
->Once a file is attached to your message, it appears in the attachments pane at the bottom of the composer window. You can use the &RMB; on each attachment to <guimenuitem
->View</guimenuitem
->, <guimenuitem
->Save</guimenuitem
-> or <guimenuitem
->Remove</guimenuitem
-> the attachment.</para>
-
-<para
->Use the <guimenuitem
->Properties</guimenuitem
-> item to open the <guilabel
->Message Part Properties</guilabel
-> dialogue. The first field contains the attachment's &MIME; type. Just like the <guilabel
->Name</guilabel
-> field, it should be automatically filled with an appropriate value. Sometimes the &MIME; type value may be wrong. You can then type in any &MIME; type or choose from the list of common &MIME; types. You can also select an encoding method for your file from the list of encoding options (normally, the default value works fine). Check the <guilabel
->Suggest automatic display</guilabel
-> option if you want to suggest to the recipient the automatic (inline) display of this attachment. Whether this works or not depends on the recipient's email client and on his settings.</para>
-
-<para
->You can also attach public keys to the message by using the appropriate options in the <menuchoice
-><guimenu
->Attach</guimenu
-></menuchoice
-> menu. <application
->PGP</application
-> key attachments are handled like file attachments.</para>
+<para>Once a file is attached to your message, it appears in the attachments pane at the bottom of the composer window. You can use the &RMB; on each attachment to <guimenuitem>View</guimenuitem>, <guimenuitem>Save</guimenuitem> or <guimenuitem>Remove</guimenuitem> the attachment.</para>
+
+<para>Use the <guimenuitem>Properties</guimenuitem> item to open the <guilabel>Message Part Properties</guilabel> dialogue. The first field contains the attachment's &MIME; type. Just like the <guilabel>Name</guilabel> field, it should be automatically filled with an appropriate value. Sometimes the &MIME; type value may be wrong. You can then type in any &MIME; type or choose from the list of common &MIME; types. You can also select an encoding method for your file from the list of encoding options (normally, the default value works fine). Check the <guilabel>Suggest automatic display</guilabel> option if you want to suggest to the recipient the automatic (inline) display of this attachment. Whether this works or not depends on the recipient's email client and on his settings.</para>
+
+<para>You can also attach public keys to the message by using the appropriate options in the <menuchoice><guimenu>Attach</guimenu></menuchoice> menu. <application>PGP</application> key attachments are handled like file attachments.</para>
 
 </sect2>
 
 <sect2 id="checking-the-spelling-of-your-message">
-<title
->Checking the Spelling of your Message</title>
-
-<para
->&kmail; will automatically check the spelling of your message (in HTML mode this currently does not work) and display unknown words using red colour. If there are too many unknown words &kmail; will disable its checking. To select the language used for checking, select <menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Dictionary</guimenuitem
-></menuchoice
->. You can disable automatic spellchecking in the <menuchoice
-><guimenu
->Options</guimenu
-></menuchoice
-> menu.</para>
-
-<para
->To check the spelling of your message using a dialogue, select <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling...</guimenuitem
-></menuchoice
->. &kmail; uses <ulink url="/tdespell/"
->&tdespell;</ulink
-> to check spelling, which is the &kde; frontend to the <application
->ispell</application
-> or <application
->aspell</application
-> spelling checker. Note that you may first need to configure the spellchecker using <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Spellchecker...</guimenuitem
-></menuchoice
->.</para>
+<title>Checking the Spelling of your Message</title>
+
+<para>&kmail; will automatically check the spelling of your message (in HTML mode this currently does not work) and display unknown words using red colour. If there are too many unknown words &kmail; will disable its checking. To select the language used for checking, select <menuchoice><guimenu>View</guimenu> <guimenuitem>Dictionary</guimenuitem></menuchoice>. You can disable automatic spellchecking in the <menuchoice><guimenu>Options</guimenu></menuchoice> menu.</para>
+
+<para>To check the spelling of your message using a dialogue, select <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Spelling...</guimenuitem></menuchoice>. &kmail; uses <ulink url="/tdespell/">&tdespell;</ulink> to check spelling, which is the &kde; frontend to the <application>ispell</application> or <application>aspell</application> spelling checker. Note that you may first need to configure the spellchecker using <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Spellchecker...</guimenuitem></menuchoice>.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="folders">
-<title
->Message Folders</title>
-
-<para
->Message Folders are used to organise your email messages. By default, all message folders are stored in the folder <filename class="directory"
->Mail</filename
->, which is created in your home folder. When you first start &kmail; the <guilabel
->inbox</guilabel
->, <guilabel
->outbox</guilabel
->, <guilabel
->sent-mail</guilabel
->, <guilabel
->wastebin</guilabel
-> and <guilabel
->drafts</guilabel
-> folders are created. These folders each have special functions:</para>
+<title>Message Folders</title>
+
+<para>Message Folders are used to organise your email messages. By default, all message folders are stored in the folder <filename class="directory">Mail</filename>, which is created in your home folder. When you first start &kmail; the <guilabel>inbox</guilabel>, <guilabel>outbox</guilabel>, <guilabel>sent-mail</guilabel>, <guilabel>wastebin</guilabel> and <guilabel>drafts</guilabel> folders are created. These folders each have special functions:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->inbox:</guilabel
-></term>
+<term><guilabel>inbox:</guilabel></term>
 <listitem>
-<para
->Where &kmail; by default puts your new messages when you ask it to check your mail. </para>
+<para>Where &kmail; by default puts your new messages when you ask it to check your mail. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->outbox:</guilabel
-></term>
+<term><guilabel>outbox:</guilabel></term>
 <listitem>
-<para
->Where messages are put while they are waiting to be delivered. Note that you should not drag and drop messages here to send them, use the <guiicon
->Send</guiicon
-> icon in the composer window instead. </para>
+<para>Where messages are put while they are waiting to be delivered. Note that you should not drag and drop messages here to send them, use the <guiicon>Send</guiicon> icon in the composer window instead. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->sent-mail:</guilabel
-></term>
+<term><guilabel>sent-mail:</guilabel></term>
 <listitem>
-<para
->By default copies of all messages that you have sent are put into this folder.</para>
+<para>By default copies of all messages that you have sent are put into this folder.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->wastebin:</guilabel
-></term>
+<term><guilabel>wastebin:</guilabel></term>
 <listitem>
-<para
->By default all messages that you have moved to the wastebin are moved into this folder.</para>
+<para>By default all messages that you have moved to the wastebin are moved into this folder.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->drafts:</guilabel
-></term>
+<term><guilabel>drafts:</guilabel></term>
 <listitem>
-<para
->Contains messages you started to edit but then saved to this folder instead of sending them.</para>
+<para>Contains messages you started to edit but then saved to this folder instead of sending them.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You may find that the standard folders are fine for your needs; eventually, though, you will probably need folders to help you organise your messages. To create a new folder, select <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->New Folder...</guimenuitem
-></menuchoice
->: the <link linkend="folders-properties-window"
->folder properties</link
-> dialogue will then prompt you for the necessary information. If you ever need to change the settings for a folder, select the folder you wish to modify in the Folders pane and select <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Properties</guimenuitem
-> </menuchoice
->.</para>
-
-<para
->To move messages from one folder into another, select the message(s) you want to move and press the <keycap
->M</keycap
-> key or select <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Move To</guimenuitem
-></menuchoice
->. A list of folders will appear; select the folder from the list that you want to move the messages to. Messages can also be moved by dragging them from the Message list to a folder in the Folder list.</para>
-
-<para
->If you want to clear all of the messages out of a folder choose <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Move All Messages to the Wastebin</guimenuitem
-></menuchoice
->. You can use <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Delete Folder</guimenuitem
-></menuchoice
-> to remove a folder and all its messages and subfolders.</para>
+<para>You may find that the standard folders are fine for your needs; eventually, though, you will probably need folders to help you organise your messages. To create a new folder, select <menuchoice><guimenu>Folder</guimenu><guimenuitem>New Folder...</guimenuitem></menuchoice>: the <link linkend="folders-properties-window">folder properties</link> dialogue will then prompt you for the necessary information. If you ever need to change the settings for a folder, select the folder you wish to modify in the Folders pane and select <menuchoice><guimenu>Folder</guimenu><guimenuitem>Properties</guimenuitem> </menuchoice>.</para>
+
+<para>To move messages from one folder into another, select the message(s) you want to move and press the <keycap>M</keycap> key or select <menuchoice><guimenu>Message</guimenu><guimenuitem>Move To</guimenuitem></menuchoice>. A list of folders will appear; select the folder from the list that you want to move the messages to. Messages can also be moved by dragging them from the Message list to a folder in the Folder list.</para>
+
+<para>If you want to clear all of the messages out of a folder choose <menuchoice><guimenu>Folder</guimenu><guimenuitem>Move All Messages to the Wastebin</guimenuitem></menuchoice>. You can use <menuchoice><guimenu>Folder</guimenu><guimenuitem>Delete Folder</guimenuitem></menuchoice> to remove a folder and all its messages and subfolders.</para>
 
 <sect2 id="folders-properties-window">
-<title
->Folder Properties</title>
+<title>Folder Properties</title>
 
-<para
->The folder's <guilabel
->Properties</guilabel
-> dialogue lets you rename and move a folder and specify all of its properties. Note that most properties are only available for your own folders and not for default folder like <guilabel
->inbox</guilabel
-> &etc;. Default folders also cannot be moved or renamed.</para>
+<para>The folder's <guilabel>Properties</guilabel> dialogue lets you rename and move a folder and specify all of its properties. Note that most properties are only available for your own folders and not for default folder like <guilabel>inbox</guilabel> &etc;. Default folders also cannot be moved or renamed.</para>
 
 <sect3 id="folders-properties-general">
-<title
->General</title>
-
-<para
->Rename a folder by changing the entry in the <guilabel
->Name:</guilabel
-> field.</para>
-
-<para
->You can make a folder a subfolder of another folder by choosing a new parent folder using the <guilabel
->Belongs to</guilabel
-> selection. </para>
-
-<para
->The <guilabel
->Folder Icons</guilabel
-> section lets you choose icons that are different from the default ones in the folder list.</para>
-
-<para
->See the <link linkend="folders-format"
->Folder Format</link
-> section for information about the <guilabel
->Mailbox format.</guilabel
-></para>
-
-<para
->With the <guilabel
->Identity</guilabel
-> section you can set the default identity that should be used for new messages if this folder is selected. Replies to messages that were sent directly to you will still default to the message's <quote
->To</quote
-> address if an according identity is found.</para>
-
-<para
->With <guilabel
->Show Sender/Receiver</guilabel
-> you can set the visible columns in the header pane. This is useful if you use a folder to save your own sent messages.</para>
-
-<para
->Check <guilabel
->Ignore new mail in this folder</guilabel
-> if you do not want to be informed about new mail that arrives in this folder. This is for example useful for the folder where you move all detected spam messages to.</para>
-
-<para
->Check <guilabel
->Keep replies in this folder</guilabel
-> if you want replies to messages in this folder to be filed also into this folder rather than into a special sent-mail folder.</para>
+<title>General</title>
+
+<para>Rename a folder by changing the entry in the <guilabel>Name:</guilabel> field.</para>
+
+<para>You can make a folder a subfolder of another folder by choosing a new parent folder using the <guilabel>Belongs to</guilabel> selection. </para>
+
+<para>The <guilabel>Folder Icons</guilabel> section lets you choose icons that are different from the default ones in the folder list.</para>
+
+<para>See the <link linkend="folders-format">Folder Format</link> section for information about the <guilabel>Mailbox format.</guilabel></para>
+
+<para>With the <guilabel>Identity</guilabel> section you can set the default identity that should be used for new messages if this folder is selected. Replies to messages that were sent directly to you will still default to the message's <quote>To</quote> address if an according identity is found.</para>
+
+<para>With <guilabel>Show Sender/Receiver</guilabel> you can set the visible columns in the header pane. This is useful if you use a folder to save your own sent messages.</para>
+
+<para>Check <guilabel>Ignore new mail in this folder</guilabel> if you do not want to be informed about new mail that arrives in this folder. This is for example useful for the folder where you move all detected spam messages to.</para>
+
+<para>Check <guilabel>Keep replies in this folder</guilabel> if you want replies to messages in this folder to be filed also into this folder rather than into a special sent-mail folder.</para>
 
 </sect3>
 
 <sect3 id="folders-properties-expiry">
-<title
->Old Message Expiry</title>
-
-<para
->Here you can select what should happen with old messages in this folder. If you enable <guilabel
->Expire old messages in this folder</guilabel
-> then KMail will regularly, depending on your choice, either delete old messages or move old messages to another folder. You can also start expiration of old messages manually via <menuchoice
-><guimenu
->Folder</guimenu
-><guisubmenu
->Expire</guisubmenu
-></menuchoice
-> and via <menuchoice
-><guimenu
->File</guimenu
-><guisubmenu
->Expire All Folders</guisubmenu
-></menuchoice
-></para>
-
-<warning
-><para
->Messages that are deleted during expiration of old messages cannot be restored, so be careful with this setting.</para
-></warning>
+<title>Old Message Expiry</title>
+
+<para>Here you can select what should happen with old messages in this folder. If you enable <guilabel>Expire old messages in this folder</guilabel> then KMail will regularly, depending on your choice, either delete old messages or move old messages to another folder. You can also start expiration of old messages manually via <menuchoice><guimenu>Folder</guimenu><guisubmenu>Expire</guisubmenu></menuchoice> and via <menuchoice><guimenu>File</guimenu><guisubmenu>Expire All Folders</guisubmenu></menuchoice></para>
+
+<warning><para>Messages that are deleted during expiration of old messages cannot be restored, so be careful with this setting.</para></warning>
 
 </sect3>
 
 <sect3 id="folders-properties-mailinglist">
-<title
->Mailing List</title>
-
-<para
->If you are going to use the folder for a mailing list then you should check <guilabel
->Folder holds a mailing list</guilabel
-> to associate this folder with the mailing list. Next you should click on <guilabel
->Detect Automatically</guilabel
->. KMail will then try to guess some information about the mailing list from the currently selected message. If KMail could not determine some addresses then you can add the missing information manually. To do this first select the <guilabel
->Address type</guilabel
-> for which you want to add an address. You can choose between:</para>
+<title>Mailing List</title>
+
+<para>If you are going to use the folder for a mailing list then you should check <guilabel>Folder holds a mailing list</guilabel> to associate this folder with the mailing list. Next you should click on <guilabel>Detect Automatically</guilabel>. KMail will then try to guess some information about the mailing list from the currently selected message. If KMail could not determine some addresses then you can add the missing information manually. To do this first select the <guilabel>Address type</guilabel> for which you want to add an address. You can choose between:</para>
 
 	<variablelist>
 	  <varlistentry id="folders-properties-mailinglist-post">
 	    <term>
-	      <guilabel
->Post to List</guilabel>
+	      <guilabel>Post to List</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This address is used for sending messages to the mailing list. This is usually an email address. </para>
+	      <para>This address is used for sending messages to the mailing list. This is usually an email address. </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry id="folders-properties-mailinglist-subscribe">
 	    <term>
-	      <guilabel
->Subscribe to List</guilabel>
+	      <guilabel>Subscribe to List</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This address is used for subscribing to the mailing list. This can be an email address or the address of a webpage. </para>
+	      <para>This address is used for subscribing to the mailing list. This can be an email address or the address of a webpage. </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry id="folders-properties-mailinglist-unsubscribe">
 	    <term>
-	      <guilabel
->Unsubscribe from List</guilabel>
+	      <guilabel>Unsubscribe from List</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This address is used for unsubscribing from the mailing list. This can be an email address or the address of a webpage. </para>
+	      <para>This address is used for unsubscribing from the mailing list. This can be an email address or the address of a webpage. </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry id="folders-properties-mailinglist-archive">
 	    <term>
-	      <guilabel
->List Archives</guilabel>
+	      <guilabel>List Archives</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This is the address of the archive of the mailing list. This is usually the address of a webpage. </para>
+	      <para>This is the address of the archive of the mailing list. This is usually the address of a webpage. </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry id="folders-properties-mailinglist-help">
 	    <term>
-	      <guilabel
->List Help</guilabel>
+	      <guilabel>List Help</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->This address is used for requesting help for this mailing list. This is usually an email address. </para>
+	      <para>This address is used for requesting help for this mailing list. This is usually an email address. </para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>
 
-<para
->After selecting the appropriate <guilabel
->Address type</guilabel
-> you enter the email address or the address of the webpage and then click on <guilabel
->Add</guilabel
->. With <guilabel
->Remove</guilabel
-> you can remove addresses.</para>
-
-<para
->If all addresses have been added then you can execute an action, &eg; go to the list archives, by selecting the appropriate <guilabel
->Address type</guilabel
-> and then clicking on <guilabel
->Invoke Handler</guilabel
->. If there is an email address and an address of a webpage for the desired action then you will have to select the <guilabel
->Preferred handler</guilabel
-> prior to clicking on <guilabel
->Invoke Handler</guilabel
->. Select <guilabel
->KMail</guilabel
-> if you want to send a message to the email address and select <guilabel
->Browser</guilabel
-> if you want to go to the webpage.</para>
-
-<para
->Alternatively to invoking the handler for <guilabel
->Post to List</guilabel
-> you can send a new message to the mailing list via <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->New Message to Mailing-List...</guimenuitem
-></menuchoice
-> or by clicking with the <mousebutton
->middle</mousebutton
-> mousebutton on the folder in the folder list.</para>
+<para>After selecting the appropriate <guilabel>Address type</guilabel> you enter the email address or the address of the webpage and then click on <guilabel>Add</guilabel>. With <guilabel>Remove</guilabel> you can remove addresses.</para>
+
+<para>If all addresses have been added then you can execute an action, &eg; go to the list archives, by selecting the appropriate <guilabel>Address type</guilabel> and then clicking on <guilabel>Invoke Handler</guilabel>. If there is an email address and an address of a webpage for the desired action then you will have to select the <guilabel>Preferred handler</guilabel> prior to clicking on <guilabel>Invoke Handler</guilabel>. Select <guilabel>KMail</guilabel> if you want to send a message to the email address and select <guilabel>Browser</guilabel> if you want to go to the webpage.</para>
+
+<para>Alternatively to invoking the handler for <guilabel>Post to List</guilabel> you can send a new message to the mailing list via <menuchoice><guimenu>Message</guimenu><guimenuitem>New Message to Mailing-List...</guimenuitem></menuchoice> or by clicking with the <mousebutton>middle</mousebutton> mousebutton on the folder in the folder list.</para>
 
 </sect3>
 
       <sect3 id="folders-properties-acl">
-	<title
->Access Control tab (&imap; only)</title>
-
-	<para
->Here you can manage the access control lists (&acl;s) of &imap; folders. </para>
-
-	<para
->The currently active &acl; is shown in the list. It consists of pairs of <guilabel
->User Id</guilabel
->s and the <guilabel
->Permissions</guilabel
-> granted to users identified by that <guilabel
->User Id</guilabel
->. <footnote
-> <para
-> Note that a single <guilabel
->User Id</guilabel
-> might refer to more than one user. Depending on the &imap; server and its configuration, there may be User Ids that correspond to groups of users, anonymous users, or any user. Consult the manual of your specific &imap; server implementation for more information. </para
-> </footnote
-> &acl;s are settable per-folder. </para>
+	<title>Access Control tab (&imap; only)</title>
+
+	<para>Here you can manage the access control lists (&acl;s) of &imap; folders. </para>
+
+	<para>The currently active &acl; is shown in the list. It consists of pairs of <guilabel>User Id</guilabel>s and the <guilabel>Permissions</guilabel> granted to users identified by that <guilabel>User Id</guilabel>. <footnote> <para> Note that a single <guilabel>User Id</guilabel> might refer to more than one user. Depending on the &imap; server and its configuration, there may be User Ids that correspond to groups of users, anonymous users, or any user. Consult the manual of your specific &imap; server implementation for more information. </para> </footnote> &acl;s are settable per-folder. </para>
 
 	<note>
-	  <para
->As with everything else when using <emphasis
->disconnected &imap;</emphasis
->, you need to sync with the server for the changes to be transferred to the server. </para>
+	  <para>As with everything else when using <emphasis>disconnected &imap;</emphasis>, you need to sync with the server for the changes to be transferred to the server. </para>
 	</note>
 
-	<para
->&imap; &acl;s define a lot of fine-grained permissions that you can grant or deny other users. For the sake of clarity, &kmail; will present them as the following five categories that you can choose from (see <xref linkend="table-acl-summary"/> for the details if you already know &imap; &acl;s). </para>
+	<para>&imap; &acl;s define a lot of fine-grained permissions that you can grant or deny other users. For the sake of clarity, &kmail; will present them as the following five categories that you can choose from (see <xref linkend="table-acl-summary"/> for the details if you already know &imap; &acl;s). </para>
 
 	<variablelist>
 
 	  <varlistentry id="folders-properties-acl-none">
 	    <term>
-	      <guilabel
->None</guilabel>
+	      <guilabel>None</guilabel>
 	      </term>
 	    <listitem>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> no rights at all. This is also the default for users not explicitly (or implicitly, as a group) listed in the &acl;. These users will not see this folder in the list of &imap; folders presented to them by their mail clients. </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> no rights at all. This is also the default for users not explicitly (or implicitly, as a group) listed in the &acl;. These users will not see this folder in the list of &imap; folders presented to them by their mail clients. </para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry id="folders-properties-acl-read">
 	    <term>
-	      <guilabel
->Read</guilabel>
+	      <guilabel>Read</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> reading rights for this folder. This also includes the ability for their mail clients to mark mails as read and store this information on the server. <footnote
-> <para
->Every user has its own list of read mail, so none of your unread mails will suddenly be marked as read just because someone else has already read them. </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> reading rights for this folder. This also includes the ability for their mail clients to mark mails as read and store this information on the server. <footnote> <para>Every user has its own list of read mail, so none of your unread mails will suddenly be marked as read just because someone else has already read them. </para>
 		</footnote>
 	      </para>
-	      <para
->These users will see this folder in the list of &imap; folders presented to them by their mail clients. </para>
-	      <para
->Use this to create a shared folder that others can read, but not modify. </para>
+	      <para>These users will see this folder in the list of &imap; folders presented to them by their mail clients. </para>
+	      <para>Use this to create a shared folder that others can read, but not modify. </para>
 	      <informalexample>
-		<para
->If you were the editor of a company's news letter, you could create a folder for the purpose of distributing the news letter, grant everyone reading rights, and save the letter to this folder instead of sending it out by email to a catch-all address. </para>
+		<para>If you were the editor of a company's news letter, you could create a folder for the purpose of distributing the news letter, grant everyone reading rights, and save the letter to this folder instead of sending it out by email to a catch-all address. </para>
 	      </informalexample>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry id="folders-properties-acl-append">
 	    <term>
-	      <guilabel
->Append</guilabel>
+	      <guilabel>Append</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->(also known as <guilabel
->Post</guilabel
->) </para>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> reading (see above) and posting rights for this folder. </para>
-	      <para
->Use this to create a shared folder that others can read and post messages to, but can not otherwise modify. </para>
+	      <para>(also known as <guilabel>Post</guilabel>) </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> reading (see above) and posting rights for this folder. </para>
+	      <para>Use this to create a shared folder that others can read and post messages to, but can not otherwise modify. </para>
 	      <informalexample>
-		<para
->If you wanted to create a company-wide discussion forum, instead of using a web-based form or a separate company-private usenet server, you could create a bunch of folders (one per topic), and grant everyone reading and posting rights. Instead of posting to an &nntp; server or writing their messages into a web form, people would just write emails and store them in the folder suiting the topic of the message. </para>
+		<para>If you wanted to create a company-wide discussion forum, instead of using a web-based form or a separate company-private usenet server, you could create a bunch of folders (one per topic), and grant everyone reading and posting rights. Instead of posting to an &nntp; server or writing their messages into a web form, people would just write emails and store them in the folder suiting the topic of the message. </para>
 	      </informalexample>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry id="folders-properties-acl-write">
 	    <term>
-	      <guilabel
->Write</guilabel>
+	      <guilabel>Write</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> reading, posting (see above), and writing rights for this folder. </para>
-	      <para
->The right to write to a folder includes deleting of messages, creating subfolders, and storing other attributes than read/unread on the server (&eg; answered). </para>
-	      <para
->Use this to create a shared folder that everyone has (almost, see <xref linkend="folders-properties-acl-all"/>) the same rights for. </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> reading, posting (see above), and writing rights for this folder. </para>
+	      <para>The right to write to a folder includes deleting of messages, creating subfolders, and storing other attributes than read/unread on the server (&eg; answered). </para>
+	      <para>Use this to create a shared folder that everyone has (almost, see <xref linkend="folders-properties-acl-all"/>) the same rights for. </para>
 	      <informalexample>
-		<para
->In the <xref linkend="folders-properties-acl-append"/> example, you could assign write rights to a group of people acting as moderators, which would then be able to remove off-topic posts and create sub-topic-folders for high-traffic folders. </para>
+		<para>In the <xref linkend="folders-properties-acl-append"/> example, you could assign write rights to a group of people acting as moderators, which would then be able to remove off-topic posts and create sub-topic-folders for high-traffic folders. </para>
 	      </informalexample>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry id="folders-properties-acl-all">
 	    <term>
-	      <guilabel
->All</guilabel>
+	      <guilabel>All</guilabel>
 	    </term>
 	    <listitem>
-	      <para
->Grants the users identified by <guilabel
->User Id</guilabel
-> reading, posting, writing (see above), as well as administration rights, &ie; the right to modify the &acl; of this folder. </para>
-	      <para
->This is the default set of rights for the owner of a folder. </para>
+	      <para>Grants the users identified by <guilabel>User Id</guilabel> reading, posting, writing (see above), as well as administration rights, &ie; the right to modify the &acl; of this folder. </para>
+	      <para>This is the default set of rights for the owner of a folder. </para>
 	    </listitem>
 	  </varlistentry>
 
 	</variablelist>
 
-	<para
-><xref linkend="table-acl-summary"/> summarises the &imap; &acl; rights associated with each permission level. </para>
+	<para><xref linkend="table-acl-summary"/> summarises the &imap; &acl; rights associated with each permission level. </para>
 
 	<table id="table-acl-summary">
-	  <title
->&acl; Rights Summary </title>
+	  <title>&acl; Rights Summary </title>
 	  <tgroup cols="6">
 	    <thead>
 	      <row>
-		<entry
->&acl; right</entry>
-		<entry
-><xref linkend="folders-properties-acl-none"/></entry>
-		<entry
-><xref linkend="folders-properties-acl-read"/></entry>
-		<entry
-><xref linkend="folders-properties-acl-append"/></entry>
-		<entry
-><xref linkend="folders-properties-acl-write"/></entry>
-		<entry
-><xref linkend="folders-properties-acl-all"/></entry>
+		<entry>&acl; right</entry>
+		<entry><xref linkend="folders-properties-acl-none"/></entry>
+		<entry><xref linkend="folders-properties-acl-read"/></entry>
+		<entry><xref linkend="folders-properties-acl-append"/></entry>
+		<entry><xref linkend="folders-properties-acl-write"/></entry>
+		<entry><xref linkend="folders-properties-acl-all"/></entry>
 	      </row>
 	    </thead>
 	    <!--tfoot/-->
 	    <tbody>
 	      <row>
-		<entry
->Lookup</entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Lookup</entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Read</entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Read</entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Store Seen</entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Store Seen</entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Insert</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Insert</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Post</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Post</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Write Flags</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Write Flags</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Create</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Create</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Delete</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
-		<entry
->x</entry>
+		<entry>Delete</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
+		<entry>x</entry>
 	      </row>
 	      <row>
-		<entry
->Administer</entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
-></entry>
-		<entry
->x</entry>
+		<entry>Administer</entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry></entry>
+		<entry>x</entry>
 	      </row>
 	    </tbody>
 	  </tgroup>
@@ -1163,528 +530,223 @@
 </sect2>
 
 <sect2 id="folders-format">
-<title
->Folder Format</title>
-
-<para
->A message folder can be either in <guilabel
->mbox</guilabel
-> or in <guilabel
->maildir</guilabel
-> format. <guilabel
->mbox</guilabel
-> saves all messages of a folder to one file, whereas <guilabel
->maildir</guilabel
-> saves each message to its own file. <guilabel
->maildir</guilabel
->, which is the default format, can be considered more robust, but it can be slower on some file systems. If you are unsure, choose <guilabel
->maildir</guilabel
->.</para>
-
-<para
->Note that there is currently no feature in &kmail; that allows you to convert between both formats automatically, but you can just move all messages from an old <guilabel
->mbox</guilabel
-> folder to a new <guilabel
->maildir</guilabel
-> folder or vice-versa.</para>
+<title>Folder Format</title>
+
+<para>A message folder can be either in <guilabel>mbox</guilabel> or in <guilabel>maildir</guilabel> format. <guilabel>mbox</guilabel> saves all messages of a folder to one file, whereas <guilabel>maildir</guilabel> saves each message to its own file. <guilabel>maildir</guilabel>, which is the default format, can be considered more robust, but it can be slower on some file systems. If you are unsure, choose <guilabel>maildir</guilabel>.</para>
+
+<para>Note that there is currently no feature in &kmail; that allows you to convert between both formats automatically, but you can just move all messages from an old <guilabel>mbox</guilabel> folder to a new <guilabel>maildir</guilabel> folder or vice-versa.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="filters">
-<title
->Message Filters</title>
+<title>Message Filters</title>
 <anchor id="filters-id"/>
 
-<para
->After using &kmail; for a while, you may find that you have trouble sorting out the new messages in your inbox when they arrive. Filters allow you to automatically perform certain actions on incoming messages and to manually perform actions on selected messages in a folder.</para>
-
-<para
->Please note that the filters described in this section are applied <emphasis
->after</emphasis
-> the messages have been downloaded from your account -- if you want to filter messages on the server, see <link linkend="popfilters"
->Download Filters</link
->.</para>
-
-<para
->Filters consist of: filter criteria, whose rules are used as criteria to determine whether this filter should be applied to a given message; and a list of filter actions, which describe what is to be done with, or to, the message if the search pattern matches. Read more about filter criteria and filter actions in the following subsections.</para>
-
-<note
-><para
->Filters are considered one after the other, starting with the first filter in the list. The first one whose pattern matches the given message gets executed; you can request that the remaining filters also be applied, but the default is to stop processing at the first matching filter. </para
-></note>
-
-<para
->Usually, filters are used on incoming messages, but they can also be applied to sent messages or to an arbitrary message or group of messages. To selectively filter messages, select the messages you want to filter in the message list and either type <keycombo action="simul"
->&Ctrl;<keycap
->J</keycap
-> </keycombo
-> or select <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filters</guimenuitem
-></menuchoice
->: this will apply all filters that have been marked for manual filtering in the <link linkend="filter-dialog"
->filter dialogue</link
-> to those messages.</para>
+<para>After using &kmail; for a while, you may find that you have trouble sorting out the new messages in your inbox when they arrive. Filters allow you to automatically perform certain actions on incoming messages and to manually perform actions on selected messages in a folder.</para>
+
+<para>Please note that the filters described in this section are applied <emphasis>after</emphasis> the messages have been downloaded from your account -- if you want to filter messages on the server, see <link linkend="popfilters">Download Filters</link>.</para>
+
+<para>Filters consist of: filter criteria, whose rules are used as criteria to determine whether this filter should be applied to a given message; and a list of filter actions, which describe what is to be done with, or to, the message if the search pattern matches. Read more about filter criteria and filter actions in the following subsections.</para>
+
+<note><para>Filters are considered one after the other, starting with the first filter in the list. The first one whose pattern matches the given message gets executed; you can request that the remaining filters also be applied, but the default is to stop processing at the first matching filter. </para></note>
+
+<para>Usually, filters are used on incoming messages, but they can also be applied to sent messages or to an arbitrary message or group of messages. To selectively filter messages, select the messages you want to filter in the message list and either type <keycombo action="simul">&Ctrl;<keycap>J</keycap> </keycombo> or select <menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filters</guimenuitem></menuchoice>: this will apply all filters that have been marked for manual filtering in the <link linkend="filter-dialog">filter dialogue</link> to those messages.</para>
 
 <sect2 id="filter-quick">
-<title
->Fast Filter Creation</title>
-
-<para
->There are two methods for creating a filter; the quick method is to use <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Create Filter...</guimenuitem
-></menuchoice
->: this will call the filter dialogue and present you with a new filter which has the first rule of the search pattern and the first action (as <guilabel
->file into folder</guilabel
->) preset. In most cases, all you have to do is select the folder where the message should be moved to; but you can, of course, edit the filter as you like.</para>
-
-<para
->When creating a filter on mailing list messages this method will try really hard to find a criterion that uniquely identifies messages from that list; If it succeeds, the guessed name of the list is presented in the <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Create Filter</guisubmenu
-><guimenuitem
->Filter on Mailing-List...</guimenuitem
-></menuchoice
-> menu entry.</para>
-
-<para
->The second method is to manually construct a filter from scratch by calling the filter dialogue through <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Filters...</guimenuitem
-></menuchoice
->. The filter dialogue is described in detail in the following subsection.</para>
+<title>Fast Filter Creation</title>
+
+<para>There are two methods for creating a filter; the quick method is to use <menuchoice><guimenu>Tools</guimenu><guimenuitem>Create Filter...</guimenuitem></menuchoice>: this will call the filter dialogue and present you with a new filter which has the first rule of the search pattern and the first action (as <guilabel>file into folder</guilabel>) preset. In most cases, all you have to do is select the folder where the message should be moved to; but you can, of course, edit the filter as you like.</para>
+
+<para>When creating a filter on mailing list messages this method will try really hard to find a criterion that uniquely identifies messages from that list; If it succeeds, the guessed name of the list is presented in the <menuchoice><guimenu>Tools</guimenu><guisubmenu>Create Filter</guisubmenu><guimenuitem>Filter on Mailing-List...</guimenuitem></menuchoice> menu entry.</para>
+
+<para>The second method is to manually construct a filter from scratch by calling the filter dialogue through <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Filters...</guimenuitem></menuchoice>. The filter dialogue is described in detail in the following subsection.</para>
 </sect2>
 
 <sect2 id="filter-dialog">
-<title
->The Filter Dialogue</title>
+<title>The Filter Dialogue</title>
 <anchor id="filter-dialog-id"/>
 
-<para
->This dialogue allows you to manage and edit your list of filters.</para>
-
-<para
->You can reach it either via <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Create Filter...</guisubmenu
-></menuchoice
-> or <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Filters...</guimenuitem
-></menuchoice
->.</para>
-
-<para
->The dialogue is divided into four main sections:</para>
+<para>This dialogue allows you to manage and edit your list of filters.</para>
+
+<para>You can reach it either via <menuchoice><guimenu>Tools</guimenu><guisubmenu>Create Filter...</guisubmenu></menuchoice> or <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Filters...</guimenuitem></menuchoice>.</para>
+
+<para>The dialogue is divided into four main sections:</para>
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->Available Filters</guilabel
-></term>
-<listitem
-><para
->This group contains the list of filters and some action buttons to modify the filters, namely: to create new filters; to move them up or down the list; to delete them; or to rename them. If you select a filter from the list, its properties are shown in the right-hand half of the dialogue.</para
-></listitem>
+<term><guilabel>Available Filters</guilabel></term>
+<listitem><para>This group contains the list of filters and some action buttons to modify the filters, namely: to create new filters; to move them up or down the list; to delete them; or to rename them. If you select a filter from the list, its properties are shown in the right-hand half of the dialogue.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Filter Criteria</guilabel
-></term
-> <listitem
-><para
->In this group you can edit the pattern that messages must match for the filter to be applied to them. You can select here whether all of the defined rules must match or whether it suffices that any one of them matches. See <link linkend="filter-criteria"
->Search Patterns</link
-> below for a detailed description of each search rule type.</para>
-
-<para
->You can click on <guibutton
->More</guibutton
-> to get an additional (initially empty) rule if you want to define more-complex patterns and on <guibutton
->Fewer</guibutton
-> to remove the last rule. <guibutton
->Clear</guibutton
-> clears the pattern, &ie; it removes all but two rules from screen and resets those two.</para>
-<para
->Invalid or empty rules are not evaluated.</para>
+<term><guilabel>Filter Criteria</guilabel></term> <listitem><para>In this group you can edit the pattern that messages must match for the filter to be applied to them. You can select here whether all of the defined rules must match or whether it suffices that any one of them matches. See <link linkend="filter-criteria">Search Patterns</link> below for a detailed description of each search rule type.</para>
+
+<para>You can click on <guibutton>More</guibutton> to get an additional (initially empty) rule if you want to define more-complex patterns and on <guibutton>Fewer</guibutton> to remove the last rule. <guibutton>Clear</guibutton> clears the pattern, &ie; it removes all but two rules from screen and resets those two.</para>
+<para>Invalid or empty rules are not evaluated.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Filter Actions</guilabel
-></term
-> <listitem
-><para
->In this group you can edit the list of actions that are applied to all messages that match the defined filter criteria. See <link linkend="filter-action"
->Filter Actions</link
-> below for a detailed description of each action type.</para>
-
-<para
->You can click on <guibutton
->More</guibutton
-> to get a new, empty action (if you want to define more than one action) and on <guibutton
->Fewer</guibutton
-> to remove the last action. <guibutton
->Clear</guibutton
-> clears the list, &ie; it removes all but one action and resets that one.</para>
-<para
->Invalid or empty actions are not executed.</para>
+<term><guilabel>Filter Actions</guilabel></term> <listitem><para>In this group you can edit the list of actions that are applied to all messages that match the defined filter criteria. See <link linkend="filter-action">Filter Actions</link> below for a detailed description of each action type.</para>
+
+<para>You can click on <guibutton>More</guibutton> to get a new, empty action (if you want to define more than one action) and on <guibutton>Fewer</guibutton> to remove the last action. <guibutton>Clear</guibutton> clears the list, &ie; it removes all but one action and resets that one.</para>
+<para>Invalid or empty actions are not executed.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Advanced Options</guilabel
-></term>
+<term><guilabel>Advanced Options</guilabel></term>
 
 <listitem>
 
-<para
->In this group you can define a few advanced options for filters that allow you to refine your filtering.</para>
-
-<para
->Using the first row of check boxes, you can toggle when the filter is applied: the <guilabel
->to incoming messages</guilabel
-> option means that the filter is applied to messages when you receive them (&ie; on <guiicon
->Check Mail</guiicon
->); the <guilabel
->to sent messages</guilabel
-> options means that the filter is applied to messages when you send them and the <guilabel
->on manual filtering</guilabel
-> option controls whether to apply this filter when filtering is specifically selected (&ie; via <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filters</guimenuitem
-></menuchoice
->.)</para>
-
-<para
->The <guilabel
->If this filter matches, stop processing here</guilabel
-> check box in the second row controls whether or not the filters after the current filter will be applied, if the current filter matches.</para>
-
-<para
->If the <guilabel
->Add this filter to the Apply Filter menu</guilabel
-> check box in the third row is selected, this filter will be inserted in the <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filter</guimenuitem
-></menuchoice
-> submenu. You can then apply this filter to a message. Another way of applying filters is to use <menuchoice
-><guimenu
->Message</guimenu
-> <guimenuitem
->Apply Filters</guimenuitem
-></menuchoice
-> menu option, which applies <emphasis
->all</emphasis
-> the filters - one after another until they are all used or one of the filters that matches has the <guilabel
->If the filters matches, stop processing here</guilabel
->.</para>
+<para>In this group you can define a few advanced options for filters that allow you to refine your filtering.</para>
+
+<para>Using the first row of check boxes, you can toggle when the filter is applied: the <guilabel>to incoming messages</guilabel> option means that the filter is applied to messages when you receive them (&ie; on <guiicon>Check Mail</guiicon>); the <guilabel>to sent messages</guilabel> options means that the filter is applied to messages when you send them and the <guilabel>on manual filtering</guilabel> option controls whether to apply this filter when filtering is specifically selected (&ie; via <menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filters</guimenuitem></menuchoice>.)</para>
+
+<para>The <guilabel>If this filter matches, stop processing here</guilabel> check box in the second row controls whether or not the filters after the current filter will be applied, if the current filter matches.</para>
+
+<para>If the <guilabel>Add this filter to the Apply Filter menu</guilabel> check box in the third row is selected, this filter will be inserted in the <menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filter</guimenuitem></menuchoice> submenu. You can then apply this filter to a message. Another way of applying filters is to use <menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply Filters</guimenuitem></menuchoice> menu option, which applies <emphasis>all</emphasis> the filters - one after another until they are all used or one of the filters that matches has the <guilabel>If the filters matches, stop processing here</guilabel>.</para>
 
 </listitem>
 </varlistentry>
 </variablelist>
 
-<note
-><para
->Filters are automatically named unless you explicitly rename them using the <guibutton
->Rename...</guibutton
-> button. The dialogue assumes that it should continue auto-naming the filter as long as the filter name starts with <quote
->&lt;</quote
->. </para
-></note>
+<note><para>Filters are automatically named unless you explicitly rename them using the <guibutton>Rename...</guibutton> button. The dialogue assumes that it should continue auto-naming the filter as long as the filter name starts with <quote>&lt;</quote>. </para></note>
 
 <note>
-<para
->If you apply filter changes, via <guibutton
->OK</guibutton
-> or <guibutton
->Apply</guibutton
->, only valid filters are actually copied to the internal filter manager.</para>
-
-<para
->Similarly, empty rules and actions are removed from the pattern and action list respectively, before the filter is saved.</para>
+<para>If you apply filter changes, via <guibutton>OK</guibutton> or <guibutton>Apply</guibutton>, only valid filters are actually copied to the internal filter manager.</para>
+
+<para>Similarly, empty rules and actions are removed from the pattern and action list respectively, before the filter is saved.</para>
 </note>
 
 </sect2>
 
 <sect2 id="filter-criteria">
-<title
->Search Patterns</title>
+<title>Search Patterns</title>
 
-<para
->The most common use of filters is to filter on the sender of messages; this can be done by choosing <guilabel
->From</guilabel
->. A good bet for a mailing list would be <guilabel
->&lt;recipients&gt;</guilabel
->, but there are other criteria a filter can search for (note that all patterns are interpreted case-insensitively):</para>
+<para>The most common use of filters is to filter on the sender of messages; this can be done by choosing <guilabel>From</guilabel>. A good bet for a mailing list would be <guilabel>&lt;recipients&gt;</guilabel>, but there are other criteria a filter can search for (note that all patterns are interpreted case-insensitively):</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->&lt;message&gt;</guilabel
-></term>
+<term><guilabel>&lt;message&gt;</guilabel></term>
 <listitem>
-<para
->Searches the whole message (&ie; headers, body and attachments, if any);</para>
+<para>Searches the whole message (&ie; headers, body and attachments, if any);</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;body&gt;</guilabel
-></term>
+<term><guilabel>&lt;body&gt;</guilabel></term>
 <listitem>
-<para
->Searches the body of the message (&ie; the whole message except the headers);</para>
+<para>Searches the body of the message (&ie; the whole message except the headers);</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;any header&gt;</guilabel
-></term>
+<term><guilabel>&lt;any header&gt;</guilabel></term>
 <listitem>
-<para
->Searches the headers of the message;</para>
+<para>Searches the headers of the message;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;recipients&gt;</guilabel
-></term>
+<term><guilabel>&lt;recipients&gt;</guilabel></term>
 <listitem>
-<para
->Searches the <quote
->To</quote
-> and <quote
->CC</quote
-> header fields of the message;</para>
+<para>Searches the <quote>To</quote> and <quote>CC</quote> header fields of the message;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;size in bytes&gt;</guilabel
-></term>
+<term><guilabel>&lt;size in bytes&gt;</guilabel></term>
 <listitem>
-<para
->Sets upper or lower bounds on the message size;</para>
+<para>Sets upper or lower bounds on the message size;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;age in days&gt;</guilabel
-></term>
+<term><guilabel>&lt;age in days&gt;</guilabel></term>
 <listitem>
-<para
->Sets upper or lower bounds on the message age;</para>
+<para>Sets upper or lower bounds on the message age;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->&lt;status&gt;</guilabel
-></term>
+<term><guilabel>&lt;status&gt;</guilabel></term>
 <listitem>
-<para
->Sets restrictions on the status of the message;</para>
+<para>Sets restrictions on the status of the message;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Any other name</term>
+<term>Any other name</term>
 <listitem>
-<para
->Searches the header field that is given by that name.</para>
+<para>Searches the header field that is given by that name.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->The list of possible rules depends on what you selected in the first drop down box. The available rules are:</para>
+<para>The list of possible rules depends on what you selected in the first drop down box. The available rules are:</para>
 
 <informaltable>
 <tgroup cols="3">
 <thead>
 <row>
-<entry
->Rule</entry>
-<entry
->Available for</entry>
-<entry
->Description</entry>
+<entry>Rule</entry>
+<entry>Available for</entry>
+<entry>Description</entry>
 </row>
 </thead>
 <tbody>
 <row>
-<entry
-><guilabel
->contains</guilabel
->/<guilabel
->does not contain</guilabel
-></entry>
-<entry
->all textual search items</entry>
-<entry
->Matches if the searched item contains (or does not contain) the given text.</entry>
+<entry><guilabel>contains</guilabel>/<guilabel>does not contain</guilabel></entry>
+<entry>all textual search items</entry>
+<entry>Matches if the searched item contains (or does not contain) the given text.</entry>
 </row>
 <row>
-<entry
-><guilabel
->equals</guilabel
->/<guilabel
->does not equal</guilabel
-></entry>
-<entry
->most textual search items</entry>
-<entry
->Matches if the searched item is equal to (or not equal to) the given text.</entry>
+<entry><guilabel>equals</guilabel>/<guilabel>does not equal</guilabel></entry>
+<entry>most textual search items</entry>
+<entry>Matches if the searched item is equal to (or not equal to) the given text.</entry>
 </row>
 <row>
-<entry
-><guilabel
->matches regular expr.</guilabel
->/<guilabel
->does not match reg. expr.</guilabel
-></entry>
-<entry
->all textual search items</entry>
-<entry
->Matches if a part of the searched item matches the given regular expression (or does not match it). If the regular expression editor is installed then you can edit the regular expression by clicking on the <guilabel
->Edit...</guilabel
-> button.</entry>
+<entry><guilabel>matches regular expr.</guilabel>/<guilabel>does not match reg. expr.</guilabel></entry>
+<entry>all textual search items</entry>
+<entry>Matches if a part of the searched item matches the given regular expression (or does not match it). If the regular expression editor is installed then you can edit the regular expression by clicking on the <guilabel>Edit...</guilabel> button.</entry>
 </row>
 <row>
-<entry
-><guilabel
->has an attachment</guilabel
->/<guilabel
->has no attachment</guilabel
-></entry>
-<entry
-><guilabel
->&lt;message&gt;</guilabel
-></entry>
-<entry
->Matches if the message has an attachment (or does not have an attachment).</entry>
+<entry><guilabel>has an attachment</guilabel>/<guilabel>has no attachment</guilabel></entry>
+<entry><guilabel>&lt;message&gt;</guilabel></entry>
+<entry>Matches if the message has an attachment (or does not have an attachment).</entry>
 </row>
 <row>
-<entry
-><guilabel
->is in address book</guilabel
->/<guilabel
->is not in address book</guilabel
-></entry>
-<entry
->most textual search items</entry>
-<entry
->Matches if the searched item contains an address that is in your address book (or if the searched items contains only unknown addresses). Of course, this rule makes only sense for address fields like From or <guilabel
->&lt;recipients&gt;</guilabel
-></entry>
+<entry><guilabel>is in address book</guilabel>/<guilabel>is not in address book</guilabel></entry>
+<entry>most textual search items</entry>
+<entry>Matches if the searched item contains an address that is in your address book (or if the searched items contains only unknown addresses). Of course, this rule makes only sense for address fields like From or <guilabel>&lt;recipients&gt;</guilabel></entry>
 </row>
 <row>
-<entry
-><guilabel
->is in category</guilabel
->/<guilabel
->is not in category</guilabel
-></entry>
-<entry
->most textual search items</entry>
-<entry
->Matches if the searched item contains an address that is in the specified category in your address book (or if the searched item contains no address that is in the specified category). Again, this rule makes only sense for address fields.</entry>
+<entry><guilabel>is in category</guilabel>/<guilabel>is not in category</guilabel></entry>
+<entry>most textual search items</entry>
+<entry>Matches if the searched item contains an address that is in the specified category in your address book (or if the searched item contains no address that is in the specified category). Again, this rule makes only sense for address fields.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is equal to</guilabel
->/<guilabel
->is not equal to</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is equal to (or not equal to) the specified value.</entry>
+<entry><guilabel>is equal to</guilabel>/<guilabel>is not equal to</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is equal to (or not equal to) the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is less than</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is less than the specified value.</entry>
+<entry><guilabel>is less than</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is less than the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is greater than</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is greater than the specified value.</entry>
+<entry><guilabel>is greater than</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is greater than the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is less than or equal to</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is less than or equal to the specified value.</entry>
+<entry><guilabel>is less than or equal to</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is less than or equal to the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is greater than or equal to</guilabel
-></entry>
-<entry
->numerical search items</entry>
-<entry
->Matches if the value of the search item is greater than or equal to the specified value.</entry>
+<entry><guilabel>is greater than or equal to</guilabel></entry>
+<entry>numerical search items</entry>
+<entry>Matches if the value of the search item is greater than or equal to the specified value.</entry>
 </row>
 <row>
-<entry
-><guilabel
->is</guilabel
->/<guilabel
->is not</guilabel
-></entry>
-<entry
-><guilabel
->&lt;status&gt;</guilabel
-></entry>
-<entry
->Matches if the message has (or does not have) the specified status.</entry>
+<entry><guilabel>is</guilabel>/<guilabel>is not</guilabel></entry>
+<entry><guilabel>&lt;status&gt;</guilabel></entry>
+<entry>Matches if the message has (or does not have) the specified status.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -1693,288 +755,119 @@
 </sect2>
 
 <sect2 id="filter-action">
-<title
->Filter Action</title>
+<title>Filter Action</title>
 
-<para
->The most common use of filters is to sort incoming messages to certain folders; this can be done by choosing <guilabel
->file into folder</guilabel
->. Here is a list of all possible actions:</para>
+<para>The most common use of filters is to sort incoming messages to certain folders; this can be done by choosing <guilabel>file into folder</guilabel>. Here is a list of all possible actions:</para>
 
 <variablelist>
 <varlistentry>
-<term
-><guilabel
->file into folder</guilabel
-></term>
+<term><guilabel>file into folder</guilabel></term>
 <listitem>
-<para
->This will file the message into another folder, removing it from its current folder if necessary; you cannot, currently use &imap; folders as a target.</para>
+<para>This will file the message into another folder, removing it from its current folder if necessary; you cannot, currently use &imap; folders as a target.</para>
 <!-- fixme: still correct? -->
 </listitem>
 </varlistentry>
 <!-- TODO: does not exist yet
 <varlistentry>
-<term
-><guilabel
->copy to folder</guilabel
-></term>
+<term><guilabel>copy to folder</guilabel></term>
 <listitem>
-<para
->This will copy the message to another folder.</para>
-<note
-><para
->You currently cannot use &imap;
-folders as a target.</para
-></note>
+<para>This will copy the message to another folder.</para>
+<note><para>You currently cannot use &imap;
+folders as a target.</para></note>
 </listitem>
 </varlistentry>
 -->
 <varlistentry>
-<term
-><guilabel
->set identity to</guilabel
-></term>
+<term><guilabel>set identity to</guilabel></term>
 <listitem>
-<para
->This will set the identity that will be used if you reply to this message.</para>
+<para>This will set the identity that will be used if you reply to this message.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->mark as</guilabel
-></term>
+<term><guilabel>mark as</guilabel></term>
 <listitem>
-<para
->This allows you to mark the message as read or important (flagged), but also as forwarded, replied &etc;</para>
+<para>This allows you to mark the message as read or important (flagged), but also as forwarded, replied &etc;</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->send fake MDN</guilabel
-></term>
+<term><guilabel>send fake MDN</guilabel></term>
 <listitem>
-<para
->This will send a faked message disposition notification (&ie; a read receipt) to the sender of the message.</para>
+<para>This will send a faked message disposition notification (&ie; a read receipt) to the sender of the message.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->set transport to</guilabel
-></term>
+<term><guilabel>set transport to</guilabel></term>
 <listitem>
-<para
->This will set the method of transport (&eg; <acronym
->SMTP</acronym
->) that will be used if you reply to the message.</para>
+<para>This will set the method of transport (&eg; <acronym>SMTP</acronym>) that will be used if you reply to the message.</para>
 </listitem>
-</varlistentry
-> 
+</varlistentry> 
 <varlistentry>
-<term
-><guilabel
->set Reply-To to</guilabel
-></term>
-<listitem
-><para
->This will modify the <guilabel
->Reply-To</guilabel
-> field of this message. This can be useful for mailing lists that automatically set a Reply-To which you do not like.</para>
+<term><guilabel>set Reply-To to</guilabel></term>
+<listitem><para>This will modify the <guilabel>Reply-To</guilabel> field of this message. This can be useful for mailing lists that automatically set a Reply-To which you do not like.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->forward to</guilabel
-></term>
-<listitem
-><para
->This will forward the message inline (&ie; as if you selected <menuchoice
-><guimenu
->Message</guimenu
-><guimenuitem
->Forward</guimenuitem
-><guimenuitem
->Inline...</guimenuitem
-></menuchoice
->) to another email address.</para>
+<term><guilabel>forward to</guilabel></term>
+<listitem><para>This will forward the message inline (&ie; as if you selected <menuchoice><guimenu>Message</guimenu><guimenuitem>Forward</guimenuitem><guimenuitem>Inline...</guimenuitem></menuchoice>) to another email address.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->redirect to</guilabel
-></term>
-<listitem
-><para
->This will redirect the message as-is to another email address.</para>
+<term><guilabel>redirect to</guilabel></term>
+<listitem><para>This will redirect the message as-is to another email address.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->bounce</guilabel
-></term>
-<listitem
-><para
->Will try to return the message to the sender as undeliverable.</para>
-<warning
-><para
->This will only work if the sender's email address is valid, which is <emphasis
->not</emphasis
-> the case for most spam messages.</para
-></warning>
+<term><guilabel>bounce</guilabel></term>
+<listitem><para>Will try to return the message to the sender as undeliverable.</para>
+<warning><para>This will only work if the sender's email address is valid, which is <emphasis>not</emphasis> the case for most spam messages.</para></warning>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->confirm delivery</guilabel
-></term>
-<listitem
-><para
->Will try to return a message to the sender that indicates successful delivery of their message, if the sender requested that.</para
-> <para
->This action allows you to select who will get delivery receipts from you. Though you can globally enable the sending of delivery confirmations in the <guilabel
->Configure &kmail;...</guilabel
-> dialogue (<link linkend="configure-security"
-><guilabel
->Security</guilabel
-> page</link
->) we recommended not to send them to everyone, since this makes tracking of spam messages, for example, very easy for the sender.</para>
+<term><guilabel>confirm delivery</guilabel></term>
+<listitem><para>Will try to return a message to the sender that indicates successful delivery of their message, if the sender requested that.</para> <para>This action allows you to select who will get delivery receipts from you. Though you can globally enable the sending of delivery confirmations in the <guilabel>Configure &kmail;...</guilabel> dialogue (<link linkend="configure-security"><guilabel>Security</guilabel> page</link>) we recommended not to send them to everyone, since this makes tracking of spam messages, for example, very easy for the sender.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->execute command</guilabel
-></term>
+<term><guilabel>execute command</guilabel></term>
 <listitem>
-<para
->This will execute a program, but will not modify the message. Specify the full path to the program you want to execute; &kmail; will then block until the program returns. If you do not want &kmail; to block then append '&amp;' to the command. You can feed the program with the parts of the mail: <symbol
->&percnt;0</symbol
->, <symbol
->&percnt;1</symbol
->, &etc; stand for files representing the message parts; for common messages <symbol
->&percnt;0</symbol
-> is the text, <symbol
->&percnt;1</symbol
-> the first attachment and so on. Additionally, the whole message is fed into the program's <acronym
->stdin</acronym
->; and every occurrence of <symbol
->&percnt;{foo}</symbol
-> is replaced by the content of the foo header.</para>
+<para>This will execute a program, but will not modify the message. Specify the full path to the program you want to execute; &kmail; will then block until the program returns. If you do not want &kmail; to block then append '&amp;' to the command. You can feed the program with the parts of the mail: <symbol>&percnt;0</symbol>, <symbol>&percnt;1</symbol>, &etc; stand for files representing the message parts; for common messages <symbol>&percnt;0</symbol> is the text, <symbol>&percnt;1</symbol> the first attachment and so on. Additionally, the whole message is fed into the program's <acronym>stdin</acronym>; and every occurrence of <symbol>&percnt;{foo}</symbol> is replaced by the content of the foo header.</para>
 
 <!-- fixme: still correct? -->
-<warning
-><para
->This currently only works if the message has <emphasis
->at least one</emphasis
-> attachment. No, not even <symbol
->&percnt;0</symbol
-> will work in the general case!</para
-></warning>
-
-<tip
-><para
->You can enter arbitrarily-complex shell commands here, since &kmail; uses a sub shell to execute the command line; therefore, even this command will work (within its limits): <userinput
-><command
->uudecode</command
-> <option
->-o</option
-> <parameter
->$(mktemp kmail-uudecoded.XXXXXX)</parameter
-> &amp;&amp; <command
->echo</command
-> <parameter
->$'\a'</parameter
-></userinput
-></para
-></tip>
+<warning><para>This currently only works if the message has <emphasis>at least one</emphasis> attachment. No, not even <symbol>&percnt;0</symbol> will work in the general case!</para></warning>
+
+<tip><para>You can enter arbitrarily-complex shell commands here, since &kmail; uses a sub shell to execute the command line; therefore, even this command will work (within its limits): <userinput><command>uudecode</command> <option>-o</option> <parameter>$(mktemp kmail-uudecoded.XXXXXX)</parameter> &amp;&amp; <command>echo</command> <parameter>$'\a'</parameter></userinput></para></tip>
 <!-- fixme: is this uudecode tip useless now?? -->
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->pipe through</guilabel
-></term>
+<term><guilabel>pipe through</guilabel></term>
 <listitem>
-<para
->This will feed the message to a program: if the program returns output, the entire message (including the headers) will be replaced with this output; if the program does not return output or exits with a return code other than 0 (indicating an error occurred), the message will not change. Specify the full path to the program. The same substitutions (<symbol
->&percnt;n</symbol
->, <symbol
->&percnt;{foo}</symbol
-> as with <guilabel
->execute command</guilabel
-> are performed on the command line.</para>
-<warning
-><para
->Be cautious with this action, as it will easily mess up your messages if the filter program returns garbage or extra lines.</para
-></warning>
+<para>This will feed the message to a program: if the program returns output, the entire message (including the headers) will be replaced with this output; if the program does not return output or exits with a return code other than 0 (indicating an error occurred), the message will not change. Specify the full path to the program. The same substitutions (<symbol>&percnt;n</symbol>, <symbol>&percnt;{foo}</symbol> as with <guilabel>execute command</guilabel> are performed on the command line.</para>
+<warning><para>Be cautious with this action, as it will easily mess up your messages if the filter program returns garbage or extra lines.</para></warning>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->remove header</guilabel
-></term>
+<term><guilabel>remove header</guilabel></term>
 <listitem>
-<para
->Will remove all header fields with the given name from the message. This is useful mainly for removing bogus <quote
->Reply-To:</quote
-> headers.</para>
+<para>Will remove all header fields with the given name from the message. This is useful mainly for removing bogus <quote>Reply-To:</quote> headers.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->add header</guilabel
-></term>
+<term><guilabel>add header</guilabel></term>
 <listitem>
-<para
->If no such field is already present this will add a new header field with the given name and value to the message; if there already is a header field with that name, it is overwritten with the given value; if there are already multiple headers with the given name (&eg; <quote
->Received:</quote
-> headers), an arbitrary one of them is overwritten and the others are left unchanged -- this is a known limitation. You may want to combine this filter with the <guilabel
->remove header</guilabel
-> filter above to make sure that there are no other headers with that name in the message.</para>
+<para>If no such field is already present this will add a new header field with the given name and value to the message; if there already is a header field with that name, it is overwritten with the given value; if there are already multiple headers with the given name (&eg; <quote>Received:</quote> headers), an arbitrary one of them is overwritten and the others are left unchanged -- this is a known limitation. You may want to combine this filter with the <guilabel>remove header</guilabel> filter above to make sure that there are no other headers with that name in the message.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->rewrite header</guilabel
-></term>
+<term><guilabel>rewrite header</guilabel></term>
 <listitem>
-<para
->Will scan the given header field, modify its contents and write it back. The search string is always interpreted as a case-sensitive regular expression. The replacement string is inserted literally except for occurrences of <userinput
->\n</userinput
->, <userinput
->$n</userinput
-> and <userinput
->${nn}</userinput
->, where <userinput
->n</userinput
-> is a positive (single-digit, except for the third form) number or <userinput
->0</userinput
->. These constructs are interpreted as back references to substrings captured with brackets in the search string.</para
-><para
->Analogous restrictions as in the <guilabel
->add header</guilabel
-> action apply here, too.</para>
+<para>Will scan the given header field, modify its contents and write it back. The search string is always interpreted as a case-sensitive regular expression. The replacement string is inserted literally except for occurrences of <userinput>\n</userinput>, <userinput>$n</userinput> and <userinput>${nn}</userinput>, where <userinput>n</userinput> is a positive (single-digit, except for the third form) number or <userinput>0</userinput>. These constructs are interpreted as back references to substrings captured with brackets in the search string.</para><para>Analogous restrictions as in the <guilabel>add header</guilabel> action apply here, too.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->play sound</guilabel
-></term>
+<term><guilabel>play sound</guilabel></term>
 <listitem>
-<para
->Will play the specified sound.</para>
+<para>Will play the specified sound.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1982,917 +875,390 @@ folders as a target.</para
 </sect2>
 
 <sect2 id="filter-examples">
-<title
->Filter Examples</title>
+<title>Filter Examples</title>
 
-<para
->If I am subscribed to the (general) &kde; List, I could create a folder for the list (I will call it <replaceable
->KDE-General</replaceable
->) and use a filter to automatically transfer new messages from my inbox to my <replaceable
->KDE-General</replaceable
-> folder if they are from the &kde; List. Here is how to create this filter:</para>
+<para>If I am subscribed to the (general) &kde; List, I could create a folder for the list (I will call it <replaceable>KDE-General</replaceable>) and use a filter to automatically transfer new messages from my inbox to my <replaceable>KDE-General</replaceable> folder if they are from the &kde; List. Here is how to create this filter:</para>
 
 <procedure>
-<title
->Filtering a mailing list</title>
+<title>Filtering a mailing list</title>
 <step>
-<para
->Try if <menuchoice
-><guimenu
->Tools</guimenu
-><guisubmenu
->Create filter</guisubmenu
-><guimenuitem
->Filter on Mailing-List...</guimenuitem
-></menuchoice
-> can identify the mailing list (the name of the list should then appear in the menu item); in this case, this works and I am presented a filter that has <quote
->List-Id<guilabel
->contains</guilabel
-> &lt;kde.mail.kde.org&gt;</quote
-> preset. You select the desired destination folder from the folder pull-down menu in the <guilabel
->Filter Action</guilabel
-> group and that is it.</para>
-
-<para
->If that does not work, think of a unique way of identifying the messages you want to filter. The (almost) unique property of my &kde; List messages is that they always contain <quote
->kde@mail.kde.org</quote
-> in the <guilabel
->To:</guilabel
-> or <guilabel
->CC:</guilabel
-> field. It is only almost unique, because this fails for cross-posted messages.</para>
+<para>Try if <menuchoice><guimenu>Tools</guimenu><guisubmenu>Create filter</guisubmenu><guimenuitem>Filter on Mailing-List...</guimenuitem></menuchoice> can identify the mailing list (the name of the list should then appear in the menu item); in this case, this works and I am presented a filter that has <quote>List-Id<guilabel>contains</guilabel> &lt;kde.mail.kde.org&gt;</quote> preset. You select the desired destination folder from the folder pull-down menu in the <guilabel>Filter Action</guilabel> group and that is it.</para>
+
+<para>If that does not work, think of a unique way of identifying the messages you want to filter. The (almost) unique property of my &kde; List messages is that they always contain <quote>kde@mail.kde.org</quote> in the <guilabel>To:</guilabel> or <guilabel>CC:</guilabel> field. It is only almost unique, because this fails for cross-posted messages.</para>
 </step>
 <step>
-<para
->Select <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Filters...</guimenuitem
-></menuchoice
->.</para>
+<para>Select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Filters...</guimenuitem></menuchoice>.</para>
 </step>
 <step>
-<para
->Press the <guibutton
->New</guibutton
-> button to create an empty filter. It will appear as <guilabel
->&lt;unknown&gt;</guilabel
->.</para>
+<para>Press the <guibutton>New</guibutton> button to create an empty filter. It will appear as <guilabel>&lt;unknown&gt;</guilabel>.</para>
 </step>
 <step>
-<para
->In the <guilabel
-> Filter Criteria</guilabel
-> area, select <guilabel
->&lt;recipients&gt;</guilabel
-> from the first drop-down box, <guilabel
->contains</guilabel
-> from the second drop-down box, and type <userinput
->kde@mail.kde.org</userinput
-> in the text field.</para>
+<para>In the <guilabel> Filter Criteria</guilabel> area, select <guilabel>&lt;recipients&gt;</guilabel> from the first drop-down box, <guilabel>contains</guilabel> from the second drop-down box, and type <userinput>kde@mail.kde.org</userinput> in the text field.</para>
 </step>
 <step>
-<para
->Skip down to the <guilabel
->Filter Actions</guilabel
-> section. Select <guilabel
->file into folder</guilabel
-> from the first drop-down box. A new drop-down box containing a list of folders will appear. Select the folder that you want the filtered messages to be transferred to. For this example, you would select <guilabel
->KDE-General</guilabel
-> from the drop-down box.</para>
+<para>Skip down to the <guilabel>Filter Actions</guilabel> section. Select <guilabel>file into folder</guilabel> from the first drop-down box. A new drop-down box containing a list of folders will appear. Select the folder that you want the filtered messages to be transferred to. For this example, you would select <guilabel>KDE-General</guilabel> from the drop-down box.</para>
 </step>
 </procedure>
 
-<para
->You may find that you need to use more powerful criteria to properly filter your messages; for example, you may only want to filter the &kde; List messages that are written by your friend <replaceable
->Fred Johnson &lt;fj@anywhere.com&gt;</replaceable
->. This is where the rest of the matching criteria section comes into play:</para>
+<para>You may find that you need to use more powerful criteria to properly filter your messages; for example, you may only want to filter the &kde; List messages that are written by your friend <replaceable>Fred Johnson &lt;fj@anywhere.com&gt;</replaceable>. This is where the rest of the matching criteria section comes into play:</para>
 
 <procedure>
-<title
->Extending the filter</title>
+<title>Extending the filter</title>
 <step>
-<para
->Open up the <guilabel
->Configure Filters...</guilabel
-> window and select the filter you just created.</para>
+<para>Open up the <guilabel>Configure Filters...</guilabel> window and select the filter you just created.</para>
 </step>
 <step>
-<para
->Since you want to filter all messages that have <replaceable
->kde@mail.kde.org</replaceable
-> in the <guilabel
->To:</guilabel
-> or <guilabel
->CC:</guilabel
-> field <emphasis
->and</emphasis
-> that are from Fred, check the <guibutton
->Match all of the following</guibutton
-> radio button.</para>
+<para>Since you want to filter all messages that have <replaceable>kde@mail.kde.org</replaceable> in the <guilabel>To:</guilabel> or <guilabel>CC:</guilabel> field <emphasis>and</emphasis> that are from Fred, check the <guibutton>Match all of the following</guibutton> radio button.</para>
 </step>
 <step>
-<para
->Now, go to the second search rule and select the following from the pull-down menus: <guilabel
->From</guilabel
->, <guilabel
->contains</guilabel
->. Now, type <userinput
->fj@anywhere.com</userinput
-> in the text field.</para>
+<para>Now, go to the second search rule and select the following from the pull-down menus: <guilabel>From</guilabel>, <guilabel>contains</guilabel>. Now, type <userinput>fj@anywhere.com</userinput> in the text field.</para>
 </step>
 </procedure>
 
-<para
->You now have a filter that transfers all &kde; List messages that are from <userinput
->fj@anywhere.com</userinput
->.</para>
+<para>You now have a filter that transfers all &kde; List messages that are from <userinput>fj@anywhere.com</userinput>.</para>
 <!-- fixme: trigger with ctrl-j or whenever new mail arrives (unless
-<guilabel
->Advanced Options</guilabel
-> are changed. -->
+<guilabel>Advanced Options</guilabel> are changed. -->
 </sect2>
 
 <sect2 id="filter-optimization">
-<title
->Filter Optimisation</title>
+<title>Filter Optimisation</title>
 
-<para
->It is important to know that, for example, the order of the filters has an impact on the speed of the filter process. Here are some ideas which can help you to improve the filtering: </para>
+<para>It is important to know that, for example, the order of the filters has an impact on the speed of the filter process. Here are some ideas which can help you to improve the filtering: </para>
 
 <variablelist>
 <varlistentry>
-<term
->Stop filter processing as early as possible:</term>
+<term>Stop filter processing as early as possible:</term>
 <listitem>
-<para
->If you know that a filter finally processes a certain class of messages, please make sure to check the option <guilabel
->If this filter matches, stop processing here</guilabel
-> for the filter. This will avoid the evaluation of the filter rules of all subsequent filters. (See the advanced options in the <link linkend="filter-dialog-id"
-> Filter Dialogue</link
->).</para>
-<para
->An example is filtering messages from mailing lists via List-Id header into separate folders. Having found out that a message came from list A means that you can avoid checking the next filter for messages from list B. </para>
+<para>If you know that a filter finally processes a certain class of messages, please make sure to check the option <guilabel>If this filter matches, stop processing here</guilabel> for the filter. This will avoid the evaluation of the filter rules of all subsequent filters. (See the advanced options in the <link linkend="filter-dialog-id"> Filter Dialogue</link>).</para>
+<para>An example is filtering messages from mailing lists via List-Id header into separate folders. Having found out that a message came from list A means that you can avoid checking the next filter for messages from list B. </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Consider the costs of the evaluation of filter rules:</term>
+<term>Consider the costs of the evaluation of filter rules:</term>
 <listitem>
-<para
->The time required to evaluate a filter rule depends on the way the rule is constructed. In particular, scanning for a substring using the <guilabel
->contains</guilabel
-> operation is faster than a pattern matching using the <guilabel
->matches regular expr.</guilabel
-> operation. </para>
-<para
->Another dependency is on the amount of data which is used for the evaluation of a filter rule. If the rule is based on a message header, its evaluation should normally be much faster than the evaluation of a rule based on the complete message. </para>
-<para
->You should try to keep the filter rules as simple as possible. </para>
+<para>The time required to evaluate a filter rule depends on the way the rule is constructed. In particular, scanning for a substring using the <guilabel>contains</guilabel> operation is faster than a pattern matching using the <guilabel>matches regular expr.</guilabel> operation. </para>
+<para>Another dependency is on the amount of data which is used for the evaluation of a filter rule. If the rule is based on a message header, its evaluation should normally be much faster than the evaluation of a rule based on the complete message. </para>
+<para>You should try to keep the filter rules as simple as possible. </para>
 </listitem>
 </varlistentry>
 
 
 <varlistentry>
-<term
->Check the order of your filters:</term>
+<term>Check the order of your filters:</term>
 <listitem>
-<para
->All the different filter actions have a different complexity. The most expensive filter actions are <guilabel
->pipe through</guilabel
-> and <guilabel
->execute command</guilabel
->, because both need external programs to be run. Placing filters containing these filter actions behind other filters that can reduce the number of times these complex actions are required is useful, if the filter logic does allow this.</para
-> 
-<para
->An example is filtering messages from a mailing list and detecting spam messages. For the spam detection you will usually use an external tool via a <guilabel
->pipe through</guilabel
-> action. Filtering the messages for the mailing list is done via the List-Id header. If you do not want to check the messages from the mailing list for spam too, it is better to use the filter for the mailing list messages before the filter for the spam detection. This way you avoid the expensive and slow spam check for all messages which were identified as mailing list messages. </para>
+<para>All the different filter actions have a different complexity. The most expensive filter actions are <guilabel>pipe through</guilabel> and <guilabel>execute command</guilabel>, because both need external programs to be run. Placing filters containing these filter actions behind other filters that can reduce the number of times these complex actions are required is useful, if the filter logic does allow this.</para> 
+<para>An example is filtering messages from a mailing list and detecting spam messages. For the spam detection you will usually use an external tool via a <guilabel>pipe through</guilabel> action. Filtering the messages for the mailing list is done via the List-Id header. If you do not want to check the messages from the mailing list for spam too, it is better to use the filter for the mailing list messages before the filter for the spam detection. This way you avoid the expensive and slow spam check for all messages which were identified as mailing list messages. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </sect2>
 
 <sect2 id="filter-logging">
-<title
->Filter Log</title>
-<para
->If you want to verify that your filters work as intended, you can open a viewer for the filter log via <menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Filter Log Viewer...</guimenuitem
-></menuchoice
->. </para>
-<para
->In the viewer, there you can configure the logging of the filter processing. You can control the detail level of the log, clear the log or save the log into a file. The log can provide valuable information if you need to debug your filtering process. </para>
+<title>Filter Log</title>
+<para>If you want to verify that your filters work as intended, you can open a viewer for the filter log via <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Filter Log Viewer...</guimenuitem></menuchoice>. </para>
+<para>In the viewer, there you can configure the logging of the filter processing. You can control the detail level of the log, clear the log or save the log into a file. The log can provide valuable information if you need to debug your filtering process. </para>
 </sect2>
 </sect1>
 
 <!-- dnaber update 2004-02-22 -->
 <sect1 id="popfilters">
-<title
->Download Filters</title>
-
-<para
->Download Filters can be used to filter mail from a POP server, <emphasis
->before</emphasis
-> they are completely downloaded; you can use them to prevent &kmail; from downloading huge messages and save time this way.</para>
-
-<para
->In the configuration dialogue of the POP account you can enable download filtering by checking the <guilabel
->Filter messages if they are greater than</guilabel
-> box; once you have done that, you can specify a size which is used as a threshold: messages exceeding this size will be checked against the filter rules you defined -- if no filter rule matches, they will be shown in a confirmation dialogue and you can decide what to do with them. The default size for filtering is 50,000 Bytes; this is a good value as the overhead is kept to a minimum -- every message that is looked at by the filter causes additional traffic because the header of the message is downloaded twice. The default action is <guilabel
->Download mail</guilabel
-> to prevent the loss of messages.</para>
-
-<warning
-><para
->Be careful with the <guilabel
->Delete mail from server</guilabel
-> option since once a mail is deleted on the server there is no way to get it back.</para
-></warning>
-
-<para
->With a really good set of filter rules, it is possible that all messages that exceed the threshold size are automatically tagged (&ie; downloaded, kept on the server or deleted) and you would never be bugged by the confirmation dialogue. Be careful though, since once a message is matched by a filter rule, you have no guarantee that you can change the action before it is executed: the confirmation dialogue will be displayed <emphasis
->only</emphasis
-> if there is a message left that was not matched by a filter rule.</para>
+<title>Download Filters</title>
+
+<para>Download Filters can be used to filter mail from a POP server, <emphasis>before</emphasis> they are completely downloaded; you can use them to prevent &kmail; from downloading huge messages and save time this way.</para>
+
+<para>In the configuration dialogue of the POP account you can enable download filtering by checking the <guilabel>Filter messages if they are greater than</guilabel> box; once you have done that, you can specify a size which is used as a threshold: messages exceeding this size will be checked against the filter rules you defined -- if no filter rule matches, they will be shown in a confirmation dialogue and you can decide what to do with them. The default size for filtering is 50,000 Bytes; this is a good value as the overhead is kept to a minimum -- every message that is looked at by the filter causes additional traffic because the header of the message is downloaded twice. The default action is <guilabel>Download mail</guilabel> to prevent the loss of messages.</para>
+
+<warning><para>Be careful with the <guilabel>Delete mail from server</guilabel> option since once a mail is deleted on the server there is no way to get it back.</para></warning>
+
+<para>With a really good set of filter rules, it is possible that all messages that exceed the threshold size are automatically tagged (&ie; downloaded, kept on the server or deleted) and you would never be bugged by the confirmation dialogue. Be careful though, since once a message is matched by a filter rule, you have no guarantee that you can change the action before it is executed: the confirmation dialogue will be displayed <emphasis>only</emphasis> if there is a message left that was not matched by a filter rule.</para>
 
 <sect2 id="popfilters-dialog">
-<title
->The <guilabel
->Configure Pop Filter</guilabel
-> Dialogue</title>
-
-<para
->Adding filter rules works similar as for <link linkend="filters"
->message filters</link
->. On the left hand side you can manage the existing filters. Use the <guiicon
->New</guiicon
-> button to add a filter. On the right hand side you can configure under which conditions the current filter should match. Using <guilabel
->Filter Action</guilabel
-> you specify what will happen to a message that is matched by this rule. The available options are:</para>
+<title>The <guilabel>Configure Pop Filter</guilabel> Dialogue</title>
+
+<para>Adding filter rules works similar as for <link linkend="filters">message filters</link>. On the left hand side you can manage the existing filters. Use the <guiicon>New</guiicon> button to add a filter. On the right hand side you can configure under which conditions the current filter should match. Using <guilabel>Filter Action</guilabel> you specify what will happen to a message that is matched by this rule. The available options are:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Download mail</guilabel
-></term>
+<term><guilabel>Download mail</guilabel></term>
 <listitem>
-<para
->Will download the messages matched by the filter, just as any other message that does not exceed the threshold size.</para>
+<para>Will download the messages matched by the filter, just as any other message that does not exceed the threshold size.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Download mail later</guilabel
-></term>
+<term><guilabel>Download mail later</guilabel></term>
 <listitem>
-<para
->Will tag the messages for later download. This means the messages matched will stay on the POP server until you choose to download them by changing the action manually.</para
-></listitem>
+<para>Will tag the messages for later download. This means the messages matched will stay on the POP server until you choose to download them by changing the action manually.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Delete mail from server</guilabel
-></term>
+<term><guilabel>Delete mail from server</guilabel></term>
 <listitem>
-<para
->Will delete the message from the server and does not download it. Once you deleted a message from the server, there is <emphasis
->no</emphasis
-> way you can undo this. Be careful, as rules could match messages you actually want, too.</para
-></listitem>
+<para>Will delete the message from the server and does not download it. Once you deleted a message from the server, there is <emphasis>no</emphasis> way you can undo this. Be careful, as rules could match messages you actually want, too.</para></listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->The option <guilabel
->Always show matched 'Download Later' messages in confirmation dialogue</guilabel
-> will cause the confirmation dialogue to show up during mailbox check if at least one message was tagged for <guilabel
->Download Later</guilabel
-> - even if all messages exceeding the threshold size were matched by a rule. This option is useful in the case you have messages matched by a rule and tagged for <guilabel
->Download Later</guilabel
->, but you do not get any message exceeding the size limit for a very long time. Without this option, the confirmation dialogue would never show up and you would never have a chance to get the queued message by changing the action manually.</para>
+<para>The option <guilabel>Always show matched 'Download Later' messages in confirmation dialogue</guilabel> will cause the confirmation dialogue to show up during mailbox check if at least one message was tagged for <guilabel>Download Later</guilabel> - even if all messages exceeding the threshold size were matched by a rule. This option is useful in the case you have messages matched by a rule and tagged for <guilabel>Download Later</guilabel>, but you do not get any message exceeding the size limit for a very long time. Without this option, the confirmation dialogue would never show up and you would never have a chance to get the queued message by changing the action manually.</para>
 
 </sect2>
 
 <sect2 id="popfilters-confirmation">
-<title
->The Confirmation Dialogue</title>
-
-<para
->This dialogue shows up whenever you have POP filtering switched on and messages were found on the server that exceed the threshold size you defined for the POP account. Now you have the chance to decide what you want to do with that message. The options are <guilabel
->Download</guilabel
-> (green), <guilabel
->Download later</guilabel
-> (yellow with egg watch) and <guilabel
->Delete from server</guilabel
-> (red <quote
->X</quote
->). Be cautious with the delete option, since once you deleted a mail from the server, there is no way to undelete it again.</para>
-
-<para
->In the <guilabel
->Filtered Messages</guilabel
-> section you can check the box if you receive messages that were automatically tagged for a certain action (download, download later, delete) by a filter rule. The checkbox is only enabled if you receive some messages that were matched by a filter rule; once you check it, a list similar to the one for the not-automatically-tagged messages will be displayed and you can change the action for every single message.</para>
-
-<para
->Please note that if there is a message exceeding the size limit, but all messages are matched by a filter rule the dialogue will not be displayed. One exception occurs if you have checked <guilabel
->Always show matched 'Download Later' messages</guilabel
-> in the <guilabel
->Global Options</guilabel
-> section of the POP filter configuration dialogue; then, the dialogue will also be displayed if you only have matched messages, but at least one message was tagged for <guilabel
->Download later</guilabel
->.</para>
+<title>The Confirmation Dialogue</title>
+
+<para>This dialogue shows up whenever you have POP filtering switched on and messages were found on the server that exceed the threshold size you defined for the POP account. Now you have the chance to decide what you want to do with that message. The options are <guilabel>Download</guilabel> (green), <guilabel>Download later</guilabel> (yellow with egg watch) and <guilabel>Delete from server</guilabel> (red <quote>X</quote>). Be cautious with the delete option, since once you deleted a mail from the server, there is no way to undelete it again.</para>
+
+<para>In the <guilabel>Filtered Messages</guilabel> section you can check the box if you receive messages that were automatically tagged for a certain action (download, download later, delete) by a filter rule. The checkbox is only enabled if you receive some messages that were matched by a filter rule; once you check it, a list similar to the one for the not-automatically-tagged messages will be displayed and you can change the action for every single message.</para>
+
+<para>Please note that if there is a message exceeding the size limit, but all messages are matched by a filter rule the dialogue will not be displayed. One exception occurs if you have checked <guilabel>Always show matched 'Download Later' messages</guilabel> in the <guilabel>Global Options</guilabel> section of the POP filter configuration dialogue; then, the dialogue will also be displayed if you only have matched messages, but at least one message was tagged for <guilabel>Download later</guilabel>.</para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="multiple-accounts">
-<title
->Using Multiple Accounts</title>
-
-<para
->Multiple accounts are used to check for messages from more than one email address and/or mail server. Select <menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure &kmail;...</guimenuitem
-></menuchoice
-> and click on the <guilabel
->Network</guilabel
-> page to add or change your account settings. See the <link linkend="getting-started"
->Getting started</link
-> section for more information on the settings in the <guilabel
->Network</guilabel
-> page.</para>
-
-<para
->To check for messages from a particular account, use the <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Check Mail In</guimenuitem
-></menuchoice
-> submenu to select the account to check for mail. You can also press the mouse button on the <guiicon
->Check Mail</guiicon
-> icon for some time to get a list of accounts.</para>
+<title>Using Multiple Accounts</title>
+
+<para>Multiple accounts are used to check for messages from more than one email address and/or mail server. Select <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> and click on the <guilabel>Network</guilabel> page to add or change your account settings. See the <link linkend="getting-started">Getting started</link> section for more information on the settings in the <guilabel>Network</guilabel> page.</para>
+
+<para>To check for messages from a particular account, use the <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail In</guimenuitem></menuchoice> submenu to select the account to check for mail. You can also press the mouse button on the <guiicon>Check Mail</guiicon> icon for some time to get a list of accounts.</para>
 
 </sect1>
 
 <sect1 id="pgp">
 <!-- This section is from Andreas Gungl, 2000-05-21, updated 2002-10-06 by Ingo Kloecker -->
-<title
->Signing and Encrypting Messages with <application
->PGP</application
-> or <application
->GnuPG</application
-></title>
-
-<note
-><para
->There have been major changes in the way &kmail; handles signing/encryption. The following introduction applies to the previous version of &kmail;. You can still read the introduction to get an overview about how to sign/encrypt messages, but the details, especially those of the configuration, will differ.</para
-></note>
-
-<para
->This is a short introduction on how to setup &kmail;'s <application
->PGP</application
-> (<application
->Pretty Good Privacy</application
->) support; it gives some hints on the use of <application
->PGP</application
-> too. It is written for people who are beginners in this area; if you are familiar with the use of <application
->PGP</application
->, you can skip most of the steps. This documentation, and the &kmail; user interface, generally talk only about <quote
->PGP</quote
->, but it applies to both <application
->PGP</application
-> and <application
->GnuPG</application
-> (<application
->GNU Privacy Guard</application
->), (although some <application
->GnuPG</application
-> command-line parameters may be different.)</para>
-
-<para
->Please also check out the <link linkend="pgp-faq"
->&FAQ; item about <application
->PGP</application
-></link
->.</para>
-
-<warning
-><para
->Attachments will not be signed/encrypted if you are using inline OpenPGP: to sign/encrypt attachments, you have to install GnuPG and some necessary libraries; then, you can decide for each attachment whether it should be signed/encrypted or not. </para
-></warning>
-
-<warning
-><para
->&kmail; has to rely on <application
->PGP</application
->'s output; this output is often different between different versions of <application
->PGP</application
->, so it is important that you test if encryption really works with your setup before you start using it seriously. &kmail; might <emphasis
->not</emphasis
-> warn you if something fails -- enable <guilabel
->Show signed/encrypted text after composing</guilabel
->. </para
-></warning>
-
-<para
->To setup and use <application
->PGP</application
-> support in &kmail; it is necessary to have <application
->PGP</application
-> installed and set up properly; of course, we cannot give you a full introduction of <application
->PGP</application
-> here. We will only mention the steps you have to do to get <application
->PGP</application
-> going. For details you should have a look at the excellent <application
->PGP</application
-> documentation or <ulink url="http://www.gnupg.org/docs.html#guides"
->The GNU Privacy Handbook</ulink
->.</para
-> 
-
-<para
->It is certainly a good idea to study this documentation as well as an introduction into public key cryptography (&eg; out of the <application
->PGP</application
-> 6.5.x package): there you can learn a lot about the basic concepts, which will help you to understand what is going on; also, many security related issues you should know about are discussed there.</para>
-
-<para
->Now, let us start.</para>
+<title>Signing and Encrypting Messages with <application>PGP</application> or <application>GnuPG</application></title>
+
+<note><para>There have been major changes in the way &kmail; handles signing/encryption. The following introduction applies to the previous version of &kmail;. You can still read the introduction to get an overview about how to sign/encrypt messages, but the details, especially those of the configuration, will differ.</para></note>
+
+<para>This is a short introduction on how to setup &kmail;'s <application>PGP</application> (<application>Pretty Good Privacy</application>) support; it gives some hints on the use of <application>PGP</application> too. It is written for people who are beginners in this area; if you are familiar with the use of <application>PGP</application>, you can skip most of the steps. This documentation, and the &kmail; user interface, generally talk only about <quote>PGP</quote>, but it applies to both <application>PGP</application> and <application>GnuPG</application> (<application>GNU Privacy Guard</application>), (although some <application>GnuPG</application> command-line parameters may be different.)</para>
+
+<para>Please also check out the <link linkend="pgp-faq">&FAQ; item about <application>PGP</application></link>.</para>
+
+<warning><para>Attachments will not be signed/encrypted if you are using inline OpenPGP: to sign/encrypt attachments, you have to install GnuPG and some necessary libraries; then, you can decide for each attachment whether it should be signed/encrypted or not. </para></warning>
+
+<warning><para>&kmail; has to rely on <application>PGP</application>'s output; this output is often different between different versions of <application>PGP</application>, so it is important that you test if encryption really works with your setup before you start using it seriously. &kmail; might <emphasis>not</emphasis> warn you if something fails -- enable <guilabel>Show signed/encrypted text after composing</guilabel>. </para></warning>
+
+<para>To setup and use <application>PGP</application> support in &kmail; it is necessary to have <application>PGP</application> installed and set up properly; of course, we cannot give you a full introduction of <application>PGP</application> here. We will only mention the steps you have to do to get <application>PGP</application> going. For details you should have a look at the excellent <application>PGP</application> documentation or <ulink url="http://www.gnupg.org/docs.html#guides">The GNU Privacy Handbook</ulink>.</para> 
+
+<para>It is certainly a good idea to study this documentation as well as an introduction into public key cryptography (&eg; out of the <application>PGP</application> 6.5.x package): there you can learn a lot about the basic concepts, which will help you to understand what is going on; also, many security related issues you should know about are discussed there.</para>
+
+<para>Now, let us start.</para>
 
 <sect2 id="pgp-preconditions">
-<title
->Preconditions</title>
-
-<para
->&kmail; expects that your <application
->PGP</application
-> binary is called <command
->pgp</command
->; in the case of <application
->GnuPG</application
->, it expects the binary to be called <command
->gpg</command
->. If this is not the case for you, just make a symlink.</para>
-
-<para
->If you have not done so, you have to generate a key pair (secret and public key) for your identity. You must do this at the command line: use <userinput
-><command
->pgp</command
-> <option
->-kg</option
-></userinput
-> or <userinput
-><command
->gpg</command
-> <option
->--gen-key</option
-></userinput
->: &kmail; has no internal support for <application
->pgp</application
->'s key generation at this time. The identity (normally your name followed by your email address within brackets, such as <userinput
->John Smith &lt;john@example.com&gt;</userinput
->) and your passphrase are important for the co-operation between &kmail; and <application
->PGP</application
->.</para>
+<title>Preconditions</title>
+
+<para>&kmail; expects that your <application>PGP</application> binary is called <command>pgp</command>; in the case of <application>GnuPG</application>, it expects the binary to be called <command>gpg</command>. If this is not the case for you, just make a symlink.</para>
+
+<para>If you have not done so, you have to generate a key pair (secret and public key) for your identity. You must do this at the command line: use <userinput><command>pgp</command> <option>-kg</option></userinput> or <userinput><command>gpg</command> <option>--gen-key</option></userinput>: &kmail; has no internal support for <application>pgp</application>'s key generation at this time. The identity (normally your name followed by your email address within brackets, such as <userinput>John Smith &lt;john@example.com&gt;</userinput>) and your passphrase are important for the co-operation between &kmail; and <application>PGP</application>.</para>
 
 </sect2>
 
 <sect2 id="pgp-settings">
-<title
-><application
->PGP</application
->-Related Settings in &kmail;</title>
-
-<para
->Select the <guilabel
->OpenPGP</guilabel
-> tab on the <guilabel
->Security</guilabel
-> settings page; there you will find the following options:</para>
+<title><application>PGP</application>-Related Settings in &kmail;</title>
+
+<para>Select the <guilabel>OpenPGP</guilabel> tab on the <guilabel>Security</guilabel> settings page; there you will find the following options:</para>
 
 <variablelist>
 
 <varlistentry>
-<term
-><guilabel
->Encryption tool</guilabel
-></term>
+<term><guilabel>Encryption tool</guilabel></term>
 <listitem>
-<para
->Here you can choose if you want to use <application
->PGP</application
->, <application
->GnuPG</application
-> or no encryption software at all; of course, the program you select has to be installed on your system (it is also important to select the correct version).</para>
+<para>Here you can choose if you want to use <application>PGP</application>, <application>GnuPG</application> or no encryption software at all; of course, the program you select has to be installed on your system (it is also important to select the correct version).</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Keep passphrase in memory</guilabel
-></term>
+<term><guilabel>Keep passphrase in memory</guilabel></term>
 <listitem>
-<para
->When this option is off, &kmail; will ask for your passphrase each time you sign a message (before sending) or select an encrypted message; if you turn this option on, &kmail; will remember your passphrase from after your first successful input until you finish your &kmail; session. The passphrase is stored in memory and not written to the hard disk. If you use one of the Crypto-Plugins or if you use <application
->GnuPG</application
-> with the gpg-agent then an external program will ask for your passphrase and optionally remember it for some time.</para>
+<para>When this option is off, &kmail; will ask for your passphrase each time you sign a message (before sending) or select an encrypted message; if you turn this option on, &kmail; will remember your passphrase from after your first successful input until you finish your &kmail; session. The passphrase is stored in memory and not written to the hard disk. If you use one of the Crypto-Plugins or if you use <application>GnuPG</application> with the gpg-agent then an external program will ask for your passphrase and optionally remember it for some time.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Always encrypt to self</guilabel
-></term>
+<term><guilabel>Always encrypt to self</guilabel></term>
 <listitem>
-<para
->If this option is off and you want to send an encrypted message to somebody, then you cannot read this message any longer after you have composed and encrypted it. Turn this option on to keep sent encrypted messages readable for you too.</para>
+<para>If this option is off and you want to send an encrypted message to somebody, then you cannot read this message any longer after you have composed and encrypted it. Turn this option on to keep sent encrypted messages readable for you too.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show signed/encrypted text after composing</guilabel
-></term>
+<term><guilabel>Show signed/encrypted text after composing</guilabel></term>
 <listitem>
-<para
->This will show you the result of encrypting and signing before the message gets sent; this way, you can still cancel sending if encrypting failed. It is strongly recommended to use this option.</para
-> 
+<para>This will show you the result of encrypting and signing before the message gets sent; this way, you can still cancel sending if encrypting failed. It is strongly recommended to use this option.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Always show the encryption keys for approval</guilabel
-></term>
+<term><guilabel>Always show the encryption keys for approval</guilabel></term>
 <listitem>
-<para
->This will always open a dialogue that lets you choose the keys used for each recipient when you are sending an encrypted message; if this option is off, &kmail; will show this dialogue only when it cannot find a key for a recipient or when there are conflicting or unset encryption preferences.</para
-> 
+<para>This will always open a dialogue that lets you choose the keys used for each recipient when you are sending an encrypted message; if this option is off, &kmail; will show this dialogue only when it cannot find a key for a recipient or when there are conflicting or unset encryption preferences.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Automatically sign messages using OpenPGP</guilabel
-></term>
-<listitem
-><para
->This lets you toggle whether to automatically sign your messages by default; of course, it is still possible to send unsigned messages by deselecting the icon in the composer window.</para
-> 
+<term><guilabel>Automatically sign messages using OpenPGP</guilabel></term>
+<listitem><para>This lets you toggle whether to automatically sign your messages by default; of course, it is still possible to send unsigned messages by deselecting the icon in the composer window.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Automatically encrypt messages whenever possible</guilabel
-></term>
-<listitem
-><para
->If this option is on, &kmail; will automatically encrypt messages with the built-in OpenPGP support or the PGP/MIME-Plugin provided that, for every recipient, a trusted PGP key is found in your keyring and you did not tell &kmail; not to encrypt messages sent to certain recipients. If in doubt, &kmail; will ask whether the message should be encrypted or not.</para
-></listitem>
+<term><guilabel>Automatically encrypt messages whenever possible</guilabel></term>
+<listitem><para>If this option is on, &kmail; will automatically encrypt messages with the built-in OpenPGP support or the PGP/MIME-Plugin provided that, for every recipient, a trusted PGP key is found in your keyring and you did not tell &kmail; not to encrypt messages sent to certain recipients. If in doubt, &kmail; will ask whether the message should be encrypted or not.</para></listitem>
 </varlistentry>
 
 </variablelist>
 
-<para
->Now that you have setup the encryption tool you have tell &kmail; which OpenPGP key you want to use for signing and for encrypting messages; to do this go to the <link linkend="configure-identity"
->Identities configuration</link
-> and set the key that should be used on the <guilabel
->Advanced</guilabel
-> tab of the identity configuration.</para>
-
-<para
->Now you are able to sign outgoing messages; to let people send you encrypted messages and to let them verify your signature you must send them your public key or upload your public key to a public <application
->PGP</application
-> key server so that they can fetch your key from there. To send encrypted messages to other people or to verify their signed messages you will need their public keys; you can store your public key(s) on a public <application
->PGP</application
-> key server such as <ulink url="http://www.cam.ac.uk.pgp.net/pgpnet/"
->http://www.cam.ac.uk.pgp.net/pgpnet/</ulink
->.</para>
+<para>Now that you have setup the encryption tool you have tell &kmail; which OpenPGP key you want to use for signing and for encrypting messages; to do this go to the <link linkend="configure-identity">Identities configuration</link> and set the key that should be used on the <guilabel>Advanced</guilabel> tab of the identity configuration.</para>
+
+<para>Now you are able to sign outgoing messages; to let people send you encrypted messages and to let them verify your signature you must send them your public key or upload your public key to a public <application>PGP</application> key server so that they can fetch your key from there. To send encrypted messages to other people or to verify their signed messages you will need their public keys; you can store your public key(s) on a public <application>PGP</application> key server such as <ulink url="http://www.cam.ac.uk.pgp.net/pgpnet/">http://www.cam.ac.uk.pgp.net/pgpnet/</ulink>.</para>
 
 </sect2>
 
 <sect2 id="pgp-sign-your-messages">
-<title
->Sign your Messages</title>
-
-<para
->You can compose your message as usual in the composer window of &kmail;. Before you send the message, check the <guiicon
->Sign Message</guiicon
-> icon on the toolbar of the composer window; then, you can send the message. The identity you are using to write the current message needs to be connected to an <guilabel
->OpenPGP Key</guilabel
-> in the <guilabel
->Identity</guilabel
-> section of the <guilabel
->Configure</guilabel
-> dialogue. To sign the message, &kmail; needs to know your <application
->PGP</application
-> passphrase: if you did not select <guilabel
->Keep passphrase in memory</guilabel
-> in the <guilabel
->Security</guilabel
-> section, &kmail; will ask you for it; otherwise, if you have already given the phrase to &kmail;, it will sign the message without any further prompt.</para>
+<title>Sign your Messages</title>
+
+<para>You can compose your message as usual in the composer window of &kmail;. Before you send the message, check the <guiicon>Sign Message</guiicon> icon on the toolbar of the composer window; then, you can send the message. The identity you are using to write the current message needs to be connected to an <guilabel>OpenPGP Key</guilabel> in the <guilabel>Identity</guilabel> section of the <guilabel>Configure</guilabel> dialogue. To sign the message, &kmail; needs to know your <application>PGP</application> passphrase: if you did not select <guilabel>Keep passphrase in memory</guilabel> in the <guilabel>Security</guilabel> section, &kmail; will ask you for it; otherwise, if you have already given the phrase to &kmail;, it will sign the message without any further prompt.</para>
 
 </sect2>
 
 <sect2 id="pgp-encrypt-your-messages">
-<title
->Encrypt your Messages</title>
-
-<para
->To send an encrypted message to somebody of whom you have a public key, you simply create the message in the composer window. Before you send the message, check the <guibutton
->Encrypt Message</guibutton
-> button in the toolbar of the composer window; note that you might not have to check the button if <guilabel
->Automatically encrypt messages whenever possible</guilabel
-> is selected in &kmail;'s configuration (see <link linkend="pgp-sign-your-messages"
->above</link
->). Then send the message.</para>
-
-<para
->If you checked the <guilabel
->Encrypt Message</guilabel
-> button and &kmail; cannot find a matching key for a recipient, it will display a list containing all available keys in the <guilabel
->Encryption Key Selection</guilabel
-> dialogue; if &kmail; finds more than one trusted key for a recipient, it will display a list containing all matching keys for this recipient. In both cases you can select the key(s) which should be used for encrypting this message for the recipient in question. Using the <guilabel
->Remember choice</guilabel
-> checkbox you can save your selection for future messages.</para>
-
-<para
->If you are using a key for the first time, there are conflicting Encryption Preferences, or if <guilabel
->Always show the encryption keys for approval</guilabel
-> is selected in the <guilabel
->Security</guilabel
-> section of &kmail;'s configuration dialogue the <guilabel
->Encryption Key Approval</guilabel
-> dialogue will appear; here, you can select different keys for the recipients and can set the <guilabel
->Encryption Preference</guilabel
-> for each recipient. The default option, <guilabel
->Encrypt whenever encryption is possible</guilabel
->, will automatically encrypt your message if there is a trusted key for each recipient.</para>
-
-<para
->As mentioned above, you will not be able to read your own encrypted sent messages if you do not check <guilabel
->Always encrypt to self</guilabel
-> in the settings' <guilabel
->Security</guilabel
-> page.</para>
+<title>Encrypt your Messages</title>
+
+<para>To send an encrypted message to somebody of whom you have a public key, you simply create the message in the composer window. Before you send the message, check the <guibutton>Encrypt Message</guibutton> button in the toolbar of the composer window; note that you might not have to check the button if <guilabel>Automatically encrypt messages whenever possible</guilabel> is selected in &kmail;'s configuration (see <link linkend="pgp-sign-your-messages">above</link>). Then send the message.</para>
+
+<para>If you checked the <guilabel>Encrypt Message</guilabel> button and &kmail; cannot find a matching key for a recipient, it will display a list containing all available keys in the <guilabel>Encryption Key Selection</guilabel> dialogue; if &kmail; finds more than one trusted key for a recipient, it will display a list containing all matching keys for this recipient. In both cases you can select the key(s) which should be used for encrypting this message for the recipient in question. Using the <guilabel>Remember choice</guilabel> checkbox you can save your selection for future messages.</para>
+
+<para>If you are using a key for the first time, there are conflicting Encryption Preferences, or if <guilabel>Always show the encryption keys for approval</guilabel> is selected in the <guilabel>Security</guilabel> section of &kmail;'s configuration dialogue the <guilabel>Encryption Key Approval</guilabel> dialogue will appear; here, you can select different keys for the recipients and can set the <guilabel>Encryption Preference</guilabel> for each recipient. The default option, <guilabel>Encrypt whenever encryption is possible</guilabel>, will automatically encrypt your message if there is a trusted key for each recipient.</para>
+
+<para>As mentioned above, you will not be able to read your own encrypted sent messages if you do not check <guilabel>Always encrypt to self</guilabel> in the settings' <guilabel>Security</guilabel> page.</para>
 
 </sect2>
 
 <sect2 id="pgp-send-your-public-key">
-<title
->Send your Public Key</title>
-
-<para
->Prepare a message to the person to whom you want to send your public key; then, choose, in the composer window's menu, <menuchoice
-><guimenu
->Attach</guimenu
-><guimenuitem
->Attach My Public Key</guimenuitem
-></menuchoice
->: this will attach the public key you defined for the current identity to the message. Now you can send the message.</para>
-
-<para
->Remember that it is not safe at all if you sign the message to make sure that the receiver will get the correct key: there can be a man-in-the-middle attack, as somebody can change the key and sign the message with that other key. That is why the recipient should verify the attached key by checking the key's fingerprint against the one he received in a secure way from you; have a look at the <application
->PGP</application
-> documentation for further details.</para>
+<title>Send your Public Key</title>
+
+<para>Prepare a message to the person to whom you want to send your public key; then, choose, in the composer window's menu, <menuchoice><guimenu>Attach</guimenu><guimenuitem>Attach My Public Key</guimenuitem></menuchoice>: this will attach the public key you defined for the current identity to the message. Now you can send the message.</para>
+
+<para>Remember that it is not safe at all if you sign the message to make sure that the receiver will get the correct key: there can be a man-in-the-middle attack, as somebody can change the key and sign the message with that other key. That is why the recipient should verify the attached key by checking the key's fingerprint against the one he received in a secure way from you; have a look at the <application>PGP</application> documentation for further details.</para>
 
 </sect2>
 
 <sect2 id="pgp-you-received-an-encrypted-message">
-<title
->You received an encrypted Message</title>
+<title>You received an encrypted Message</title>
 
-<para
->All you have to do is to select the message in &kmail;. You will be prompted for your passphrase; then, &kmail; will try to decrypt the message and show you the plain text if the message had been encrypted with your public key: if not, then you will not be able to read it. &kmail; stores the messages encrypted, so nobody can read these messages without knowing your passphrase.</para>
+<para>All you have to do is to select the message in &kmail;. You will be prompted for your passphrase; then, &kmail; will try to decrypt the message and show you the plain text if the message had been encrypted with your public key: if not, then you will not be able to read it. &kmail; stores the messages encrypted, so nobody can read these messages without knowing your passphrase.</para>
 
 </sect2>
 
 <sect2 id="pgp-receiving-a-public-key">
-<title
->Receiving a Public Key</title>
-
-<para
->You can receive a public key as an attachment or via http, ftp or a floppy. Before you can use this key to encrypt a message to the owner of the key, you should verify the key (check its fingerprint or look for trusted signatures); then, you can add this key to your public keyring by typing <userinput
-><command
->pgp</command
-> <option
->-ka</option
-> <replaceable
->filename</replaceable
-></userinput
-> at the command line (if you are using <application
->PGP</application
->) or by typing <userinput
-><command
->gpg</command
-> <option
->--import</option
-> <replaceable
->filename</replaceable
-></userinput
-> at the command line (if you are using <application
->GnuPG</application
->). If the key is not certified with a trusted signature you cannot use it to encrypt messages unless you have signed the key with your key. </para>
+<title>Receiving a Public Key</title>
+
+<para>You can receive a public key as an attachment or via http, ftp or a floppy. Before you can use this key to encrypt a message to the owner of the key, you should verify the key (check its fingerprint or look for trusted signatures); then, you can add this key to your public keyring by typing <userinput><command>pgp</command> <option>-ka</option> <replaceable>filename</replaceable></userinput> at the command line (if you are using <application>PGP</application>) or by typing <userinput><command>gpg</command> <option>--import</option> <replaceable>filename</replaceable></userinput> at the command line (if you are using <application>GnuPG</application>). If the key is not certified with a trusted signature you cannot use it to encrypt messages unless you have signed the key with your key. </para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="the-anti-spam-wizard">
-<title
->The Anti-Spam Wizard</title>
+<title>The Anti-Spam Wizard</title>
 
 <sect2 id="spam-wizard-basics">
-<title
->Basics</title>
+<title>Basics</title>
 
-<para
->&kmail; does not have a built-in spam detection solution: the developers believe using external, but specialised, tools is the better approach. &kmail; uses these tools through its flexible filter architecture. The Anti-Spam Wizard helps you with the initial filter setup. </para>
+<para>&kmail; does not have a built-in spam detection solution: the developers believe using external, but specialised, tools is the better approach. &kmail; uses these tools through its flexible filter architecture. The Anti-Spam Wizard helps you with the initial filter setup. </para>
 
 <variablelist>
 <varlistentry>
-<term
->What can the wizard do to help you?</term>
+<term>What can the wizard do to help you?</term>
 <listitem>
-<para
->It will give you some choices about how you want the spam filtering to be set up. Afterwards it will automatically create the appropriate filter rules. </para>
+<para>It will give you some choices about how you want the spam filtering to be set up. Afterwards it will automatically create the appropriate filter rules. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->What are the limitations of the wizard?</term>
+<term>What are the limitations of the wizard?</term>
 <listitem>
-<para
->It can only initially set up the filters for you; and it will provide a standard setup. Modifying existing filters is not yet possible. </para>
+<para>It can only initially set up the filters for you; and it will provide a standard setup. Modifying existing filters is not yet possible. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You can activate the wizard via <menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Anti-Spam Wizard...</guisubmenu
-></menuchoice
->.</para>
+<para>You can activate the wizard via <menuchoice><guimenu>Tools</guimenu> <guisubmenu>Anti-Spam Wizard...</guisubmenu></menuchoice>.</para>
 
 </sect2>
 
 <sect2 id="spam-wizard-advanced">
-<title
->Advanced</title>
-
-<para
->Here are the details of how the wizard works: &kmail; can use several external tools to detect spam messages; it will try to automatically find out which of those tools are installed on your box and will show you the result of the search for each tool. You can mark the tools which you want to be used by &kmail; to detect spam; marking tools which were not found is not possible because the appropriate checkboxes are disabled. Of course, you can close the wizard, install a tool, and restart the wizard again. </para>
-
-<para
->If you have marked at least one tool you will be able to select some actions to be done in &kmail; with regard to spam messages: to let &kmail; detect spam messages you definitely should mark the <guilabel
->Classify messages using the anti-spam tools</guilabel
-> option; if you want messages detected as spam to be moved into a certain folder, please select the appropriate folder and mark the <guilabel
->Move detected spam messages to the selected folder</guilabel
-> option; if messages detected as spam should additionally be marked as read, then mark the <guilabel
->Additionally, mark detected spam messages as read</guilabel
-> option. </para>
-
-<para
->If you want to be able to manually mark messages as spam or non-spam (ham) you should check the <guilabel
->Classify messages manually as spam</guilabel
-> option: note that you can seemingly achieve the same result when you only change the status of the appropriate messages; but, if any of the tools you selected support Bayesian filtering (&ie; a method to detect spam based on statistical analysis of the messages) then these messages are not only marked but additionally transfered to the tools to let them learn so they can improve their detection rate. </para>
-
-<para
->Having checked at least one of these last options will allow you to let the wizard finish the filter setup. The wizard will not take any existing filter rules into consideration but will append new rules in any case; you may want to inspect the result of this process in the <link linkend="filter-dialog"
->Filter Dialogue</link
->. If you have checked the <guilabel
->Classify messages manually as spam / not spam</guilabel
-> option the wizard will create toolbar buttons for marking messages as spam or as ham; keep in mind that classifying messages as spam will also move those messages to the folder you had specified for spam messages. </para>
+<title>Advanced</title>
+
+<para>Here are the details of how the wizard works: &kmail; can use several external tools to detect spam messages; it will try to automatically find out which of those tools are installed on your box and will show you the result of the search for each tool. You can mark the tools which you want to be used by &kmail; to detect spam; marking tools which were not found is not possible because the appropriate checkboxes are disabled. Of course, you can close the wizard, install a tool, and restart the wizard again. </para>
+
+<para>If you have marked at least one tool you will be able to select some actions to be done in &kmail; with regard to spam messages: to let &kmail; detect spam messages you definitely should mark the <guilabel>Classify messages using the anti-spam tools</guilabel> option; if you want messages detected as spam to be moved into a certain folder, please select the appropriate folder and mark the <guilabel>Move detected spam messages to the selected folder</guilabel> option; if messages detected as spam should additionally be marked as read, then mark the <guilabel>Additionally, mark detected spam messages as read</guilabel> option. </para>
+
+<para>If you want to be able to manually mark messages as spam or non-spam (ham) you should check the <guilabel>Classify messages manually as spam</guilabel> option: note that you can seemingly achieve the same result when you only change the status of the appropriate messages; but, if any of the tools you selected support Bayesian filtering (&ie; a method to detect spam based on statistical analysis of the messages) then these messages are not only marked but additionally transfered to the tools to let them learn so they can improve their detection rate. </para>
+
+<para>Having checked at least one of these last options will allow you to let the wizard finish the filter setup. The wizard will not take any existing filter rules into consideration but will append new rules in any case; you may want to inspect the result of this process in the <link linkend="filter-dialog">Filter Dialogue</link>. If you have checked the <guilabel>Classify messages manually as spam / not spam</guilabel> option the wizard will create toolbar buttons for marking messages as spam or as ham; keep in mind that classifying messages as spam will also move those messages to the folder you had specified for spam messages. </para>
 
 </sect2>
 
 <sect2 id="spam-wizard-details">
-<title
->Details</title>
+<title>Details</title>
 
-<para
->The wizard uses information stored in a special configuration file named <filename
->kmail.antispamrc</filename
-> (stored in the global or local KDE config directory). It will first check the global config file and then the local config file: if the local config file contains entries with higher (newer) version numbers per-tool the configuration data from the local file for that tool is used; that way, both administrators and users can update the wizard configuration. </para>
+<para>The wizard uses information stored in a special configuration file named <filename>kmail.antispamrc</filename> (stored in the global or local KDE config directory). It will first check the global config file and then the local config file: if the local config file contains entries with higher (newer) version numbers per-tool the configuration data from the local file for that tool is used; that way, both administrators and users can update the wizard configuration. </para>
 
-<para
->The detection of spam messages is achieved by creating <guilabel
->pipe through</guilabel
-> actions per-tool within a special filter. Another filter contains rules to check for detected spam messages and actions to mark them and (optionally, depending on the choice in the wizard) to move them into a folder. Both filters are configured to be applied on incoming messages and on manual filtering. </para>
+<para>The detection of spam messages is achieved by creating <guilabel>pipe through</guilabel> actions per-tool within a special filter. Another filter contains rules to check for detected spam messages and actions to mark them and (optionally, depending on the choice in the wizard) to move them into a folder. Both filters are configured to be applied on incoming messages and on manual filtering. </para>
 
-<para
->Two filters are needed for the classification of ham and spam. They contain actions to mark the messages appropriately. As mentioned above, the filter for classification as spam has another action to move the message into a predefined folder. If the selected tools support Bayesian filtering, the wizard will create additional filter actions to pass the messages to the tools (<guilabel
->execute command</guilabel
-> actions) in the appropriate learn mode. </para>
+<para>Two filters are needed for the classification of ham and spam. They contain actions to mark the messages appropriately. As mentioned above, the filter for classification as spam has another action to move the message into a predefined folder. If the selected tools support Bayesian filtering, the wizard will create additional filter actions to pass the messages to the tools (<guilabel>execute command</guilabel> actions) in the appropriate learn mode. </para>
 
 </sect2>
 
 </sect1>
 
 <sect1 id="the-anti-virus-wizard">
-<title
->The Anti-Virus Wizard</title>
+<title>The Anti-Virus Wizard</title>
 
 <sect2 id="virus-wizard-basics">
-<title
->Basics</title>
+<title>Basics</title>
 
-<para
->&kmail; does not have a built-in virus detection solution: the developers believe using external, but specialised, tools is the better approach. &kmail; uses these tools through its flexible filter architecture. The Anti-Virus Wizard helps you with the initial filter setup. </para>
+<para>&kmail; does not have a built-in virus detection solution: the developers believe using external, but specialised, tools is the better approach. &kmail; uses these tools through its flexible filter architecture. The Anti-Virus Wizard helps you with the initial filter setup. </para>
 
 <variablelist>
 <varlistentry>
-<term
->What can the wizard do to help you?</term>
+<term>What can the wizard do to help you?</term>
 <listitem>
-<para
->It will give you some choices about how you want virus filtering to be set up. Afterwards it will automatically create the appropriate filter rules. </para>
+<para>It will give you some choices about how you want virus filtering to be set up. Afterwards it will automatically create the appropriate filter rules. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->What are the limitations of the wizard?</term>
+<term>What are the limitations of the wizard?</term>
 <listitem>
-<para
->It can only initially set up the filters for you; and it will provide a standard setup. Modifying existing filters is not yet possible. </para>
+<para>It can only initially set up the filters for you; and it will provide a standard setup. Modifying existing filters is not yet possible. </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-<para
->You can activate the wizard via <menuchoice
-><guimenu
->Tools</guimenu
-> <guisubmenu
->Anti-Virus Wizard...</guisubmenu
-></menuchoice
->.</para>
+<para>You can activate the wizard via <menuchoice><guimenu>Tools</guimenu> <guisubmenu>Anti-Virus Wizard...</guisubmenu></menuchoice>.</para>
 
 </sect2>
 
 <sect2 id="virus-wizard-advanced">
-<title
->Advanced</title>
-
-<para
->The Anti-Virus Wizard basically works exactly as the <link linkend="the-anti-spam-wizard"
->Anti-Spam Wizard</link
->. Here are the details of how the wizard works: &kmail; can use several external tools to detect messages containing viruses; it will try to automatically find out which of those tools are installed on your box and will show you the result of the search for each tool. You can mark the tools which you want to be used by &kmail; to detect viruses; marking tools which were not found is not possible because the appropriate checkboxes are disabled. Of course, you can close the wizard, install a tool, and restart the wizard again. </para>
-
-<para
->If you have marked at least one tool you will be able to select some actions to be done in &kmail; with regard to messages containing viruses: to let &kmail; detect messages containing viruses you definitely should mark the <guilabel
->Check messages using the anti-virus tools</guilabel
-> option; if you want messages detected as virus-infected to be moved into a certain folder, please select the appropriate folder and mark the <guilabel
->Move detected viral messages to the selected folder</guilabel
-> option; if messages detected as virus-infected should additionally be marked as read, then mark the <guilabel
->Additionally, mark detected viral messages as read</guilabel
-> option. </para>
-
-<para
->Having checked at least one of these last options will allow you to let the wizard finish the filter setup. The wizard will not take any existing filter rules into consideration but will append new rules in any case; you may want to inspect the result of this process in the <link linkend="filter-dialog"
->Filter Dialogue</link
->. </para>
+<title>Advanced</title>
+
+<para>The Anti-Virus Wizard basically works exactly as the <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link>. Here are the details of how the wizard works: &kmail; can use several external tools to detect messages containing viruses; it will try to automatically find out which of those tools are installed on your box and will show you the result of the search for each tool. You can mark the tools which you want to be used by &kmail; to detect viruses; marking tools which were not found is not possible because the appropriate checkboxes are disabled. Of course, you can close the wizard, install a tool, and restart the wizard again. </para>
+
+<para>If you have marked at least one tool you will be able to select some actions to be done in &kmail; with regard to messages containing viruses: to let &kmail; detect messages containing viruses you definitely should mark the <guilabel>Check messages using the anti-virus tools</guilabel> option; if you want messages detected as virus-infected to be moved into a certain folder, please select the appropriate folder and mark the <guilabel>Move detected viral messages to the selected folder</guilabel> option; if messages detected as virus-infected should additionally be marked as read, then mark the <guilabel>Additionally, mark detected viral messages as read</guilabel> option. </para>
+
+<para>Having checked at least one of these last options will allow you to let the wizard finish the filter setup. The wizard will not take any existing filter rules into consideration but will append new rules in any case; you may want to inspect the result of this process in the <link linkend="filter-dialog">Filter Dialogue</link>. </para>
 
 </sect2>
 
 <sect2 id="virus-wizard-details">
-<title
->Details</title>
-
-<para
->The wizard uses information stored in a special configuration file named <filename
->kmail.antivirusrc</filename
-> (stored in the global or local KDE config directory). It will first check the global config file and then the local config file: if the local config file contains entries with higher (newer) version numbers per-tool the configuration data from the local file for that tool is used; that way, both administrators and users can update the wizard configuration. </para>
-
-<para
->The detection of messages containing viruses is achieved by creating <guilabel
->pipe through</guilabel
-> actions per-tool within a special filter. Another filter contains rules to check for detected viral messages and actions to mark them and (optionally, depending on the choice in the wizard) to move them into a folder. Both filters are configured to be applied on incoming messages and on manual filtering. </para>
+<title>Details</title>
+
+<para>The wizard uses information stored in a special configuration file named <filename>kmail.antivirusrc</filename> (stored in the global or local KDE config directory). It will first check the global config file and then the local config file: if the local config file contains entries with higher (newer) version numbers per-tool the configuration data from the local file for that tool is used; that way, both administrators and users can update the wizard configuration. </para>
+
+<para>The detection of messages containing viruses is achieved by creating <guilabel>pipe through</guilabel> actions per-tool within a special filter. Another filter contains rules to check for detected viral messages and actions to mark them and (optionally, depending on the choice in the wizard) to move them into a folder. Both filters are configured to be applied on incoming messages and on manual filtering. </para>
 
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook b/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook
index 2f65ccf5c7f..8a4aba35cc9 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/commands.docbook
@@ -1,120 +1,65 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
->	-->
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd">	-->
 
 <chapter id="commands">
-<title
->Command reference</title>
+<title>Command reference</title>
 
-<para
->The following keybindings assume you did not change the default settings.</para>
+<para>The following keybindings assume you did not change the default settings.</para>
 
 <sect1 id="knode-mainwindow">
-<title
->The main &knode; window</title>
+<title>The main &knode; window</title>
 
 <sect2>
-<title
->The <guimenu
->File</guimenu
-> menu</title>
+<title>The <guimenu>File</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->S</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Save</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Save</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Saves the selected article in a file.</action>
+<action>Saves the selected article in a file.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->P</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Print</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>P</keycap> </keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Print</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Prints the selected article.</action>
+<action>Prints the selected article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
-> File</guimenu
-> <guimenuitem
->Send pending messages</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu> File</guimenu> <guimenuitem>Send pending messages</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->The messages in the Outbox folder are sent.</action>
+<action>The messages in the Outbox folder are sent.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
-> File</guimenu
-> <guimenuitem
->Stop Network</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu> File</guimenu> <guimenuitem>Stop Network</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Disconnects the current connection to a newsserver.</action>
+<action>Disconnects the current connection to a newsserver.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->Q</keycap
-></keycombo
-> </shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Quit</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo> </shortcut> <guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Quits &knode;.</action>
+<action>Quits &knode;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -123,89 +68,46 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Edit</guimenu
-> menu</title>
+<title>The <guimenu>Edit</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-> </keycombo
-> </shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycombo action="simul">&Ctrl;<keycap>C</keycap> </keycombo> </shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Copy the selected text to the clipboard.</action>
+<action>Copy the selected text to the clipboard.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->A</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Select all</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Select all</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Selects the whole article.</action>
+<action>Selects the whole article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-> <keycap
->F4</keycap
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Search articles</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut> <keycap>F4</keycap></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Search articles</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Search Dialogue Box for searching in the active group.</action>
+<action>Opens the Search Dialogue Box for searching in the active group.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Fetch article with ID...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Fetch article with ID...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Enables the download of an article with a specified article-ID.</action>
+<action>Enables the download of an article with a specified article-ID.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -214,211 +116,120 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->View</guimenu
-> menu</title>
+<title>The <guimenu>View</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show Threads</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Show Threads</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->When this is activated, &knode; shows discussions as a tree view in the article view.</para>
+<para>When this is activated, &knode; shows discussions as a tree view in the article view.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Expand all threads</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Expand all threads</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->When this is activated, &knode; shows the complete threads; this is only functional when <guilabel
->Show threads</guilabel
-> is active.</para>
+<para>When this is activated, &knode; shows the complete threads; this is only functional when <guilabel>Show threads</guilabel> is active.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Collapse all threads</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Collapse all threads</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->When this is activated, &knode; shows no threads; this is only functional when <guilabel
->Show threads</guilabel
-> is active.</para>
+<para>When this is activated, &knode; shows no threads; this is only functional when <guilabel>Show threads</guilabel> is active.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->T</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Toggle Subthread</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>T</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Toggle Subthread</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles between showing and collapsing the selected thread.</action>
+<action>Toggles between showing and collapsing the selected thread.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Filter</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Filter</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Allows you to choose a filter for the article view.</action>
+<action>Allows you to choose a filter for the article view.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Sort</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Sort</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Allows you to sort the article view.</action>
+<action>Allows you to sort the article view.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->F5</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Refresh list</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>F5</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Refresh list</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Refreshes the article view</action>
+<action>Refreshes the article view</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Show all headers</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Show all headers</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->When this setting is activated, &knode; shows the complete article header in the article window.</action>
+<action>When this setting is activated, &knode; shows the complete article header in the article window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Unscramble (ROT 13)</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Unscramble (ROT 13)</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->When this setting is activated, &knode; shows all characters of the complete article rotated by 13 characters.</action>
+<action>When this setting is activated, &knode; shows all characters of the complete article rotated by 13 characters.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Verify PGP signature</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Verify PGP signature</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Checks the PGP signature in the article.</action>
+<action>Checks the PGP signature in the article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->X</keycap
-></shortcut
-> <guimenu
->View</guimenu
-> <guimenuitem
->Use fixed font</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>X</keycap></shortcut> <guimenu>View</guimenu> <guimenuitem>Use fixed font</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Activates the configured fixed-width font for the viewer.</action>
+<action>Activates the configured fixed-width font for the viewer.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->View</guimenu
-> <guimenuitem
->Charset</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>View</guimenu> <guimenuitem>Charset</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Here you can configure the charset which is used for the articles.</action>
+<action>Here you can configure the charset which is used for the articles.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -427,135 +238,68 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Go</guimenu
-> menu</title>
+<title>The <guimenu>Go</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->B</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous article</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>B</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to previous article in the article view.</action>
+<action>Jumps to previous article in the article view.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->N</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next article</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>N</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to next article in the article view.</action>
+<action>Jumps to next article in the article view.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Alt;<keycap
->Space</keycap
-></keycombo
-> </shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next unread article</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo> </shortcut> <guimenu>Go</guimenu> <guimenuitem>Next unread article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to the next unread article, and to the first unread article of the next newsgroup if necessary.</action>
+<action>Jumps to the next unread article, and to the first unread article of the next newsgroup if necessary.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next unread thread</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next unread thread</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to the next unread thread, and to the next unread thread in the next newsgroup if necessary.</action>
+<action>Jumps to the next unread thread, and to the next unread thread in the next newsgroup if necessary.</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->-</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Previous group</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>-</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Previous group</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to the previous news group in the folder view</action>
+<action>Jumps to the previous news group in the folder view</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->+</keycap
-></shortcut
-> <guimenu
->Go</guimenu
-> <guimenuitem
->Next group</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>+</keycap></shortcut> <guimenu>Go</guimenu> <guimenuitem>Next group</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Jumps to the next newsgroup in the folder view</action>
+<action>Jumps to the next newsgroup in the folder view</action>
 </para>
 </listitem>
 </varlistentry>
@@ -564,99 +308,58 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Account</guimenu
-> menu</title>
+<title>The <guimenu>Account</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Get new articles in all groups</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Get new articles in all groups</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Connects with the active account and fetches any new messages.</action>
+<action>Connects with the active account and fetches any new messages.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Subscribe to Newsgroups</guimenuitem
-> </menuchoice
-> 
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->Opens the Dialogue Box for subscribing to newsgroups for the active account.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Subscribe to Newsgroups</guimenuitem> </menuchoice> 
+</term> 
+<listitem> 
+<para> 
+<action>Opens the Dialogue Box for subscribing to newsgroups for the active account.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Expire all groups</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Expire all groups</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Here you can expire all groups of an account manually.</action>
+<action>Here you can expire all groups of an account manually.</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Account Properties</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Account Properties</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the properties dialogue for the active account.</action>
+<action>Opens the properties dialogue for the active account.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Account</guimenu
-> <guimenuitem
->Delete Account</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Account</guimenu> <guimenuitem>Delete Account</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Deletes the active account and all subscribed newsgroups therein.</action>
+<action>Deletes the active account and all subscribed newsgroups therein.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -665,121 +368,76 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Group</guimenu
-> menu</title>
+<title>The <guimenu>Group</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Get new articles</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Get new articles</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Connects with the active account and fetches any new messages.</action>
+<action>Connects with the active account and fetches any new messages.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Expire group</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Expire group</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Checks if there are any old articles and, if so, deletes them.</action>
+<action>Checks if there are any old articles and, if so, deletes them.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Reorganise group</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Reorganise group</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Rebuilds the article view by using the configured sortings.</action>
+<action>Rebuilds the article view by using the configured sortings.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Mark all as read</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Mark all as read</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Sets the status of all articles in the active newsgroup to read.</action>
+<action>Sets the status of all articles in the active newsgroup to read.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Mark all as unread</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Mark all as unread</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Sets the status of all articles in the active newsgroup to unread.</action>
+<action>Sets the status of all articles in the active newsgroup to unread.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Group Properties</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Group Properties</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the dialogue for the group properties.</action>
+<action>Opens the dialogue for the group properties.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Group</guimenu
-> <guimenuitem
->Unsubscribe</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Group</guimenu> <guimenuitem>Unsubscribe</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Unsubscribes from the active newsgroup</action>
+<action>Unsubscribes from the active newsgroup</action>
 </para>
 </listitem>
 </varlistentry>
@@ -789,162 +447,96 @@
 
 
 <sect2>
-<title
->The <guimenu
->Folder</guimenu
-> menu</title>
+<title>The <guimenu>Folder</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->New Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>New Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Creates a new main folder.</action>
+<action>Creates a new main folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->New Subfolder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>New Subfolder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Creates a new subfolder.</action>
+<action>Creates a new subfolder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Rename Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Rename Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Here you can rename the active folder.</action>
+<action>Here you can rename the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Import MBox Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Import MBox Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->With this function it is possible to import an MBox folder into the active folder.</action>
+<action>With this function it is possible to import an MBox folder into the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Export as MBox Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Export as MBox Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->With this function you can export the active folder as an MBox folder.</action>
+<action>With this function you can export the active folder as an MBox folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Compact Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Compact Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Removes all deleted articles from the active folder.</action>
+<action>Removes all deleted articles from the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Compact All Folders</guimenuitem
-> </menuchoice>
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->Removes all deleted articles from the every folder.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-> 
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Empty Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Compact All Folders</guimenuitem> </menuchoice>
+</term> 
+<listitem> 
+<para> 
+<action>Removes all deleted articles from the every folder.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term> 
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Empty Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Deletes all articles from the active folder.</action>
+<action>Deletes all articles from the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Folder</guimenu
-> <guimenuitem
->Delete Folder</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Folder</guimenu> <guimenuitem>Delete Folder</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Deletes the active folder.</action>
+<action>Deletes the active folder.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -953,310 +545,143 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Article</guimenu
-> menu</title>
+<title>The <guimenu>Article</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->P</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Post To Newsgroup</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>P</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Post To Newsgroup</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer, with the settings for writing new articles set to those of the active newsgroup.</action>
+<action>Opens the Composer, with the settings for writing new articles set to those of the active newsgroup.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->R</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Followup To Newsgroup</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>R</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Followup To Newsgroup</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer for writing a followup, with the content of the active article.</action>
+<action>Opens the Composer for writing a followup, with the content of the active article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->A</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Reply by Email</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>A</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Reply by Email</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer for writing an e-mail to the author of the active article.</action>
+<action>Opens the Composer for writing an e-mail to the author of the active article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->F</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Forward by Email</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>F</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Forward by Email</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer for forwarding the active article as e-mail.</action>
+<action>Opens the Composer for forwarding the active article as e-mail.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->D</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guisubmenu
->Mark as Read</guisubmenu
-> </menuchoice>
+<menuchoice><shortcut><keycap>D</keycap></shortcut> <guimenu>Article</guimenu> <guisubmenu>Mark as Read</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the status of the active article to<quote
-> read</quote
-> </para>
+<para>Set the status of the active article to<quote> read</quote> </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->U</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guisubmenu
->Mark as Unread</guisubmenu
-> </menuchoice>
+<menuchoice><shortcut><keycap>U</keycap></shortcut> <guimenu>Article</guimenu> <guisubmenu>Mark as Unread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the status of the active article to<quote
-> unread</quote
-> </para>
+<para>Set the status of the active article to<quote> unread</quote> </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->D</keycap
-></keycombo
-></shortcut
-> <guimenu
->Article</guimenu
-> <guisubmenu
->Mark Thread as Read</guisubmenu
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo></shortcut> <guimenu>Article</guimenu> <guisubmenu>Mark Thread as Read</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the status of the active thread to<quote
-> read</quote
-> </para>
+<para>Set the status of the active thread to<quote> read</quote> </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->U</keycap
-></keycombo
-></shortcut
-> <guimenu
->Article</guimenu
-> <guisubmenu
->Mark Thread as Unread</guisubmenu
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo></shortcut> <guimenu>Article</guimenu> <guisubmenu>Mark Thread as Unread</guisubmenu> </menuchoice>
 </term>
 <listitem>
-<para
->Set the status of the active thread to<quote
-> unread</quote
-> </para>
+<para>Set the status of the active thread to<quote> unread</quote> </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Article</guimenu
-> <guimenuitem
->Cancel Article</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Article</guimenu> <guimenuitem>Cancel Article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Generate a message which deletes the active Article in Usenet; you can only use this with your own articles.</action>
+<action>Generate a message which deletes the active Article in Usenet; you can only use this with your own articles.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Article</guimenu
-> <guimenuitem
->Supersede Article</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Article</guimenu> <guimenuitem>Supersede Article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens the Composer with the content of the active article; when this article is posted it overwrites the original article. You can only use this with your own articles.</action>
+<action>Opens the Composer with the content of the active article; when this article is posted it overwrites the original article. You can only use this with your own articles.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->O</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Open in own window</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>O</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Open in own window</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->The active article is opened in a new window.</action>
+<action>The active article is opened in a new window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Article</guimenu
-> <guimenuitem
->View Source</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Article</guimenu> <guimenuitem>View Source</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->The source code of the active article is opened in a new window.</action>
+<action>The source code of the active article is opened in a new window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->E</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Edit Article...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>E</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Edit Article...</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
-> Opens the Composer for editing the active article;</action
-> you can only use this in the <guilabel
-> Outbox</guilabel
-> and <guilabel
-> Drafts</guilabel
-> folders.</para>
+<para><action> Opens the Composer for editing the active article;</action> you can only use this in the <guilabel> Outbox</guilabel> and <guilabel> Drafts</guilabel> folders.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycap
->Delete</keycap
-></shortcut
-> <guimenu
->Article</guimenu
-> <guimenuitem
->Delete Article</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycap>Delete</keycap></shortcut> <guimenu>Article</guimenu> <guimenuitem>Delete Article</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
-> Deletes the active article.</action
-> You can only use this in the <guilabel
-> Outbox</guilabel
-> and <guilabel
-> Drafts</guilabel
-> folders.</para>
+<para><action> Deletes the active article.</action> You can only use this in the <guilabel> Outbox</guilabel> and <guilabel> Drafts</guilabel> folders.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Article</guimenu
-> <guimenuitem
->Send now</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Article</guimenu> <guimenuitem>Send now</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
-> Sends the active article.</action
-> You can only use this in the <guilabel
-> Outbox</guilabel
-> and <guilabel
-> Drafts</guilabel
-> folders.</para>
+<para><action> Sends the active article.</action> You can only use this in the <guilabel> Outbox</guilabel> and <guilabel> Drafts</guilabel> folders.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -1264,149 +689,66 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Scoring</guimenu
-> menu</title>
+<title>The <guimenu>Scoring</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->E</keycap
-></keycombo
-></shortcut
-> <guimenu
->Scoring</guimenu
-> <guimenuitem
->Edit Scoring Rules...</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->The dialogue to edit the scoring rules will be opened.</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><guimenu
->Scoring</guimenu
-> <guimenuitem
->Recalculate scores</guimenuitem
-> </menuchoice
-> 
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->The scores will be reset and recalculated.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-> 
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
-></shortcut
-> <guimenu
->Scoring</guimenu
-> <guimenuitem
->Lower Score for Author...</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->Creates a rule for lowering the score of all articles posted by the author of the active article.</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->I</keycap
-></keycombo
-></shortcut
-> <guimenu
->Scoring</guimenu
-> <guimenuitem
->Raise Score for Author...</guimenuitem
-> </menuchoice>
-</term>
-<listitem
-> 
-<para
-> 
-<action
->Creates a rule for raising the score of all articles posted by the author of the active article.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-> 
-<menuchoice
-><shortcut
-><keycap
->W</keycap
-></shortcut
-><guimenu
->Scoring</guimenu
-> <guimenuitem
->Watch Thread</guimenuitem
-> </menuchoice>
-</term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo></shortcut> <guimenu>Scoring</guimenu> <guimenuitem>Edit Scoring Rules...</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>The dialogue to edit the scoring rules will be opened.</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><guimenu>Scoring</guimenu> <guimenuitem>Recalculate scores</guimenuitem> </menuchoice> 
+</term> 
+<listitem> 
+<para> 
+<action>The scores will be reset and recalculated.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term> 
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo></shortcut> <guimenu>Scoring</guimenu> <guimenuitem>Lower Score for Author...</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>Creates a rule for lowering the score of all articles posted by the author of the active article.</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo></shortcut> <guimenu>Scoring</guimenu> <guimenuitem>Raise Score for Author...</guimenuitem> </menuchoice>
+</term>
+<listitem> 
+<para> 
+<action>Creates a rule for raising the score of all articles posted by the author of the active article.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term> 
+<menuchoice><shortcut><keycap>W</keycap></shortcut><guimenu>Scoring</guimenu> <guimenuitem>Watch Thread</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>Sets the score for this thread to the configured score of watched threads (standard = 100).</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycap>I</keycap></shortcut> <guimenu>Scoring</guimenu> <guimenuitem>Ignore Thread</guimenuitem> </menuchoice>
+</term>
 <listitem>
 <para>
-<action
->Sets the score for this thread to the configured score of watched threads (standard = 100).</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycap
->I</keycap
-></shortcut
-> <guimenu
->Scoring</guimenu
-> <guimenuitem
->Ignore Thread</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->Sets the score for this thread to the configured score of ignored threads (standard = -100).</action>
+<action>Sets the score for this thread to the configured score of ignored threads (standard = -100).</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1415,90 +757,57 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Settings</guimenu
-> menu</title>
+<title>The <guimenu>Settings</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the toolbar is shown or not.</action>
+<action>This option toggles whether the toolbar is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Statusbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Statusbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the statusbar is shown or not.</action>
+<action>This option toggles whether the statusbar is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Group view</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Group view</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the group list is shown or not.</action>
+<action>This option toggles whether the group list is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Header view</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Header view</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the header view is shown or not.</action>
+<action>This option toggles whether the header view is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Article viewer</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Article viewer</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->This option toggles whether the article is shown or not.</action>
+<action>This option toggles whether the article is shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1506,49 +815,31 @@
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring the key bindings.</action>
+<action>Opens a dialogue for configuring the key bindings.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring the toolbars.</action>
+<action>Opens a dialogue for configuring the toolbars.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure KNode...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure KNode...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring &knode;.</action>
+<action>Opens a dialogue for configuring &knode;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1557,121 +848,60 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Help</guimenu
-> menu</title>
+<title>The <guimenu>Help</guimenu> menu</title>
 &help.menu.documentation; </sect2>
 </sect1>
 
 <sect1 id="knode-editorwindow">
-<title
->The composer menus.</title>
+<title>The composer menus.</title>
 
-<sect2
-> 
-<title
->The <guimenu
->File</guimenu
-> menu</title>
+<sect2> 
+<title>The <guimenu>File</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Return</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Send Now</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Send Now</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Sends the current article immediately.</action>
+<action>Sends the current article immediately.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Send Later</guimenuitem
-> </menuchoice
-> 
-</term
-> 
-<listitem
-> 
-<para
->Stores the current article in the <guilabel
-> Outbox</guilabel
-> to be sent later.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Send Later</guimenuitem> </menuchoice> 
+</term> 
+<listitem> 
+<para>Stores the current article in the <guilabel> Outbox</guilabel> to be sent later.</para> 
+</listitem> 
+</varlistentry> 
 <varlistentry>
-<term
-> 
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Save as Draft</guimenuitem
-> </menuchoice>
+<term> 
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Save as Draft</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Saves the current article in the <guilabel
-> Drafts</guilabel
-> folder, so you can finish editing it another time.</para>
+<para>Saves the current article in the <guilabel> Drafts</guilabel> folder, so you can finish editing it another time.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->File</guimenu
-> <guimenuitem
->Delete</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>File</guimenu> <guimenuitem>Delete</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Deletes the current article, closing the editor.</action>
+<action>Deletes the current article, closing the editor.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->W</keycap
-></keycombo
-></shortcut
-> <guimenu
->File</guimenu
-> <guimenuitem
->Close</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo></shortcut> <guimenu>File</guimenu> <guimenuitem>Close</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Closes the editor window</action>
+<action>Closes the editor window</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1680,284 +910,131 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Edit</guimenu
-> menu</title>
+<title>The <guimenu>Edit</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Undo</guimenuitem
-> </menuchoice>
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->Undo the last edit.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Shift</keycap
-><keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Redo</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para
->Redo the last action undone with the <guimenuitem
-> Undo</guimenuitem
-> menu entry.</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->X</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Cut</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->Cuts the currently-selected text to the clipboard, deleting it from the editor window.</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->C</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Copy</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Undo</guimenuitem> </menuchoice>
+</term> 
+<listitem> 
+<para> 
+<action>Undo the last edit.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Shift</keycap><keycap>Z</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Redo</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>Redo the last action undone with the <guimenuitem> Undo</guimenuitem> menu entry.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Cut</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>Cuts the currently-selected text to the clipboard, deleting it from the editor window.</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Copy</guimenuitem> </menuchoice>
 </term>
-<listitem>
-<para>
-<action
->Copies the selected text to the clipboard.</action>
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->V</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Paste</guimenuitem
-> </menuchoice
-> 
-</term
-> 
-<listitem
-> 
-<para
-> 
-<action
->Pastes the current contents of the clipboard into the editor window.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-> 
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Paste as Quotation</guimenuitem
-> </menuchoice>
+<listitem>
+<para>
+<action>Copies the selected text to the clipboard.</action>
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Paste</guimenuitem> </menuchoice> 
+</term> 
+<listitem> 
+<para> 
+<action>Pastes the current contents of the clipboard into the editor window.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term> 
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Paste as Quotation</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
-><action
-> Pastes the current contents of the clipboard into the editor window with a quote character </action
-> (<quote
->&gt;</quote
->) at the beginning of each line. </para>
+<para><action> Pastes the current contents of the clipboard into the editor window with a quote character </action> (<quote>&gt;</quote>) at the beginning of each line. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Edit</guimenu
-> <guimenuitem
->Select All</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Edit</guimenu> <guimenuitem>Select All</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Selects all the text in the editor window.</action>
+<action>Selects all the text in the editor window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->F</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Find</guimenuitem
-> </menuchoice>
-</term>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Find</guimenuitem> </menuchoice>
+</term>
 <listitem>
 <para>
-<action
->Opens the Find dialogue.</action>
+<action>Opens the Find dialogue.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->R</keycap
-></keycombo
-></shortcut
-> <guimenu
->Edit</guimenu
-> <guimenuitem
->Replace...</guimenuitem
-> </menuchoice>
-</term>
-<listitem>
-<para>
-<action
->Opens the Replace dialogue.</action
-> 
-</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut> <guimenu>Edit</guimenu> <guimenuitem>Replace...</guimenuitem> </menuchoice>
+</term>
+<listitem>
+<para>
+<action>Opens the Replace dialogue.</action> 
+</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
  
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->The <guimenu
->Attach</guimenu
-> menu</title>
+<sect2> 
+<title>The <guimenu>Attach</guimenu> menu</title>
 <para>
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Append Signature</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Append Signature</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Inserts your signature at the end of the article you are editing.</action>
+<action>Inserts your signature at the end of the article you are editing.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Insert File...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Insert File...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Inserts the contents of a file into the editor window.</action>
+<action>Inserts the contents of a file into the editor window.</action>
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Insert File (in a box)...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Insert File (in a box)...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Inserts the contents of a file into the editor window and puts a box around of it.</action>
+<action>Inserts the contents of a file into the editor window and puts a box around of it.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1965,17 +1042,11 @@
 
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Attach</guimenu
-> <guimenuitem
->Attach File...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Attach</guimenu> <guimenuitem>Attach File...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Inserts a file as an attachment.</action>
+<action>Inserts a file as an attachment.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -1984,73 +1055,46 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Options</guimenu
-> menu</title>
+<title>The <guimenu>Options</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Send News-Article</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Send News-Article</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles whether the message is to be sent as an article or not.</action>
+<action>Toggles whether the message is to be sent as an article or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Send Email</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Send Email</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles whether the message is to be sent as an email or not; if it's configured, an external editor will be activated.</action>
+<action>Toggles whether the message is to be sent as an email or not; if it's configured, an external editor will be activated.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Set Charset</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Set Charset</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Here you can configure the charset used for this article; normally you use us-ascii for English-speaking areas.</action>
+<action>Here you can configure the charset used for this article; normally you use us-ascii for English-speaking areas.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Options</guimenu
-> <guimenuitem
->Word Wrap</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Options</guimenu> <guimenuitem>Word Wrap</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles the word wrapping in the editor on or off.</action>
+<action>Toggles the word wrapping in the editor on or off.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -2059,159 +1103,94 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Tools</guimenu
-> menu</title>
+<title>The <guimenu>Tools</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Add Quote Characters</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Add Quote Characters</guimenuitem> </menuchoice>
 </term>
 <listitem>
-<para
->Puts <quote
->&gt;</quote
-> in front of the marked lines. </para>
+<para>Puts <quote>&gt;</quote> in front of the marked lines. </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Remove Quote Characters</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Remove Quote Characters</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Removes the quote characters at the beginning of the marked lines.</action>
+<action>Removes the quote characters at the beginning of the marked lines.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Add Box</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Add Box</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Puts the marked lines in an ASCII box.</action>
+<action>Puts the marked lines in an ASCII box.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Remove Box</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Remove Box</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Removes the ASCII box around the marked area.</action>
+<action>Removes the ASCII box around the marked area.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Sign Article with PGP</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Sign Article with PGP</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Signs the article with PGP.</action>
+<action>Signs the article with PGP.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Get Original Text (not rewrapped)</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Get Original Text (not rewrapped)</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Rebuilds the original posting when answering to an article.</action>
+<action>Rebuilds the original posting when answering to an article.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Scramble (Rot-13)</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Scramble (Rot-13)</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Encrypts the marked text by rotating every character 13 characters of the alphabet.</action>
+<action>Encrypts the marked text by rotating every character 13 characters of the alphabet.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Tools</guimenu
-> <guimenuitem
->Start External Editor</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Tools</guimenu> <guimenuitem>Start External Editor</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Start the external editor (if one is configured) with the current contents of the editor window.</action>
+<action>Start the external editor (if one is configured) with the current contents of the editor window.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><shortcut
-><keycombo action="simul"
->&Ctrl;<keycap
->Z</keycap
-></keycombo
-></shortcut
-> <guimenu
->Tools</guimenu
-> <guimenuitem
->Spelling...</guimenuitem
-> </menuchoice>
+<menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Z</keycap></keycombo></shortcut> <guimenu>Tools</guimenu> <guimenuitem>Spelling...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue box to check your spelling.</action>
+<action>Opens a dialogue box to check your spelling.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -2220,89 +1199,56 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Settings</guimenu
-> menu</title>
+<title>The <guimenu>Settings</guimenu> menu</title>
 
 <variablelist>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Toolbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Toolbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles whether the toolbar should be shown or not.</action>
+<action>Toggles whether the toolbar should be shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Show Statusbar</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Show Statusbar</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Toggles whether the statusbar should be shown or not.</action>
+<action>Toggles whether the statusbar should be shown or not.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Shortcuts...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring the key bindings.</action>
+<action>Opens a dialogue for configuring the key bindings.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure Toolbars...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Opens a dialogue for configuring the toolbars.</action>
+<action>Opens a dialogue for configuring the toolbars.</action>
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-<menuchoice
-><guimenu
->Settings</guimenu
-> <guimenuitem
->Configure KNode...</guimenuitem
-> </menuchoice>
+<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure KNode...</guimenuitem> </menuchoice>
 </term>
 <listitem>
 <para>
-<action
->Open the &knode; Preferences dialogue.</action>
+<action>Open the &knode; Preferences dialogue.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -2311,10 +1257,7 @@
 </sect2>
 
 <sect2>
-<title
->The <guimenu
->Help</guimenu
-> menu</title>
+<title>The <guimenu>Help</guimenu> menu</title>
 &help.menu.documentation; </sect2>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/credits.docbook b/tde-i18n-en_GB/docs/tdepim/knode/credits.docbook
index 9fb4a7b579b..03a5d158f74 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/credits.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/credits.docbook
@@ -1,86 +1,43 @@
 <chapter id="credits">
-<title
->Credits and Licence</title>
+<title>Credits and Licence</title>
 
-<para
->&knode;</para>
+<para>&knode;</para>
 
-<para
->Program Copyright 1999,2000,2001,2002 KNode developers</para>
+<para>Program Copyright 1999,2000,2001,2002 KNode developers</para>
 
-<itemizedlist
-> 
-<title
->Developers</title>
-<listitem
-> 
-<para
->Christian Gebauer <email
->gebauer@kde.org</email
-></para
-> 
+<itemizedlist> 
+<title>Developers</title>
+<listitem> 
+<para>Christian Gebauer <email>gebauer@kde.org</email></para> 
 </listitem>
-<listitem
-> 
-<para
->Christian Thurner <email
->cthurner@web.de</email
-></para>
-</listitem
-> 
+<listitem> 
+<para>Christian Thurner <email>cthurner@web.de</email></para>
+</listitem> 
 <listitem>
-<para
->Dirk Mueller <email
->mueller@kde.org</email
-></para
-> 
+<para>Dirk Mueller <email>mueller@kde.org</email></para> 
 </listitem>
 <listitem>
-<para
->Mark Mutz <email
->mutz@kde.org</email
-></para
-> 
+<para>Mark Mutz <email>mutz@kde.org</email></para> 
 </listitem>
 <listitem>
-<para
->Roberto Teixeira <email
->roberto@kde.org</email
-></para
-> 
+<para>Roberto Teixeira <email>roberto@kde.org</email></para> 
 </listitem>
 <listitem>
-<para
->Mathias Waack <email
->mathias@atoll-net.de</email
-></para>
+<para>Mathias Waack <email>mathias@atoll-net.de</email></para>
 </listitem>
 </itemizedlist>
 
 <itemizedlist>
-<title
->Documentation</title>
+<title>Documentation</title>
 <listitem>
-<para
->Copyright 2000,2001 Stephan Johach<email
->lucardus@onlinehome.de</email
-></para>
+<para>Copyright 2000,2001 Stephan Johach<email>lucardus@onlinehome.de</email></para>
 </listitem>
 <listitem>
-<para
->Copyright 2001,2002 Thomas Schütz <email
-> Thomas.Schuetz@gmx.li</email
-></para>
+<para>Copyright 2001,2002 Thomas Schütz <email> Thomas.Schuetz@gmx.li</email></para>
 </listitem>
 </itemizedlist>
 
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 
-<para
->Thanks go to the &knode; developers who answered all my stupid questions with patience. Then Thomas Diehl and Matthias Kiefer who always were competent contacts regards to translation. Many Thanks to Malcolm Hunter who checked this english translation. Not to forget Michael McBride, always there to help me out with documentation-related and general stuff, and everybody else in the &kde; Team who contributed to the creation of this document.</para>
-&underFDL; &underGPL; </chapter
-> 
+<para>Thanks go to the &knode; developers who answered all my stupid questions with patience. Then Thomas Diehl and Matthias Kiefer who always were competent contacts regards to translation. Many Thanks to Malcolm Hunter who checked this english translation. Not to forget Michael McBride, always there to help me out with documentation-related and general stuff, and everybody else in the &kde; Team who contributed to the creation of this document.</para>
+&underFDL; &underGPL; </chapter> 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook b/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook
index 072bedafba0..76c8d45153c 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/faq.docbook
@@ -2,290 +2,131 @@
 <!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd">
 -->
 <chapter id="faq">
-<title
->Questions and Answers</title>
+<title>Questions and Answers</title>
 
 <qandaset>
 <qandaentry>
 <question>
-<para
->I have installed &kde; 3, but &knode; does not exist in the <guimenu
->K</guimenu
-> Menu.</para>
- </question
-> 
-<answer
-> 
-<para
->Does the <guisubmenu
->Internet</guisubmenu
->entry exist? If not, maybe the tdenetwork package isn't installed (perhaps because your distribution possibly doesn't do this for you); if the entry is there, but you do not have a <guimenuitem
->KNode</guimenuitem
-> item in it, you should try to open a &konsole; and run &knode; from there. Type</para>
-
-<screen
-><prompt
->%</prompt
-> <userinput
-><command
->knode &amp;</command
-></userinput
->
-</screen
-> 
-
-<para
->If an error message appears that tells you that &knode; could not be started or found please check whether the file <filename
->knode</filename
-> exists in <filename class="directory"
->$<envar
->TDEDIR</envar
->/bin</filename
-> and that its permissions are correctly set.</para>
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->When I start &knode;, a message appears in the task bar but suddenly disappears without &knode; being started.</para
-> 
-</question
-> 
+<para>I have installed &kde; 3, but &knode; does not exist in the <guimenu>K</guimenu> Menu.</para>
+ </question> 
+<answer> 
+<para>Does the <guisubmenu>Internet</guisubmenu>entry exist? If not, maybe the tdenetwork package isn't installed (perhaps because your distribution possibly doesn't do this for you); if the entry is there, but you do not have a <guimenuitem>KNode</guimenuitem> item in it, you should try to open a &konsole; and run &knode; from there. Type</para>
+
+<screen><prompt>%</prompt> <userinput><command>knode &amp;</command></userinput>
+</screen> 
+
+<para>If an error message appears that tells you that &knode; could not be started or found please check whether the file <filename>knode</filename> exists in <filename class="directory">$<envar>TDEDIR</envar>/bin</filename> and that its permissions are correctly set.</para>
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>When I start &knode;, a message appears in the task bar but suddenly disappears without &knode; being started.</para> 
+</question> 
 <answer>
-<para
->Try to start &knode; from the &konsole; (see previous question) and keep attention for the messages displayed there: if they do not make sense to you mark them with your mouse and copy it to the clipboard; then, ask for help on one of the &kde; mailing lists or &kde; news groups.</para>
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->I need an important article, but &knode; doesn't have it any more; where can I find this article?</para>
-</question
-> 
-<answer
-> 
-<para
->You can find some extensive usenet archives at <ulink url="http://groups.google.com/usenet/"
->groups.google.com</ulink
-> or <ulink url="http://av.com"
->AltaVista</ulink
->; they even contain articles that are several years old.</para
-> 
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->How do I open and read several articles at the same time?</para
-> 
-</question
-> 
-<answer
-> 
-<para
->Open the article with <guimenuitem
->Open in own window</guimenuitem
->.</para
-> 
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->My articles do not appear in the newsgroup.</para>
-</question
-> 
-<answer
-> 
-<para
->When you publish an article it may be some time until your news server has it; wait several hours before you send the article again.</para
-> 
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->I want to keep an article; how do I archive it?</para
-> 
-</question
-> 
-<answer
-> 
-<para
->Choose the article in the article view and then use <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Save</guimenuitem
-></menuchoice
-> to open a file dialogue; you can then save the article to a file. Another possibility is to copy the article to a folder.</para>
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->Some set headers do not appear for several articles in the article window; am I doing something wrong?</para
-> 
-</question
-> 
-<answer
-> 
-<para
->This is not unusual because many headers are optional and often not contained in articles; in this case &knode; does not show those header lines.</para
-> 
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->Sometimes I see an article which refers to other articles but &knode; does not show any references; why is that?</para
-> 
-</question
-> 
-<answer
-> 
-<para
->This happens when somebody posted an article in another news group and checked the option <guilabel
->Followup To</guilabel
->; the article in question is then sent to your news group, but the referring article is absent. In many cases the poster tells the reason for his choice to set a followup.</para>
-</answer
-> 
-</qandaentry
-> 
-
-<qandaentry
-> 
-<question
-> 
-<para
->When I want to answer an article an error message appears telling me that the external editor could not be started, but the editor is correctly set.</para>
-</question
-> 
-<answer
-> 
-<para
->Have a look whether you entered the place-holder for a filename after the editor command; if not, enter it. If you want, for example, to use &kedit; enter <userinput
-><command
->kedit</command
-><token
-> %f</token
-></userinput
-></para>
-<para
->If the <token
->%f</token
-> is absent, your editor cannot be run.</para>
+<para>Try to start &knode; from the &konsole; (see previous question) and keep attention for the messages displayed there: if they do not make sense to you mark them with your mouse and copy it to the clipboard; then, ask for help on one of the &kde; mailing lists or &kde; news groups.</para>
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>I need an important article, but &knode; doesn't have it any more; where can I find this article?</para>
+</question> 
+<answer> 
+<para>You can find some extensive usenet archives at <ulink url="http://groups.google.com/usenet/">groups.google.com</ulink> or <ulink url="http://av.com">AltaVista</ulink>; they even contain articles that are several years old.</para> 
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>How do I open and read several articles at the same time?</para> 
+</question> 
+<answer> 
+<para>Open the article with <guimenuitem>Open in own window</guimenuitem>.</para> 
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>My articles do not appear in the newsgroup.</para>
+</question> 
+<answer> 
+<para>When you publish an article it may be some time until your news server has it; wait several hours before you send the article again.</para> 
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>I want to keep an article; how do I archive it?</para> 
+</question> 
+<answer> 
+<para>Choose the article in the article view and then use <menuchoice><guimenu>File</guimenu><guimenuitem>Save</guimenuitem></menuchoice> to open a file dialogue; you can then save the article to a file. Another possibility is to copy the article to a folder.</para>
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>Some set headers do not appear for several articles in the article window; am I doing something wrong?</para> 
+</question> 
+<answer> 
+<para>This is not unusual because many headers are optional and often not contained in articles; in this case &knode; does not show those header lines.</para> 
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>Sometimes I see an article which refers to other articles but &knode; does not show any references; why is that?</para> 
+</question> 
+<answer> 
+<para>This happens when somebody posted an article in another news group and checked the option <guilabel>Followup To</guilabel>; the article in question is then sent to your news group, but the referring article is absent. In many cases the poster tells the reason for his choice to set a followup.</para>
+</answer> 
+</qandaentry> 
+
+<qandaentry> 
+<question> 
+<para>When I want to answer an article an error message appears telling me that the external editor could not be started, but the editor is correctly set.</para>
+</question> 
+<answer> 
+<para>Have a look whether you entered the place-holder for a filename after the editor command; if not, enter it. If you want, for example, to use &kedit; enter <userinput><command>kedit</command><token> %f</token></userinput></para>
+<para>If the <token>%f</token> is absent, your editor cannot be run.</para>
 </answer>
 </qandaentry>
 
-<qandaentry
-> 
+<qandaentry> 
 <question>
-<para
->Why can I not receive data from my local news server?</para>
-</question
-> 
-<answer
-> 
-<para
->If you use &knode; together with with a local news server, you must make sure that this server is correctly set up and started; for further details, please consult the documentation of your local news server.</para>
-<tip
-> 
-<para
->The availability of the local news server can easily be verified with the <command
->telnet</command
-> program: open a console and type:</para
-> 
+<para>Why can I not receive data from my local news server?</para>
+</question> 
+<answer> 
+<para>If you use &knode; together with with a local news server, you must make sure that this server is correctly set up and started; for further details, please consult the documentation of your local news server.</para>
+<tip> 
+<para>The availability of the local news server can easily be verified with the <command>telnet</command> program: open a console and type:</para> 
  
-<screen
-><prompt
->%</prompt
-> <userinput
-><command
->telnet</command
-> <parameter
->localhost nntp</parameter
-></userinput
->
+<screen><prompt>%</prompt> <userinput><command>telnet</command> <parameter>localhost nntp</parameter></userinput>
 </screen>
 
-<para
->Followed by that, the news server should respond with:</para>
+<para>Followed by that, the news server should respond with:</para>
 
-<screen
-><computeroutput>
+<screen><computeroutput>
 Trying 127.0.0.1...
 Connected to localhost.
 Escape character is '^]'.
 200 Leafnode NNTP Daemon, version 1.9.16 running at konqi.org
-</computeroutput
->
+</computeroutput>
 </screen>
 
-<para
->You can quit the <command
->telnet</command
-> session with:</para>
+<para>You can quit the <command>telnet</command> session with:</para>
 
-<screen
-><prompt
->%</prompt
-> <userinput
->quit</userinput
->
+<screen><prompt>%</prompt> <userinput>quit</userinput>
 </screen>
 
-<para
->If that does not work there is either no local news server set up or the server was not started; in this case, please consult the documentation of your local news server.</para>
+<para>If that does not work there is either no local news server set up or the server was not started; in this case, please consult the documentation of your local news server.</para>
 </tip>
 
-<para
->If you are trying to connect to a news server on the Internet you need, of course, an open (dial-in) connection and to have set up &knode; to use your <acronym
->ISP</acronym
->'s news server; your <acronym
->ISP</acronym
-> should be able to give you information about which news servers you can use.</para>
+<para>If you are trying to connect to a news server on the Internet you need, of course, an open (dial-in) connection and to have set up &knode; to use your <acronym>ISP</acronym>'s news server; your <acronym>ISP</acronym> should be able to give you information about which news servers you can use.</para>
 </answer>
 </qandaentry>
 
-</qandaset
-> 
+</qandaset> 
 
 
-</chapter
-> 
+</chapter> 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/gloss.docbook b/tde-i18n-en_GB/docs/tdepim/knode/gloss.docbook
index 32628779b1f..ced5789ab35 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/gloss.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/gloss.docbook
@@ -1,425 +1,205 @@
 <glossary id="glossary">
-<title
->Glossary</title>
+<title>Glossary</title>
 
 <glossdiv>
-<title
->A</title
-> 
-<glossentry id="gloss-article"
-> 
-<glossterm
->Article</glossterm
-> 
-<glossdef
-> 
-<para
->An <glossterm
->article</glossterm
-> in the sense of newspapers: special <glossterm
->articles</glossterm
-> are, for example, followups; replies are not <glossterm
->articles</glossterm
-> but Email.</para>
-</glossdef
-> 
-</glossentry
-> 
+<title>A</title> 
+<glossentry id="gloss-article"> 
+<glossterm>Article</glossterm> 
+<glossdef> 
+<para>An <glossterm>article</glossterm> in the sense of newspapers: special <glossterm>articles</glossterm> are, for example, followups; replies are not <glossterm>articles</glossterm> but Email.</para>
+</glossdef> 
+</glossentry> 
 </glossdiv>
 
-<glossdiv
-> 
-<title
->C</title
-> 
+<glossdiv> 
+<title>C</title> 
 
 <glossentry id="gloss-cancel">
-<glossterm
->Cancelling</glossterm>
+<glossterm>Cancelling</glossterm>
 <glossdef>
-<para
->To delete one of your articles from the newsserver: the newsreader generates a special control message to tell the server to delete this article.</para>
+<para>To delete one of your articles from the newsserver: the newsreader generates a special control message to tell the server to delete this article.</para>
 </glossdef>
 </glossentry>
 
 <glossentry id="gloss-crossposting">
-<glossterm
->Crossposting</glossterm
-> 
+<glossterm>Crossposting</glossterm> 
 <glossdef>
-<para
->The posting of an article in several newsgroups; this is very often disliked, because it disturbs the topic-oriented association of the newsgroups.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->E</title>
+<para>The posting of an article in several newsgroups; this is very often disliked, because it disturbs the topic-oriented association of the newsgroups.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>E</title>
 
 <glossentry id="gloss-expire">
-<glossterm
->Expire</glossterm
-> 
-<glossdef
-> 
-<para
-><glossterm
->Articles</glossterm
-> can not be held for eternity because of harddisk limits. Because of this there is usually a program called <application
->expire</application
-> on most computer systems; this program deletes all articles which are older than a configured number of days. &knode; includes this functionality on its own.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->F</title
-> 
+<glossterm>Expire</glossterm> 
+<glossdef> 
+<para><glossterm>Articles</glossterm> can not be held for eternity because of harddisk limits. Because of this there is usually a program called <application>expire</application> on most computer systems; this program deletes all articles which are older than a configured number of days. &knode; includes this functionality on its own.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>F</title> 
 <glossentry id="gloss-faq">
-<glossterm
-><acronym
->FAQ</acronym
-></glossterm
-> 
+<glossterm><acronym>FAQ</acronym></glossterm> 
 <glossdef>
-<para
-><acronym
->FAQ</acronym
-> is the acronym for <quote
->Frequently Asked Questions</quote
->.</para>
-</glossdef
-> 
-</glossentry
-> 
+<para><acronym>FAQ</acronym> is the acronym for <quote>Frequently Asked Questions</quote>.</para>
+</glossdef> 
+</glossentry> 
 
 <glossentry id="gloss-follow-up">
-<glossterm
->Followup</glossterm>
-<glossdef
-> 
-<para
->An <glossterm
->article</glossterm
-> which is written as an answer to another <glossterm
->article</glossterm
->.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->G</title
-> 
+<glossterm>Followup</glossterm>
+<glossdef> 
+<para>An <glossterm>article</glossterm> which is written as an answer to another <glossterm>article</glossterm>.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>G</title> 
 <glossentry id="gloss-gknsa">
-<glossterm
-><acronym
->GNKSA</acronym
-></glossterm>
+<glossterm><acronym>GNKSA</acronym></glossterm>
 <glossdef>
-<para
-><acronym
->GNKSA</acronym
-> is a kind of seal-of-approval for newsreaders; you can get more information at <ulink url="http://www.gnksa.org"
->http://www.gnksa.org</ulink
->.</para>
-</glossdef
-> 
-</glossentry
-> 
+<para><acronym>GNKSA</acronym> is a kind of seal-of-approval for newsreaders; you can get more information at <ulink url="http://www.gnksa.org">http://www.gnksa.org</ulink>.</para>
+</glossdef> 
+</glossentry> 
 </glossdiv>
 
-<glossdiv
-> 
-<title
->H</title
-> 
+<glossdiv> 
+<title>H</title> 
 <glossentry id="gloss-header">
-<glossterm
->Header</glossterm>
+<glossterm>Header</glossterm>
 <glossdef>
-<para
->The Header of an <glossterm
->article</glossterm
-> contains information about the sender, the subject, and the newsgroup of the article.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->K</title
-> 
+<para>The Header of an <glossterm>article</glossterm> contains information about the sender, the subject, and the newsgroup of the article.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>K</title> 
 <glossentry id="gloss-killfile">
-<glossterm
->Killfile</glossterm
-> 
-<glossdef
-> 
-<para
->This is a functionality of a newsreader to hide <glossterm
->articles</glossterm
-> of a determined sender or with certain contents.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->M</title
-> 
+<glossterm>Killfile</glossterm> 
+<glossdef> 
+<para>This is a functionality of a newsreader to hide <glossterm>articles</glossterm> of a determined sender or with certain contents.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>M</title> 
 <glossentry id="gloss-message-id">
-<glossterm
->Message-ID</glossterm
-> 
-<glossdef
-> 
-
-<para
->The <glossterm
->Message-ID</glossterm
-> of an article is a clear mark for the newsserver to identify the article. A <glossterm
->Message-ID</glossterm
-> should not be used twice in the whole usenet for about 2 years; wrong or double <glossterm
->Message-IDs</glossterm
-> could cause problems when forwarding them and could overwrite other articles.</para>
-</glossdef
-> 
+<glossterm>Message-ID</glossterm> 
+<glossdef> 
+
+<para>The <glossterm>Message-ID</glossterm> of an article is a clear mark for the newsserver to identify the article. A <glossterm>Message-ID</glossterm> should not be used twice in the whole usenet for about 2 years; wrong or double <glossterm>Message-IDs</glossterm> could cause problems when forwarding them and could overwrite other articles.</para>
+</glossdef> 
 </glossentry>
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->N</title
-> 
+</glossdiv> 
+
+<glossdiv> 
+<title>N</title> 
 <glossentry id="gloss-newbie">
-<glossterm
->Newbie</glossterm
-> 
-<glossdef
-> 
-<para
->Somebody who is new somewhere, in relationship to usenet: somebody who is new to the newsgroup, or new to usenet in general.</para>
-</glossdef
-> 
-</glossentry
-> 
+<glossterm>Newbie</glossterm> 
+<glossdef> 
+<para>Somebody who is new somewhere, in relationship to usenet: somebody who is new to the newsgroup, or new to usenet in general.</para>
+</glossdef> 
+</glossentry> 
 
 <glossentry id="gloss-newsgroup">
-<glossterm
->Newsgroup</glossterm
-> 
-<glossdef
-> 
-<para
->A kind-of bulletin board in the usenet about a special topic or a group of topics. This is where you post your <glossterm
->articles</glossterm
->.</para>
-</glossdef
-> 
-</glossentry
-> 
-
-<glossentry id="gloss-newsreader"
-> 
-<glossterm
->Newsreader</glossterm
-> 
-<glossdef
-> 
-<para
->A program for reading and writing <glossterm
->news</glossterm
->.</para
-> 
-</glossdef
-> 
-</glossentry
-> 
-
-<glossentry id="gloss-nntp"
-> <glossterm>
-<acronym
-><acronym
->NNTP</acronym
-></acronym
-> 
-</glossterm
-> 
+<glossterm>Newsgroup</glossterm> 
+<glossdef> 
+<para>A kind-of bulletin board in the usenet about a special topic or a group of topics. This is where you post your <glossterm>articles</glossterm>.</para>
+</glossdef> 
+</glossentry> 
+
+<glossentry id="gloss-newsreader"> 
+<glossterm>Newsreader</glossterm> 
+<glossdef> 
+<para>A program for reading and writing <glossterm>news</glossterm>.</para> 
+</glossdef> 
+</glossentry> 
+
+<glossentry id="gloss-nntp"> <glossterm>
+<acronym><acronym>NNTP</acronym></acronym> 
+</glossterm> 
 <glossdef>
-<para
->Network News Transport Protocol; this is the protocol which defines how the articles in the usenet are spread.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->P</title
-> 
+<para>Network News Transport Protocol; this is the protocol which defines how the articles in the usenet are spread.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>P</title> 
 
 <glossentry id="gloss-port">
-<glossterm
->Port</glossterm>
-<glossdef
-> 
-<para
->A kind-of address for the application to listen for data on and for connecting to another computer; the standard-port for the connection between the newsreader and the newsserver is 119.</para>
-</glossdef
-> 
-</glossentry
-> 
+<glossterm>Port</glossterm>
+<glossdef> 
+<para>A kind-of address for the application to listen for data on and for connecting to another computer; the standard-port for the connection between the newsreader and the newsserver is 119.</para>
+</glossdef> 
+</glossentry> 
 
 <glossentry id="gloss-pgp-signature">
-<glossterm
->PGP-Signature</glossterm
-> 
+<glossterm>PGP-Signature</glossterm> 
 <glossdef>
-<para
->A digital signature; you can use it to determine whether the document has been changed since it was signed or if it is the original text from the author.</para>
-</glossdef
-> 
-</glossentry
-> 
+<para>A digital signature; you can use it to determine whether the document has been changed since it was signed or if it is the original text from the author.</para>
+</glossdef> 
+</glossentry> 
 
 <glossentry id="gloss-posting">
-<glossterm
->Posting</glossterm
-> 
-<glossdef
-> 
-<para
->Either an <glossterm
->article</glossterm
-> which is sent to usenet or the act of sending itself; you are <quote
->posting</quote
-> an <glossterm
->article</glossterm
-> into a newsgroup.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->Q</title
-> 
+<glossterm>Posting</glossterm> 
+<glossdef> 
+<para>Either an <glossterm>article</glossterm> which is sent to usenet or the act of sending itself; you are <quote>posting</quote> an <glossterm>article</glossterm> into a newsgroup.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>Q</title> 
 
 <glossentry id="gloss-quoting">
-<glossterm
->Quoting</glossterm
-> 
-<glossdef
-> 
-<para
->This is the act of citing of an article to which you are answering: you quote the original <glossterm
->article</glossterm
-> to make clear which passages of text your answer refers to.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->R</title
-> 
+<glossterm>Quoting</glossterm> 
+<glossdef> 
+<para>This is the act of citing of an article to which you are answering: you quote the original <glossterm>article</glossterm> to make clear which passages of text your answer refers to.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>R</title> 
 <glossentry id="gloss-reply">
 
-<glossterm
->Reply</glossterm
-> 
-<glossdef
-> 
-<para
->A <glossterm
->reply</glossterm
-> is an answer to the author of an article by e-mail.</para>
-</glossdef
-> 
-</glossentry
-> 
-</glossdiv
-> 
-
-<glossdiv
-> 
-<title
->S</title
-> 
+<glossterm>Reply</glossterm> 
+<glossdef> 
+<para>A <glossterm>reply</glossterm> is an answer to the author of an article by e-mail.</para>
+</glossdef> 
+</glossentry> 
+</glossdiv> 
+
+<glossdiv> 
+<title>S</title> 
 
 <glossentry id="gloss-scoring">
-<glossterm
->Scoring</glossterm>
+<glossterm>Scoring</glossterm>
 <glossdef>
 
-<para
->This is the valuation of an article or a thread.</para>
+<para>This is the valuation of an article or a thread.</para>
 </glossdef>
 </glossentry>
 
 <glossentry id="gloss-signature">
-<glossterm
->Signature</glossterm>
+<glossterm>Signature</glossterm>
 <glossdef>
-<para
->A <glossterm
->signature</glossterm
-> is a personal sign of the author which is attached at the end of the normal contents of the article; it is like a visiting card &mdash; very often there are e-mail addresses, a homepage <acronym
->URL</acronym
-> or other personal data. The <glossterm
->signature</glossterm
-> should not be longer than 4 lines. Note that the <glossterm
->signature</glossterm
-> should not be mixed up with the <glossterm
->PGP-signature</glossterm
->.</para>
+<para>A <glossterm>signature</glossterm> is a personal sign of the author which is attached at the end of the normal contents of the article; it is like a visiting card &mdash; very often there are e-mail addresses, a homepage <acronym>URL</acronym> or other personal data. The <glossterm>signature</glossterm> should not be longer than 4 lines. Note that the <glossterm>signature</glossterm> should not be mixed up with the <glossterm>PGP-signature</glossterm>.</para>
 </glossdef>
 </glossentry>
 
 <glossentry id="gloss-supersede">
-<glossterm
->Supersede</glossterm>
+<glossterm>Supersede</glossterm>
 <glossdef>
 
-<para
->This is the overwriting of an existing article: the newsreader generates a special article with a control message in the header which tells the newsserver to overwrite the existing article with this one.</para>
+<para>This is the overwriting of an existing article: the newsreader generates a special article with a control message in the header which tells the newsserver to overwrite the existing article with this one.</para>
 
 </glossdef>
 </glossentry>
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/index.docbook b/tde-i18n-en_GB/docs/tdepim/knode/index.docbook
index b633badab40..f0db65fc294 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/index.docbook
@@ -1,8 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
  <!ENTITY kappname "&knode;">
- <!ENTITY package "tdepim"
-> 
+ <!ENTITY package "tdepim"> 
  <!ENTITY introduction SYSTEM "introduction.docbook">
  <!ENTITY commands SYSTEM "commands.docbook">
  <!ENTITY faq SYSTEM "faq.docbook">
@@ -20,168 +19,68 @@
 
 <!--TODO: PGP-Option for encoding?
     Exchange german links (find "(german" )
-    Maybe complete the <accels
-> of the menus
+    Maybe complete the <accels> of the menus
     After that set version to 0.7.1 -->
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &knode; manual</title>
+<title>The &knode; manual</title>
 
 <authorgroup>
-<author
-><firstname
->Stephan</firstname
-><surname
->Johach</surname
-> <affiliation
-><address
-><email
->lucardus@onlinehome.de</email
-></address>
+<author><firstname>Stephan</firstname><surname>Johach</surname> <affiliation><address><email>lucardus@onlinehome.de</email></address>
 </affiliation>
 </author>
 
-<author
-><firstname
-> Thomas</firstname
-> <surname
->Schûtz</surname
-> <affiliation
-> <address
-> <email
->Thomas.Schuetz@gmx.li</email
-> </address>
+<author><firstname> Thomas</firstname> <surname>Schûtz</surname> <affiliation> <address> <email>Thomas.Schuetz@gmx.li</email> </address>
 </affiliation>
 </author>
 
-<othercredit role="developer"
-><firstname
-> Christian</firstname
-> <surname
-> Gebauer</surname
-> <contrib
->Developer and maintainer</contrib>
-<affiliation
-> <address
-> <email
->gebauer@kde.org</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Christian</firstname> <surname> Gebauer</surname> <contrib>Developer and maintainer</contrib>
+<affiliation> <address> <email>gebauer@kde.org</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Christian</firstname
-> <surname
-> Thurner</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->cthurner@web.de</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Christian</firstname> <surname> Thurner</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>cthurner@web.de</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Dirk</firstname
-> <surname
-> Mueller</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->mueller@kde.org</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Dirk</firstname> <surname> Mueller</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>mueller@kde.org</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Mark</firstname
-> <surname
-> Mutz</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->mutz@kde.org</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Mark</firstname> <surname> Mutz</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>mutz@kde.org</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Roberto</firstname
-> <surname
-> Teixeira</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->roberto@kde.org</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Roberto</firstname> <surname> Teixeira</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>roberto@kde.org</email> </address> </affiliation>
 </othercredit>
 
-<othercredit role="developer"
-><firstname
-> Mathias</firstname
-> <surname
-> Waack</surname
-> <contrib
->Developer</contrib>
-<affiliation
-> <address
-> <email
->mathias@atoll-net.de</email
-> </address
-> </affiliation>
+<othercredit role="developer"><firstname> Mathias</firstname> <surname> Waack</surname> <contrib>Developer</contrib>
+<affiliation> <address> <email>mathias@atoll-net.de</email> </address> </affiliation>
 </othercredit>
 
 </authorgroup>
 
 <copyright>
-<year
-> 2000</year
-><year
->2001</year
-><year
->2002</year>
-<holder
->Stephan Johach</holder>
-<holder
->Thomas Schütz</holder>
+<year> 2000</year><year>2001</year><year>2002</year>
+<holder>Stephan Johach</holder>
+<holder>Thomas Schütz</holder>
 </copyright>
 
-<date
->2002-04-13</date>
-<releaseinfo
->0.07.00</releaseinfo>
+<date>2002-04-13</date>
+<releaseinfo>0.07.00</releaseinfo>
 
 <!-- Abstract about this handbook -->
 
 <abstract>
-<para
->&knode; is an easy-to-use newsreader.</para>
+<para>&knode; is an easy-to-use newsreader.</para>
 </abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->KNode</keyword>
-<keyword
->tdenetwork</keyword>
-<keyword
->newsreader</keyword>
+<keyword>KDE</keyword>
+<keyword>KNode</keyword>
+<keyword>tdenetwork</keyword>
+<keyword>newsreader</keyword>
 </keywordset>
 </bookinfo>
 
@@ -189,11 +88,8 @@
 
 <!-- Using chapter is too big to put in one of it's own, so breaking down to sect1 level -->
 
-<chapter id="using-knode"
-> 
-<title
->Working with &knode;</title
-> &using-firststart; &using-subscribing; &using-morefeatures; </chapter>
+<chapter id="using-knode"> 
+<title>Working with &knode;</title> &using-firststart; &using-subscribing; &using-morefeatures; </chapter>
 
 &commands;
 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/install.docbook b/tde-i18n-en_GB/docs/tdepim/knode/install.docbook
index cf090ca7246..b8ffb1d4fb2 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/install.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/install.docbook
@@ -1,59 +1,34 @@
-<appendix id="installation"
-> 
-<title
->Installation</title
-> 
-
-<sect1 id="getting-knode"
-> 
-<title
->Where do I get &knode;?</title
-> &install.intro.documentation; </sect1
-> 
-
-<sect1 id="requirements"
-> 
-<title
->Requirements</title
-> 
+<appendix id="installation"> 
+<title>Installation</title> 
+
+<sect1 id="getting-knode"> 
+<title>Where do I get &knode;?</title> &install.intro.documentation; </sect1> 
+
+<sect1 id="requirements"> 
+<title>Requirements</title> 
 <anchor id="anc-requirements"/> 
 
-<para
->If you want to successfully install &knode;, you need &kde; 3.x; if, in addition, you want to use &knode; as an offline newsreader, you need a local news server, &eg; <ulink url="http://www.leafnode.org"
-><application
->leafnode</application
-></ulink
->.</para>
-</sect1
-> 
+<para>If you want to successfully install &knode;, you need &kde; 3.x; if, in addition, you want to use &knode; as an offline newsreader, you need a local news server, &eg; <ulink url="http://www.leafnode.org"><application>leafnode</application></ulink>.</para>
+</sect1> 
 
 <sect1 id="compilation">
-<title
->Compile and install</title>
+<title>Compile and install</title>
 
-<para
->&knode; is part of the tdenetwork package of &kde; 3.x and is installed together with it, provided you have chosen to install the tdenetwork package; so, in general, there is no need for a user to compile the sources of &knode;.</para>
+<para>&knode; is part of the tdenetwork package of &kde; 3.x and is installed together with it, provided you have chosen to install the tdenetwork package; so, in general, there is no need for a user to compile the sources of &knode;.</para>
 &install.compile.documentation; </sect1>
 
 <sect1 id="update-installation">
-<title
->Notes about updating an older version of &knode;</title>
+<title>Notes about updating an older version of &knode;</title>
 
-<para
->This section contains notes about what to take care of when installing a newer version of &knode; with an older version already installed.</para>
+<para>This section contains notes about what to take care of when installing a newer version of &knode; with an older version already installed.</para>
 
 <sect2 id="update-file-changes">
-<title
->Changes in configuration files and folders</title>
+<title>Changes in configuration files and folders</title>
 
-<para
->Since version 0.2 the format of the configuration files and the saved articles has changed, so unfortunately, your old configuration files cannot be imported.</para>
+<para>Since version 0.2 the format of the configuration files and the saved articles has changed, so unfortunately, your old configuration files cannot be imported.</para>
 
-<para
->If you update from a version 
->= 0.4 the local folders will automatically be converted into the new format; you will then be unable to use the data with an older version of &knode; any more.</para>
+<para>If you update from a version >= 0.4 the local folders will automatically be converted into the new format; you will then be unable to use the data with an older version of &knode; any more.</para>
 </sect2>
 
 </sect1>
-</appendix
-> 
\ No newline at end of file
+</appendix> 
\ No newline at end of file
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook b/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook
index 5314b187e1d..36d662df074 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/introduction.docbook
@@ -1,61 +1,31 @@
 <!-- <?xml version="1.0" ?> 
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
-> -->
-<chapter id="introduction"
-> 
-<title
->Introduction</title
-> 
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"> -->
+<chapter id="introduction"> 
+<title>Introduction</title> 
 <anchor id="anc-introduction"/> 
 
-<para
->&knode; is an easy-to-use, convenient newsreader; it is intended to allow even newbies to use a newsreader under &kde;, but it also offers advanced features appealing to experienced users. &knode; is a online-reader but could work together with a newsserver like <application
->leafnode</application
-> as an offline-reader.</para>
+<para>&knode; is an easy-to-use, convenient newsreader; it is intended to allow even newbies to use a newsreader under &kde;, but it also offers advanced features appealing to experienced users. &knode; is a online-reader but could work together with a newsserver like <application>leafnode</application> as an offline-reader.</para>
 
-<para
->As of version 0.4 &knode; complies with all the requirements of the <glossterm
->GNKSA</glossterm
->.</para>
+<para>As of version 0.4 &knode; complies with all the requirements of the <glossterm>GNKSA</glossterm>.</para>
 
-<para
->If you have problems or questions about this program, please contact the mailing list for &kde; users (for subscription, see<ulink url="http://www.kde.org/contact.html"
->Homepage of the &kde; mailing lists</ulink
-> ) or one of the &kde; newsgroups:</para>
+<para>If you have problems or questions about this program, please contact the mailing list for &kde; users (for subscription, see<ulink url="http://www.kde.org/contact.html">Homepage of the &kde; mailing lists</ulink> ) or one of the &kde; newsgroups:</para>
 
 <simplelist>
-<member
->comp.windows.x.kde</member>
-<member
->de.comp.os.unix.apps.kde (german)</member>
+<member>comp.windows.x.kde</member>
+<member>de.comp.os.unix.apps.kde (german)</member>
 </simplelist>
 
-<para
->If you have found a bug or have suggestions regarding the functionality of &knode; please report them via the <menuchoice
-><guimenu
->Help</guimenu
-><guimenuitem
->Report bug...</guimenuitem
-></menuchoice
-> menu.</para>
-
-<para
->Please make sure when asking questions in the newsgroups and mailing lists mentioned above that the question you are asking is not answered in this manual.</para>
-
-<para
->For those new to reading news and posting articles, the <link linkend="knode-journey"
->A journey through Usenet</link
-> chapter is recommended; it is not so much about &knode; as how to move about in the Usenet with its help. In general, it is not sufficient to just master a news reader for writing news articles: imagine a car driver who masters his car perfectly but does not know about the traffic rules or signs; do you want to encounter such a driver when out in traffic? So please take your time to learn at least a little about the <quote
->traffic rules</quote
-> of the Usenet; the other participants will thank you.</para>
+<para>If you have found a bug or have suggestions regarding the functionality of &knode; please report them via the <menuchoice><guimenu>Help</guimenu><guimenuitem>Report bug...</guimenuitem></menuchoice> menu.</para>
+
+<para>Please make sure when asking questions in the newsgroups and mailing lists mentioned above that the question you are asking is not answered in this manual.</para>
+
+<para>For those new to reading news and posting articles, the <link linkend="knode-journey">A journey through Usenet</link> chapter is recommended; it is not so much about &knode; as how to move about in the Usenet with its help. In general, it is not sufficient to just master a news reader for writing news articles: imagine a car driver who masters his car perfectly but does not know about the traffic rules or signs; do you want to encounter such a driver when out in traffic? So please take your time to learn at least a little about the <quote>traffic rules</quote> of the Usenet; the other participants will thank you.</para>
 
 <tip>
-<para
->&knode; supports you in many cases with hints and warnings: if you do not simply ignore them you will avoid many beginners' mistakes; but, do not exclusively depend on them either.</para>
+<para>&knode; supports you in many cases with hints and warnings: if you do not simply ignore them you will avoid many beginners' mistakes; but, do not exclusively depend on them either.</para>
 </tip>
 
-<para
->Please address suggestions and criticisms at the author or at the responsible translator for your language.</para>
+<para>Please address suggestions and criticisms at the author or at the responsible translator for your language.</para>
 
 </chapter>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook b/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook
index e1141d9136c..5b6d3b6223f 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/journey.docbook
@@ -1,574 +1,376 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
-> -->
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"> -->
 
-<chapter id="knode-journey"
-> 
-<title
->A journey in the World of Newsgroups</title
-> 
+<chapter id="knode-journey"> 
+<title>A journey in the World of Newsgroups</title> 
 
 <anchor id="anc-knode-journey"/> 
 
-<para
->This chapter is supposed to be glance over the World of Newsgroups and their <quote
->inhabitants</quote
->; someone who has never dared to go there before will encounter some strange customs, which may give you a feeling of being a lonely alien without backup; but stay calm, it is not like this. The Usenet is a meeting place for all kinds of normal and not-so-normal folks; it is here where they are distributing a lot of information but also gossip and other stuff.</para>
-
-<tip
-> 
-<para
->References to more detailed and qualified essays on the Usenet can be found at <link linkend="knode-more-info"
->More Resources</link
-></para>
-</tip
-> 
-
-<sect1 id="about-news"
-> 
-<title
->What are ...</title
-> 
+<para>This chapter is supposed to be glance over the World of Newsgroups and their <quote>inhabitants</quote>; someone who has never dared to go there before will encounter some strange customs, which may give you a feeling of being a lonely alien without backup; but stay calm, it is not like this. The Usenet is a meeting place for all kinds of normal and not-so-normal folks; it is here where they are distributing a lot of information but also gossip and other stuff.</para>
+
+<tip> 
+<para>References to more detailed and qualified essays on the Usenet can be found at <link linkend="knode-more-info">More Resources</link></para>
+</tip> 
+
+<sect1 id="about-news"> 
+<title>What are ...</title> 
 <anchor id="anc-about-news"/>
 
-<sect2
-> 
-<title
->... online-readers?</title
-> 
+<sect2> 
+<title>... online-readers?</title> 
 
-<para
->An online-reader connects to a newsserver and gives you access to its content. &knode; is an online-reader: you are reading your News and publishing your own <glossterm
->articles</glossterm
-> while the online-reader stays connected.</para>
+<para>An online-reader connects to a newsserver and gives you access to its content. &knode; is an online-reader: you are reading your News and publishing your own <glossterm>articles</glossterm> while the online-reader stays connected.</para>
 
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->... offline-readers?</title
-> 
+<sect2> 
+<title>... offline-readers?</title> 
 
-<para
->An offline-reader connects to the Server and fetches only the headers of new articles; then, the connection is closed and you can mark (offline) the articles you are really interested in. When you connect next time the offline-reader fetches the articles you marked and sends the articles you have written whilst offline.</para>
+<para>An offline-reader connects to the Server and fetches only the headers of new articles; then, the connection is closed and you can mark (offline) the articles you are really interested in. When you connect next time the offline-reader fetches the articles you marked and sends the articles you have written whilst offline.</para>
 
-<para
->There is no connection while you are reading or writing articles.</para>
+<para>There is no connection while you are reading or writing articles.</para>
 
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->... newsgroups?</title
-> 
+<sect2> 
+<title>... newsgroups?</title> 
 
-<para
->You can look at newsgroups as public bulletin boards and forums, where everybody is allowed to participate. Articles you have published in a newsgroup can be read by everybody subscribed to this newsgroup and, normally, everybody is allowed to publish their articles in a newsgroup.</para>
+<para>You can look at newsgroups as public bulletin boards and forums, where everybody is allowed to participate. Articles you have published in a newsgroup can be read by everybody subscribed to this newsgroup and, normally, everybody is allowed to publish their articles in a newsgroup.</para>
 
-</sect2
-> 
+</sect2> 
 
 <sect2>
-<title
->... news?</title
-> 
+<title>... news?</title> 
 
-<para
->News is the collective term for articles published in a newsgroup.</para
-> 
+<para>News is the collective term for articles published in a newsgroup.</para> 
 
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->... threads?</title
-> 
+<sect2> 
+<title>... threads?</title> 
 
-<para
->A thread is a topic of discussion in a newsgroup.</para>
+<para>A thread is a topic of discussion in a newsgroup.</para>
 
-</sect2
-> 
-</sect1
-> 
+</sect2> 
+</sect1> 
 
-<sect1 id="nettiquette"
-> 
-<title
->Online Manners</title
-> 
+<sect1 id="nettiquette"> 
+<title>Online Manners</title> 
 
 <anchor id="anc-nettiquette"/> 
 
-<para
->There are lot of different people meeting and talking in newsgroups; it is seen as some kind of courtesy to obey some rules of manner, the basics of which are listed here.</para>
-
-<orderedlist
-> 
-<listitem
-> 
-<para
->Before you ask questions be sure you have read the newsgroup's <acronym
->FAQ</acronym
-> (Frequently Asked Questions) and didn't find the answer.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->If you take part in a discussion be aware of the fact that everybody can read the answer: do not say anything that you would not say to the others if you were facing them; avoid insults.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->Try to avoid crossposting: do not ask a question in more than one newsgroup when you do not know which is the right one. Ask in one newsgroup; if it is wrong, you will be told which is right one.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->Formulate your articles accurately; nobody likes to read an article with lots of typos, even with content worth a Pulitzer. Think of your articles as letters: your letter speaks for you; it represents you; somebody reading your article will draw conclusions about you from it, wrong or right.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->Remember, nobody sees your grin when you are writing an ironic sentence: it may be funny for you, but it can be very serious for the person reading it. It is very difficult to include emotions in an article.</para>
-</listitem
-> 
-<listitem
-> 
-<para
->The most important rule: use your common sense when you are answering or publishing an article.</para>
-</listitem
-> 
-</orderedlist
-> 
-
-</sect1
-> 
-
-<sect1 id="usenet-slang"
-> 
-<title
->The Usenet language</title
-> 
+<para>There are lot of different people meeting and talking in newsgroups; it is seen as some kind of courtesy to obey some rules of manner, the basics of which are listed here.</para>
+
+<orderedlist> 
+<listitem> 
+<para>Before you ask questions be sure you have read the newsgroup's <acronym>FAQ</acronym> (Frequently Asked Questions) and didn't find the answer.</para>
+</listitem> 
+<listitem> 
+<para>If you take part in a discussion be aware of the fact that everybody can read the answer: do not say anything that you would not say to the others if you were facing them; avoid insults.</para>
+</listitem> 
+<listitem> 
+<para>Try to avoid crossposting: do not ask a question in more than one newsgroup when you do not know which is the right one. Ask in one newsgroup; if it is wrong, you will be told which is right one.</para>
+</listitem> 
+<listitem> 
+<para>Formulate your articles accurately; nobody likes to read an article with lots of typos, even with content worth a Pulitzer. Think of your articles as letters: your letter speaks for you; it represents you; somebody reading your article will draw conclusions about you from it, wrong or right.</para>
+</listitem> 
+<listitem> 
+<para>Remember, nobody sees your grin when you are writing an ironic sentence: it may be funny for you, but it can be very serious for the person reading it. It is very difficult to include emotions in an article.</para>
+</listitem> 
+<listitem> 
+<para>The most important rule: use your common sense when you are answering or publishing an article.</para>
+</listitem> 
+</orderedlist> 
+
+</sect1> 
+
+<sect1 id="usenet-slang"> 
+<title>The Usenet language</title> 
 <anchor id="anc-usenet-slang"/> 
 
-<para
->You will not be surprised about English being the main language on the Usenet; however, there are special trees for German (de.*), French (fr.*) and many other languages. If you are unable to determine the main language of a newsgroup the only possibility is careful listening or a possible explanation in the description of the group in the grouplist.</para>
+<para>You will not be surprised about English being the main language on the Usenet; however, there are special trees for German (de.*), French (fr.*) and many other languages. If you are unable to determine the main language of a newsgroup the only possibility is careful listening or a possible explanation in the description of the group in the grouplist.</para>
 
-<para
->In addition, over the time the Usenet has developed its own language but it is easy to learn.</para>
+<para>In addition, over the time the Usenet has developed its own language but it is easy to learn.</para>
 
-<sect2
-> 
-<title
-><acronym
->RTFM</acronym
-> and other typos</title
-> 
+<sect2> 
+<title><acronym>RTFM</acronym> and other typos</title> 
 
-<para
->When you read news, after some time you will read some strange combinations of letters; for example, you can get a reply like:</para>
+<para>When you read news, after some time you will read some strange combinations of letters; for example, you can get a reply like:</para>
 
-<para
->RTFM</para
-> 
+<para>RTFM</para> 
 
-<para
->Nothing else. Strange, but absolutely intended; to solve the riddle: those, most of the time, are shortcuts, acronyms. It is easier to drop some letters than to write the same sentence over and over again.</para>
+<para>Nothing else. Strange, but absolutely intended; to solve the riddle: those, most of the time, are shortcuts, acronyms. It is easier to drop some letters than to write the same sentence over and over again.</para>
 
-<para
->But what is the meaning of <acronym
->RTFM</acronym
->? The writer is asking you to read the manual, documentation or <acronym
->FAQ</acronym
-> before asking questions in the newsgroup. It stands for: (R)ead (T)he (F)...ing (M)anual; <acronym
->BTW</acronym
-> this is advice you should adopt.</para>
+<para>But what is the meaning of <acronym>RTFM</acronym>? The writer is asking you to read the manual, documentation or <acronym>FAQ</acronym> before asking questions in the newsgroup. It stands for: (R)ead (T)he (F)...ing (M)anual; <acronym>BTW</acronym> this is advice you should adopt.</para>
 
-<para
->Wait, what is <acronym
->BTW</acronym
-> now? Another often-seen acronym which means (B)y (T)he (W)ay. It is easy when you know it; to avoid you having to continuously speculate over the meaning of acronyms there is table at he end of this section containing the most-often-used acronyms.</para>
+<para>Wait, what is <acronym>BTW</acronym> now? Another often-seen acronym which means (B)y (T)he (W)ay. It is easy when you know it; to avoid you having to continuously speculate over the meaning of acronyms there is table at he end of this section containing the most-often-used acronyms.</para>
 
-<para
->This table does not try to be complete and is based on a list by Martin Imlau.</para>
+<para>This table does not try to be complete and is based on a list by Martin Imlau.</para>
 
 <table>
-<title
->Acronyms on Usenet</title>
+<title>Acronyms on Usenet</title>
 <tgroup cols="2">
 <thead>
 <row>
-<entry
->Acronym</entry>
-<entry
->Meaning</entry>
+<entry>Acronym</entry>
+<entry>Meaning</entry>
 </row>
 </thead>
 <!--TRANSLATORS: Write the translation in the second column in brackets! -->
 <tbody>
 <row>
-<entry
->&lt;g&gt;</entry>
-<entry
->grins</entry>
+<entry>&lt;g&gt;</entry>
+<entry>grins</entry>
 </row>
 <row>
 <entry>
-<acronym
->AAMOF</acronym>
+<acronym>AAMOF</acronym>
 </entry>
-<entry
->As a matter of fact</entry>
+<entry>As a matter of fact</entry>
 </row>
 <row>
 <entry>
-<acronym
->ACK</acronym>
+<acronym>ACK</acronym>
 </entry>
-<entry
->Acknowledge</entry>
+<entry>Acknowledge</entry>
 </row>
 <row>
 <entry>
-<acronym
->AFAIK</acronym>
+<acronym>AFAIK</acronym>
 </entry>
-<entry
->As far as I know</entry>
+<entry>As far as I know</entry>
 </row>
 <row>
 <entry>
-<acronym
->AFAIR</acronym>
+<acronym>AFAIR</acronym>
 </entry>
-<entry
->As far as I remember</entry>
+<entry>As far as I remember</entry>
 </row>
 <row>
 <entry>
-<acronym
->AWGTHTGTTA</acronym>
+<acronym>AWGTHTGTTA</acronym>
 </entry>
-<entry
->Are we going to have to go through this again?</entry>
+<entry>Are we going to have to go through this again?</entry>
 </row>
 <row>
 <entry>
-<acronym
->ASAP</acronym>
+<acronym>ASAP</acronym>
 </entry>
-<entry
->As soon as possible</entry>
+<entry>As soon as possible</entry>
 </row>
 <row>
 <entry>
-<acronym
->BFN</acronym>
+<acronym>BFN</acronym>
 </entry>
-<entry
->Bye for now!</entry>
+<entry>Bye for now!</entry>
 </row>
 <row>
 <entry>
-<acronym
->BTW</acronym>
+<acronym>BTW</acronym>
 </entry>
-<entry
->By the way</entry>
+<entry>By the way</entry>
 </row>
 <row>
 <entry>
-<acronym
->BYKT</acronym>
+<acronym>BYKT</acronym>
 </entry>
-<entry
->But you knew that</entry>
+<entry>But you knew that</entry>
 </row>
 <row>
 <entry>
-<acronym
->CMIIW</acronym>
+<acronym>CMIIW</acronym>
 </entry>
-<entry
->Correct me if I'm wrong</entry>
+<entry>Correct me if I'm wrong</entry>
 </row>
 <row>
 <entry>
-<acronym
->CU</acronym>
+<acronym>CU</acronym>
 </entry>
-<entry
->See you!</entry>
+<entry>See you!</entry>
 </row>
 <row>
 <entry>
-<acronym
->CU2</acronym>
+<acronym>CU2</acronym>
 </entry>
-<entry
->See you too!</entry>
+<entry>See you too!</entry>
 </row>
 <row>
 <entry>
-<acronym
->CYL</acronym>
+<acronym>CYL</acronym>
 </entry>
-<entry
->See you later!</entry>
+<entry>See you later!</entry>
 </row>
 <row>
 <entry>
-<acronym
->DAU</acronym>
+<acronym>DAU</acronym>
 </entry>
-<entry
->German abbreviation for the silliest user you can imagine (DÃ¼mmster anzunehmender User)</entry>
+<entry>German abbreviation for the silliest user you can imagine (DÃ¼mmster anzunehmender User)</entry>
 </row>
 <row>
 <entry>
-<acronym
->EOD</acronym>
+<acronym>EOD</acronym>
 </entry>
-<entry
->End of discussion</entry>
+<entry>End of discussion</entry>
 </row>
 <row>
 <entry>
-<acronym
->ESOSL</acronym>
+<acronym>ESOSL</acronym>
 </entry>
-<entry
->Endless snorts of stupid laughter</entry>
+<entry>Endless snorts of stupid laughter</entry>
 </row>
 <row>
 <entry>
-<acronym
->FYI</acronym>
+<acronym>FYI</acronym>
 </entry>
-<entry
->For your information</entry>
+<entry>For your information</entry>
 </row>
 <row>
 <entry>
-<acronym
->GOK</acronym>
+<acronym>GOK</acronym>
 </entry>
-<entry
->God only knows</entry>
+<entry>God only knows</entry>
 </row>
 <row>
 <entry>
-<acronym
->HAND</acronym>
+<acronym>HAND</acronym>
 </entry>
-<entry
->Have a nice day!</entry>
+<entry>Have a nice day!</entry>
 </row>
 <row>
 <entry>
-<acronym
->HTH</acronym>
+<acronym>HTH</acronym>
 </entry>
-<entry
->Hope that helps</entry>
+<entry>Hope that helps</entry>
 </row>
 <row>
 <entry>
-<acronym
->HSIK</acronym>
+<acronym>HSIK</acronym>
 </entry>
-<entry
->How should I know?</entry>
+<entry>How should I know?</entry>
 </row>
 <row>
 <entry>
-<acronym
->IAE</acronym>
+<acronym>IAE</acronym>
 </entry>
-<entry
->In any event</entry>
+<entry>In any event</entry>
 </row>
 <row>
 <entry>
-<acronym
->IANAL</acronym>
+<acronym>IANAL</acronym>
 </entry>
-<entry
->I am not a lawyer</entry>
+<entry>I am not a lawyer</entry>
 </row>
 <row>
 <entry>
-<acronym
->IIRC</acronym>
+<acronym>IIRC</acronym>
 </entry>
-<entry
->If I remember correctly</entry>
+<entry>If I remember correctly</entry>
 </row>
 <row>
 <entry>
-<acronym
->IMCO</acronym>
+<acronym>IMCO</acronym>
 </entry>
-<entry
->In my considered opinion</entry>
+<entry>In my considered opinion</entry>
 </row>
 <row>
 <entry>
-<acronym
->IMHO</acronym>
+<acronym>IMHO</acronym>
 </entry>
-<entry
->In my humble opinion</entry>
+<entry>In my humble opinion</entry>
 </row>
 <row>
 <entry>
-<acronym
->IMNSHO</acronym>
+<acronym>IMNSHO</acronym>
 </entry>
-<entry
->In my not so humble opinion</entry>
+<entry>In my not so humble opinion</entry>
 </row>
 <row>
 <entry>
-<acronym
->INPO</acronym>
+<acronym>INPO</acronym>
 </entry>
-<entry
->In no particular order</entry>
+<entry>In no particular order</entry>
 </row>
 <row>
 <entry>
-<acronym
->IOW</acronym>
+<acronym>IOW</acronym>
 </entry>
-<entry
->In other words</entry>
+<entry>In other words</entry>
 </row>
 <row>
 <entry>
-<acronym
->LMAO</acronym>
+<acronym>LMAO</acronym>
 </entry>
-<entry
->Laughing my ass off</entry>
+<entry>Laughing my ass off</entry>
 </row>
 <row>
 <entry>
-<acronym
->LOL</acronym>
+<acronym>LOL</acronym>
 </entry>
-<entry
->Laughing out loudly</entry>
+<entry>Laughing out loudly</entry>
 </row>
 <row>
 <entry>
-<acronym
->NAK</acronym>
+<acronym>NAK</acronym>
 </entry>
-<entry
->Not acknowledged</entry>
+<entry>Not acknowledged</entry>
 </row>
 <row>
 <entry>
-<acronym
->NBD</acronym>
+<acronym>NBD</acronym>
 </entry>
-<entry
->No big deal</entry>
+<entry>No big deal</entry>
 </row>
 <row>
 <entry>
-<acronym
->NFW</acronym>
+<acronym>NFW</acronym>
 </entry>
-<entry
->No f...ing way</entry>
+<entry>No f...ing way</entry>
 </row>
 <row>
 <entry>
-<acronym
->ROTFL</acronym>
+<acronym>ROTFL</acronym>
 </entry>
-<entry
->Rolling on the floor, laughing</entry>
+<entry>Rolling on the floor, laughing</entry>
 </row>
 <row>
 <entry>
-<acronym
->RTFM</acronym>
+<acronym>RTFM</acronym>
 </entry>
-<entry
->Read the f...ing manual</entry>
+<entry>Read the f...ing manual</entry>
 </row>
 <row>
 <entry>
-<acronym
->SCNR</acronym>
+<acronym>SCNR</acronym>
 </entry>
-<entry
->Sorry, could not resist</entry>
+<entry>Sorry, could not resist</entry>
 </row>
 <row>
 <entry>
-<acronym
->TIA</acronym>
+<acronym>TIA</acronym>
 </entry>
-<entry
->Thanks in advance</entry>
-</row
-> 
-</tbody
-> 
-</tgroup
-> 
-</table
-> 
-</sect2
-> 
+<entry>Thanks in advance</entry>
+</row> 
+</tbody> 
+</tgroup> 
+</table> 
+</sect2> 
 
-<sect2
-> 
-<title
->Smile!</title
-> 
+<sect2> 
+<title>Smile!</title> 
 
-<para
->Again, such a strange thing. What is this ;-) meant to be? Turn your head so the left side of your screen is on top; got it? It's a smile with a wink? This is a so-called emoticon; emoticons are an often-used possibility to express emotions, one thing missing in conversation on the Usenet (but there is a substitute, remember? ;-)</para>
+<para>Again, such a strange thing. What is this ;-) meant to be? Turn your head so the left side of your screen is on top; got it? It's a smile with a wink? This is a so-called emoticon; emoticons are an often-used possibility to express emotions, one thing missing in conversation on the Usenet (but there is a substitute, remember? ;-)</para>
 
-<para
->It is very difficult to express emotions in email or news; your joking comment appear to be very serious to the recipient and can lead to unmeant reactions or conflicts (flames); so use emoticons to express your intention.</para>
+<para>It is very difficult to express emotions in email or news; your joking comment appear to be very serious to the recipient and can lead to unmeant reactions or conflicts (flames); so use emoticons to express your intention.</para>
 
-<para
->There are a lots of emoticons, which express a great variety of emotions; the interpretation is easy if you turn your head and think of a face.</para>
+<para>There are a lots of emoticons, which express a great variety of emotions; the interpretation is easy if you turn your head and think of a face.</para>
 
-</sect2
-> 
+</sect2> 
 
-<sect2
-> 
-<title
->PLONK!</title
-> 
+<sect2> 
+<title>PLONK!</title> 
 
-<para
->This PLONK! looks like some comic-sound, does it not? And that is exactly what it is used for. The one who reads it knows he was just added to the killfile of a newsreader; normally this means the recipient of the PLONK! annoyed the sender. The PLONK! is meant to play back the sound of the recipients name hitting the ground in the <glossterm
->killfile</glossterm
->.</para>
-</sect2
-> 
-</sect1
-> 
+<para>This PLONK! looks like some comic-sound, does it not? And that is exactly what it is used for. The one who reads it knows he was just added to the killfile of a newsreader; normally this means the recipient of the PLONK! annoyed the sender. The PLONK! is meant to play back the sound of the recipients name hitting the ground in the <glossterm>killfile</glossterm>.</para>
+</sect2> 
+</sect1> 
 
-</chapter
-> 
+</chapter> 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/more.docbook b/tde-i18n-en_GB/docs/tdepim/knode/more.docbook
index 42f158404df..64b6a2c9bab 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/more.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/more.docbook
@@ -1,230 +1,84 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
-> -->
+<!DOCTYPE chapter PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"> -->
 	
-<chapter id="knode-more-info"
-> 
-<title
->Further Information</title
-> 
+<chapter id="knode-more-info"> 
+<title>Further Information</title> 
 <anchor id="anc-knode-more-info"/> 
 <!-- TRANSLATORS! Please modify this chapter for your language specific needs --> 
 
-<para
->In this section we will detail some additional information resources which could be useful to you. Many of the articles listed below (for which <acronym
->URL</acronym
->s are given) are posted to news groups regularly; some of those groups are also listed here.</para>
+<para>In this section we will detail some additional information resources which could be useful to you. Many of the articles listed below (for which <acronym>URL</acronym>s are given) are posted to news groups regularly; some of those groups are also listed here.</para>
  
-<sect1 id="infos-newsgroups"
-> 
-<title
->Informative Newsgroups</title
-> 
+<sect1 id="infos-newsgroups"> 
+<title>Informative Newsgroups</title> 
 
 <anchor id="anc-infos-newsgroups"/> 
-<simplelist
-> 
-<member
->news.answers</member
-> 
-<member
->news.newusers.questions</member
-> 
-<member
->de.newsusers.infos (German)</member
-> 
-<member
->de.answers (German)</member
-> 
-<member
->de.comp.os.unix.linux.infos (German)</member
-> 
-<member
->de.newusers.answers (German)</member
-> 
-<member
->de.newusers.questions (German)</member
-> 
-</simplelist
-> 
-
-<para
->For beginners it is especially recommended to read these articles at least partially: informed users have strong advantages in news groups. There are some more-specialized news groups where <acronym
->FAQ</acronym
->s and introductory <glossterm
->articles</glossterm
-> are posted frequently, &eg; the <glossterm
->newsgroup</glossterm
-> de.comp.os.unix.linux.infos (German), which contains a lot of useful articles about the &Linux; operating system. Just have a look on the group list of your newsserver for it.</para>
-
-</sect1
-> 
-
-<sect1 id="infos-testgroups"
-> 
-<title
->Test Groups</title
-> 
+<simplelist> 
+<member>news.answers</member> 
+<member>news.newusers.questions</member> 
+<member>de.newsusers.infos (German)</member> 
+<member>de.answers (German)</member> 
+<member>de.comp.os.unix.linux.infos (German)</member> 
+<member>de.newusers.answers (German)</member> 
+<member>de.newusers.questions (German)</member> 
+</simplelist> 
+
+<para>For beginners it is especially recommended to read these articles at least partially: informed users have strong advantages in news groups. There are some more-specialized news groups where <acronym>FAQ</acronym>s and introductory <glossterm>articles</glossterm> are posted frequently, &eg; the <glossterm>newsgroup</glossterm> de.comp.os.unix.linux.infos (German), which contains a lot of useful articles about the &Linux; operating system. Just have a look on the group list of your newsserver for it.</para>
+
+</sect1> 
+
+<sect1 id="infos-testgroups"> 
+<title>Test Groups</title> 
 
 <anchor id="anc-infos-testgroups"/> 
 
-<para
->The following groups were created especially for testing, &ie; after successfully configuring &knode; you should post some articles to those groups to test your settings.</para>
-
-<para
->Some groups support automatic replies through email to enable you to test whether your entered identity is correct and mail-replies actually arrive in your mailbox.</para>
-
-<para
->In addition, some scripts are offered which check your articles for erroneous settings and generate a followup with useful hints.</para
-> 
-
-<simplelist
-> 
-<member
->de.test (German test newsgroup)</member
-> 
-<member
->misc.test</member
-> 
-<member
->alt.test</member
-> 
-<member
->alt.test.ignore</member
-> 
-</simplelist
-> 
-</sect1
-> 
-
-<sect1 id="infos-urls"
-> 
-<title
->Informative technical articles in the world wide web</title
-> 
+<para>The following groups were created especially for testing, &ie; after successfully configuring &knode; you should post some articles to those groups to test your settings.</para>
+
+<para>Some groups support automatic replies through email to enable you to test whether your entered identity is correct and mail-replies actually arrive in your mailbox.</para>
+
+<para>In addition, some scripts are offered which check your articles for erroneous settings and generate a followup with useful hints.</para> 
+
+<simplelist> 
+<member>de.test (German test newsgroup)</member> 
+<member>misc.test</member> 
+<member>alt.test</member> 
+<member>alt.test.ignore</member> 
+</simplelist> 
+</sect1> 
+
+<sect1 id="infos-urls"> 
+<title>Informative technical articles in the world wide web</title> 
 
 <anchor id="anc-infos-urls"/> 
 
-<para
->These <acronym
->URL</acronym
->s are from the corresponding article in the <glossterm
->newsgroup</glossterm
-> <emphasis
->de.newusers.infos</emphasis
-> and have the same contents as the articles posted there.</para>
-
-<simplelist
-> 
-<member
->Introduction for de.newusers.infos: <ulink url="http://www.kirchwitz.de/~amk/dni/einleitung"
->http://www.kirchwitz.de/~amk/dni/einleitung</ulink
-> (German)</member
-> 
-<member
->The newsgroups of the de.alt hierarchy: <ulink url="http://www.kirchwitz.de/~amk/dni/de-alt-newsgruppen"
-> http://www.kirchwitz.de/~amk/dni/de-alt-newsgruppen</ulink
-> (German)</member
-> 
-<member
->The newsgroups of the de-hierarchy: <ulink url="http://www.kirchwitz.de/~amk/dni/de-newsgruppen"
->http://www.kirchwitz.de/~amk/dni/de-newsgruppen</ulink
-> (German)</member
-> 
-<member
->First read, then post: <ulink url="http://www.kirchwitz.de/~amk/dni/erst-lesen-dann-schreiben"
->http://www.kirchwitz.de/~amk/dni/erst-lesen-dann-schreiben</ulink
-> (German)</member
-> 
-<member
->First steps in the usenet: <ulink url="http://www.kirchwitz.de/~amk/dni/erste-schritte"
->http://www.kirchwitz.de/~amk/dni/erste-schritte</ulink
-> (German)</member>
-<member
->Questions and answers from de.newusers.questions: <ulink url="http://www.kirchwitz.de/~amk/dni/faq"
->http://www.kirchwitz.de/~amk/dni/faq</ulink
-> (German)</member
-> 
-<member
->Seven theses about behaviour in the internet: <ulink url="http://www.kirchwitz.de/~amk/dni/hoeflichkeit"
->http://www.kirchwitz.de/~amk/dni/hoeflichkeit</ulink
-> (German)</member
-> 
-<member
->Introduction to the usenet: <ulink url="http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung"
->http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung</ulink
-> (German)</member
-> 
-<member
->Why should I take the rules seriously? <ulink url="http://www.kirchwitz.de/~amk/dni/warum-regel"
->http://www.kirchwitz.de/~amk/dni/warum-regel</ulink
-> (German)</member
-> 
-<member
->The newsreader <acronym
->FAQ</acronym
->: <ulink url="http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm"
->http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm</ulink
-></member
-> 
-<member
->The correct quoting: <ulink url="http://www.afaik.de/usenet/faq/zitieren"
->http://www.afaik.de/usenet/faq/zitieren</ulink
-> (German)</member
-> 
-<member
->The German umlauts <acronym
->FAQ</acronym
->: <ulink url="http://www.westfalen.de/paefken/de.newusers/umlaute-faq.txt"
-> http://www.westfalen.de/paefken/de.newusers/umlaute-faq.txt</ulink
-> (German)</member
-> 
-</simplelist
-> 
-</sect1
-> 
-
-<sect1 id="infos-technical"
-> 
-<title
->Informative technical articles</title
-> 
+<para>These <acronym>URL</acronym>s are from the corresponding article in the <glossterm>newsgroup</glossterm> <emphasis>de.newusers.infos</emphasis> and have the same contents as the articles posted there.</para>
+
+<simplelist> 
+<member>Introduction for de.newusers.infos: <ulink url="http://www.kirchwitz.de/~amk/dni/einleitung">http://www.kirchwitz.de/~amk/dni/einleitung</ulink> (German)</member> 
+<member>The newsgroups of the de.alt hierarchy: <ulink url="http://www.kirchwitz.de/~amk/dni/de-alt-newsgruppen"> http://www.kirchwitz.de/~amk/dni/de-alt-newsgruppen</ulink> (German)</member> 
+<member>The newsgroups of the de-hierarchy: <ulink url="http://www.kirchwitz.de/~amk/dni/de-newsgruppen">http://www.kirchwitz.de/~amk/dni/de-newsgruppen</ulink> (German)</member> 
+<member>First read, then post: <ulink url="http://www.kirchwitz.de/~amk/dni/erst-lesen-dann-schreiben">http://www.kirchwitz.de/~amk/dni/erst-lesen-dann-schreiben</ulink> (German)</member> 
+<member>First steps in the usenet: <ulink url="http://www.kirchwitz.de/~amk/dni/erste-schritte">http://www.kirchwitz.de/~amk/dni/erste-schritte</ulink> (German)</member>
+<member>Questions and answers from de.newusers.questions: <ulink url="http://www.kirchwitz.de/~amk/dni/faq">http://www.kirchwitz.de/~amk/dni/faq</ulink> (German)</member> 
+<member>Seven theses about behaviour in the internet: <ulink url="http://www.kirchwitz.de/~amk/dni/hoeflichkeit">http://www.kirchwitz.de/~amk/dni/hoeflichkeit</ulink> (German)</member> 
+<member>Introduction to the usenet: <ulink url="http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung">http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung</ulink> (German)</member> 
+<member>Why should I take the rules seriously? <ulink url="http://www.kirchwitz.de/~amk/dni/warum-regel">http://www.kirchwitz.de/~amk/dni/warum-regel</ulink> (German)</member> 
+<member>The newsreader <acronym>FAQ</acronym>: <ulink url="http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm">http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm</ulink></member> 
+<member>The correct quoting: <ulink url="http://www.afaik.de/usenet/faq/zitieren">http://www.afaik.de/usenet/faq/zitieren</ulink> (German)</member> 
+<member>The German umlauts <acronym>FAQ</acronym>: <ulink url="http://www.westfalen.de/paefken/de.newusers/umlaute-faq.txt"> http://www.westfalen.de/paefken/de.newusers/umlaute-faq.txt</ulink> (German)</member> 
+</simplelist> 
+</sect1> 
+
+<sect1 id="infos-technical"> 
+<title>Informative technical articles</title> 
 <anchor id="anc-infos-technical"/> 
 
-<para
->If you are interested in further technical information in connection to news, you should not miss the following <acronym
->URL</acronym
->s.</para>
-
-<simplelist
-> 
-<member
->Header entries: <ulink url="http://www.kirchwitz.de/~amk/dni/headerzeilen"
-> http://www.kirchwitz.de/~amk/dni/headerzeilen</ulink
-> (German)</member
-> 
-<member
->A very useful message-ID <acronym
->FAQ</acronym
->: <ulink url="http://www.qad.org/faq/faq-messageid.html"
-> http://www.qad.org/faq/faq-messageid.html</ulink
-></member
-> 
-<member
->A lot of links about newsreaders and related topics: <ulink url="http://www.leafnode.org/links"
->http://www.leafnode.org/links</ulink
-></member
-> 
-<member
-><acronym
->RFC</acronym
->s, Drafts and documents for the technical interested: <ulink url="http://www.landfield.com/usefor/"
-> http://www.landfield.com/usefor/</ulink
-></member
-> 
-</simplelist
-> 
-</sect1
-> 
-</chapter
-> 
+<para>If you are interested in further technical information in connection to news, you should not miss the following <acronym>URL</acronym>s.</para>
+
+<simplelist> 
+<member>Header entries: <ulink url="http://www.kirchwitz.de/~amk/dni/headerzeilen"> http://www.kirchwitz.de/~amk/dni/headerzeilen</ulink> (German)</member> 
+<member>A very useful message-ID <acronym>FAQ</acronym>: <ulink url="http://www.qad.org/faq/faq-messageid.html"> http://www.qad.org/faq/faq-messageid.html</ulink></member> 
+<member>A lot of links about newsreaders and related topics: <ulink url="http://www.leafnode.org/links">http://www.leafnode.org/links</ulink></member> 
+<member><acronym>RFC</acronym>s, Drafts and documents for the technical interested: <ulink url="http://www.landfield.com/usefor/"> http://www.landfield.com/usefor/</ulink></member> 
+</simplelist> 
+</sect1> 
+</chapter> 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook b/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook
index 5d38dd1469a..66a76574dd5 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/using-firststart.docbook
@@ -1,2706 +1,1242 @@
 <!-- <?xml version="1.0" ?>
-<!DOCTYPE sect1 PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"
-> -->
-<sect1 id="first-start"
-> 
-<title
->The first start</title
-> 
-
-<para
->You can find &knode; in the <guimenu
->K</guimenu
-> Menu under the <guisubmenu
->Internet</guisubmenu
-> entry: the menu entry <guimenuitem
->KNode</guimenuitem
-> launches the program.</para>
-
-<tip
-> 
-<para
->If the entry for &knode; can not be found or if &knode; does not appear after clicking on the menu entry, read <link linkend="faq"
->Questions and Answers</link
->.</para
-> 
+<!DOCTYPE sect1 PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd"> -->
+<sect1 id="first-start"> 
+<title>The first start</title> 
+
+<para>You can find &knode; in the <guimenu>K</guimenu> Menu under the <guisubmenu>Internet</guisubmenu> entry: the menu entry <guimenuitem>KNode</guimenuitem> launches the program.</para>
+
+<tip> 
+<para>If the entry for &knode; can not be found or if &knode; does not appear after clicking on the menu entry, read <link linkend="faq">Questions and Answers</link>.</para> 
 </tip>
 
-<para
->The main window of &knode; should now be displayed on your desktop as shown; on the first start, the settings dialogue will be invoked.</para>
+<para>The main window of &knode; should now be displayed on your desktop as shown; on the first start, the settings dialogue will be invoked.</para>
 
 <screenshot>
-<screeninfo
->Setting up &knode;</screeninfo>
+<screeninfo>Setting up &knode;</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-start.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->&knode; after first start</phrase>
+<phrase>&knode; after first start</phrase>
 </textobject>
 <caption>
-<para
->&knode; after first start</para>
+<para>&knode; after first start</para>
 </caption>
 </mediaobject>
 </screenshot>
 
-<para
->The windows shows the menu bar, the toolbar below and the status pane at the buttom. The area between the toolbar and the status pane is occupied by a three-part window.</para>
+<para>The windows shows the menu bar, the toolbar below and the status pane at the buttom. The area between the toolbar and the status pane is occupied by a three-part window.</para>
 
-<para
->There is a folder view, which currently contains only three entries:</para>
+<para>There is a folder view, which currently contains only three entries:</para>
 
 <simplelist>
-<member
->The folder <guilabel
->Outbox</guilabel
-></member>
-<member
->The folder <guilabel
->Drafts</guilabel
-></member>
-<member
->The folder <guilabel
->Sent</guilabel
-></member>
+<member>The folder <guilabel>Outbox</guilabel></member>
+<member>The folder <guilabel>Drafts</guilabel></member>
+<member>The folder <guilabel>Sent</guilabel></member>
 </simplelist>
 
-<para
->When &knode; is completely and correctly configured, the news servers and the subscribed news groups will appear there.</para>
+<para>When &knode; is completely and correctly configured, the news servers and the subscribed news groups will appear there.</para>
 
-<para
->In the upper section is the article view; it is currently empty and does not show any articles. Directly below the article view is the article window; the body of the currently-selected article appears there. These windows are also blank at the moment, as there are no articles, of course. You should not be concerned, though, as before reading and publishing news some things have to be configured; this will be covered by the following section.</para>
+<para>In the upper section is the article view; it is currently empty and does not show any articles. Directly below the article view is the article window; the body of the currently-selected article appears there. These windows are also blank at the moment, as there are no articles, of course. You should not be concerned, though, as before reading and publishing news some things have to be configured; this will be covered by the following section.</para>
 
-<para
->We are now beginning the setting up of &knode;. Most settings are not important for daily use, but you should know what settings are possible and what they are for. Some may skip the <quote
->Quickstart</quote
-> chapter but those who prefer a quick start will just glance over the manual anyway. For others, especially those who have not any or much experience with a news reader, this chapter offers the chance to fully perform the configuration, although some things may become clear only later on.</para>
+<para>We are now beginning the setting up of &knode;. Most settings are not important for daily use, but you should know what settings are possible and what they are for. Some may skip the <quote>Quickstart</quote> chapter but those who prefer a quick start will just glance over the manual anyway. For others, especially those who have not any or much experience with a news reader, this chapter offers the chance to fully perform the configuration, although some things may become clear only later on.</para>
 
-<sect2 id="setting-your-identity"
-> 
-<title
->Personal settings</title>
+<sect2 id="setting-your-identity"> 
+<title>Personal settings</title>
 
 <anchor id="anc-setting-your-identity"/>
 
-<para
->Via <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-></menuchoice
-> you will enter the preferences dialogue of &knode;. The figure shows the dialogue.</para>
-
-<screenshot
-> 
-<screeninfo
->Dialogue for entering personal information</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-identity.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Entering personal information</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Entering personal information</para
-></caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->The dialogue is divided into two parts: in one part there is a treeview, in which the top entry <guilabel
->Identity</guilabel
-> is already highlighted; in the other part is the corresponding input dialogue -- these settings relate to the identity with which you navigate through the newsgroups.</para>
+<para>Via <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem></menuchoice> you will enter the preferences dialogue of &knode;. The figure shows the dialogue.</para>
+
+<screenshot> 
+<screeninfo>Dialogue for entering personal information</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-identity.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Entering personal information</phrase> 
+</textobject> 
+<caption> 
+<para>Entering personal information</para></caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>The dialogue is divided into two parts: in one part there is a treeview, in which the top entry <guilabel>Identity</guilabel> is already highlighted; in the other part is the corresponding input dialogue -- these settings relate to the identity with which you navigate through the newsgroups.</para>
 
 <tip>
-<para
->If you have already configured your personal settings in the &kcontrolcenter; before the first start of &knode;, they will be adopted.</para
-> </tip>
-
-<sect3
-> 
-<title
-><guilabel
->Name</guilabel
-></title
-> 
-
-<para
->In the field <guilabel
->Name</guilabel
-> you enter your name, &eg; <replaceable
->Joe Miller</replaceable
-> or <replaceable
->Mary Gordon</replaceable
->. This name will later appear in the newsgroups as sender, and can be seen by anyone.</para>
-
-<para
->Filling out the field <guilabel
->Name</guilabel
-> is mandatory.</para>
+<para>If you have already configured your personal settings in the &kcontrolcenter; before the first start of &knode;, they will be adopted.</para> </tip>
+
+<sect3> 
+<title><guilabel>Name</guilabel></title> 
+
+<para>In the field <guilabel>Name</guilabel> you enter your name, &eg; <replaceable>Joe Miller</replaceable> or <replaceable>Mary Gordon</replaceable>. This name will later appear in the newsgroups as sender, and can be seen by anyone.</para>
+
+<para>Filling out the field <guilabel>Name</guilabel> is mandatory.</para>
 
 <caution>
-<para
->In most newsgroups, it is considered polite and appropriate to appear with one's real name; other newsgroups are less strict about this. But, there are also cases when one would not want to appear with one's real name, &eg; in newsgroups where one would like to (and can) talk about very personal matters without being exposed; these groups mostly do tell you in their Charter that the anonymity of their members is explicitly approved.</para>
-</caution
-> 
-
-<tip
-> 
-<para
->For those special cases, &knode; offers settings that can be adjusted to each newsgroup individually; further information can be found under <link linkend="group-identity"
->Group local Identities</link
->.</para>
-</tip
-> 
-</sect3
-> 
+<para>In most newsgroups, it is considered polite and appropriate to appear with one's real name; other newsgroups are less strict about this. But, there are also cases when one would not want to appear with one's real name, &eg; in newsgroups where one would like to (and can) talk about very personal matters without being exposed; these groups mostly do tell you in their Charter that the anonymity of their members is explicitly approved.</para>
+</caution> 
+
+<tip> 
+<para>For those special cases, &knode; offers settings that can be adjusted to each newsgroup individually; further information can be found under <link linkend="group-identity">Group local Identities</link>.</para>
+</tip> 
+</sect3> 
 
 <sect3>
-<title
-><guilabel
->Organisation</guilabel
-></title
-> 
-
-<para
->The input field <guilabel
->Organisation</guilabel
-> is optional and does not have to be filled out. You can enter, &eg;, the name of your company or your university if you use &knode; there; if you leave this field blank, it will often be filled out later by your Internet service provider.</para>
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Email address</guilabel
-></title>
-
-<para
->The email address you enter here will be used as sender in news articles, &ie; as actual address of the author, in conjunction with the real name (set in the field <guilabel
->Name</guilabel
->).</para>
-
-<para
->The field <guilabel
->Email Address</guilabel
-> shows up when someone wants to reply to you by email: the email will be sent to the address entered here. Many newsreaders display the sender address together with the name in the Header of the article.</para>
-
-<para
->Filling out the <guilabel
->Email Address</guilabel
-> field is mandatory.</para>
+<title><guilabel>Organisation</guilabel></title> 
+
+<para>The input field <guilabel>Organisation</guilabel> is optional and does not have to be filled out. You can enter, &eg;, the name of your company or your university if you use &knode; there; if you leave this field blank, it will often be filled out later by your Internet service provider.</para>
+</sect3> 
+
+<sect3> 
+<title><guilabel>Email address</guilabel></title>
+
+<para>The email address you enter here will be used as sender in news articles, &ie; as actual address of the author, in conjunction with the real name (set in the field <guilabel>Name</guilabel>).</para>
+
+<para>The field <guilabel>Email Address</guilabel> shows up when someone wants to reply to you by email: the email will be sent to the address entered here. Many newsreaders display the sender address together with the name in the Header of the article.</para>
+
+<para>Filling out the <guilabel>Email Address</guilabel> field is mandatory.</para>
 <tip>
-<para
->Note that the e-mail address will only be used for replies to you if the field <guilabel
->Reply-to Address</guilabel
-> is not filled out; in this case, the field <guilabel
->Email</guilabel
-> will be ignored for replies and the address given under <guilabel
->Reply-to Address</guilabel
-> will be used.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Reply-to Address</guilabel
-></title
-> 
-
-<para
-><guilabel
->Reply-to Address</guilabel
-> offers you the possibility to enter a different address than your sender e-mail address: if someone replies to you by email this address will be displayed as target address in the reply. An example for using <guilabel
->Reply-to Address</guilabel
-> would be that you write the article at the office during the day but want to receive the answer in your home inbox, because your boss co-reads your mail.</para>
-
-<para
->Only enter an e-mail address in that field if it actually differs from the field <guilabel
->Email Address</guilabel
->.</para>
+<para>Note that the e-mail address will only be used for replies to you if the field <guilabel>Reply-to Address</guilabel> is not filled out; in this case, the field <guilabel>Email</guilabel> will be ignored for replies and the address given under <guilabel>Reply-to Address</guilabel> will be used.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Reply-to Address</guilabel></title> 
+
+<para><guilabel>Reply-to Address</guilabel> offers you the possibility to enter a different address than your sender e-mail address: if someone replies to you by email this address will be displayed as target address in the reply. An example for using <guilabel>Reply-to Address</guilabel> would be that you write the article at the office during the day but want to receive the answer in your home inbox, because your boss co-reads your mail.</para>
+
+<para>Only enter an e-mail address in that field if it actually differs from the field <guilabel>Email Address</guilabel>.</para>
 
 <warning>
-<para
->Some news readers deliberately set this to an invalid e-mail address in order to prevent spam mails from being received; what could happen, though, is that a reader sends an e-mail to this invalid address which you will therefore never receive. You should drop a note about this in the signature.</para>
+<para>Some news readers deliberately set this to an invalid e-mail address in order to prevent spam mails from being received; what could happen, though, is that a reader sends an e-mail to this invalid address which you will therefore never receive. You should drop a note about this in the signature.</para>
 </warning>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Mail-Copies-To</guilabel
-></title>
+<title><guilabel>Mail-Copies-To</guilabel></title>
 
-<para
->If you enter an email address here every article will be sent to the usenet and to this email address.</para>
+<para>If you enter an email address here every article will be sent to the usenet and to this email address.</para>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Signing Key</guilabel
-></title>
-
-<para
->If you have configured the use of <acronym
->PGP</acronym
-> or GnuPG you can chose your signing key with <guibutton
->Change...</guibutton
->. </para>
+<title><guilabel>Signing Key</guilabel></title>
+
+<para>If you have configured the use of <acronym>PGP</acronym> or GnuPG you can chose your signing key with <guibutton>Change...</guibutton>. </para>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Use a signature from file</guilabel
-></title>
-
-<para
->If this option is selected, the file specified under <guilabel
->Signature File</guilabel
-> will be used as Signature.</para>
+<title><guilabel>Use a signature from file</guilabel></title>
+
+<para>If this option is selected, the file specified under <guilabel>Signature File</guilabel> will be used as Signature.</para>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Signature File</guilabel
-></title>
-
-<para
->The field <guilabel
->Signature File</guilabel
-> determines the file, the content of which is appended to each of your articles. The field is only enabled if the option <guilabel
->Use a signature from file</guilabel
-> is selected.</para>
-
-<para
->The signature file is a simple text file, which should not contain more than four lines; it can, for example, contain a reference to your homepage with the corresponding link, your postal address with your telephone number (which would then be of course visible to the whole world with every article) or just a cool quote. The signature is your brand, so to speak, which will mark all your articles; therefore, your signature should not be designed sloppily or in the long run annoying to others: an old joke that one would have to read over and over again does not foster sympathy or the interest of the other newsgroup subscribers.</para
-> 
-
-<para
->You can directly enter the file name of the signature file but it is more convenient to use the button <guibutton
->Choose...</guibutton
->. This opens a file open dialogue and you can conveniently choose the signature file with the mouse. The button <guibutton
->Edit File</guibutton
-> enables you, after choosing the file, to edit the signature.</para>
-
-<tip
-> 
-<para
->It is not necessary to include a separation line in the signature file as &knode; inserts it automatically.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->The file is a program</guilabel
-></title
-> 
-
-<para
->If this option is activated, the signature file is not handled as a text file, but as a program. The signature file will be started as a program and the output will be used as a signature. Through that you'll be able to chose a signature by accident or to use fortune to generate a cool slogan every time.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Specify signature below</guilabel
-></title
-> 
-
-<para
->If this option is selected you can enter the text of the signature directly in the input field below.</para
-> 
-
-<tip
-> 
-<para
->Please make sure that in this case also your <glossterm
->signature</glossterm
-> should not contain more than 4 lines. A separation line is not necessary as &knode; inserts it automatically.</para>
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->General notes</title
-> 
-
-<para
->You can later adapt the identity individually for each of the subscribed groups via the <guilabel
->Preferences</guilabel
-> dialogue, &eg; you can specify an English signature for English groups and a German one for German groups. Apart from the language it is also possible to have context-sensitive signatures, &eg; your favourite recipe in a cooking group or the names of your twelve cats in a cat owner group.</para>
-
-<para
->You find more in the section <link linkend="group-identity"
->Group local identities</link
->.</para>
-
-<para
->The next step in the configuration covers the news account.</para>
+<title><guilabel>Signature File</guilabel></title>
+
+<para>The field <guilabel>Signature File</guilabel> determines the file, the content of which is appended to each of your articles. The field is only enabled if the option <guilabel>Use a signature from file</guilabel> is selected.</para>
+
+<para>The signature file is a simple text file, which should not contain more than four lines; it can, for example, contain a reference to your homepage with the corresponding link, your postal address with your telephone number (which would then be of course visible to the whole world with every article) or just a cool quote. The signature is your brand, so to speak, which will mark all your articles; therefore, your signature should not be designed sloppily or in the long run annoying to others: an old joke that one would have to read over and over again does not foster sympathy or the interest of the other newsgroup subscribers.</para> 
+
+<para>You can directly enter the file name of the signature file but it is more convenient to use the button <guibutton>Choose...</guibutton>. This opens a file open dialogue and you can conveniently choose the signature file with the mouse. The button <guibutton>Edit File</guibutton> enables you, after choosing the file, to edit the signature.</para>
+
+<tip> 
+<para>It is not necessary to include a separation line in the signature file as &knode; inserts it automatically.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>The file is a program</guilabel></title> 
+
+<para>If this option is activated, the signature file is not handled as a text file, but as a program. The signature file will be started as a program and the output will be used as a signature. Through that you'll be able to chose a signature by accident or to use fortune to generate a cool slogan every time.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Specify signature below</guilabel></title> 
+
+<para>If this option is selected you can enter the text of the signature directly in the input field below.</para> 
+
+<tip> 
+<para>Please make sure that in this case also your <glossterm>signature</glossterm> should not contain more than 4 lines. A separation line is not necessary as &knode; inserts it automatically.</para>
+</tip> 
+</sect3> 
+
+<sect3> 
+<title>General notes</title> 
+
+<para>You can later adapt the identity individually for each of the subscribed groups via the <guilabel>Preferences</guilabel> dialogue, &eg; you can specify an English signature for English groups and a German one for German groups. Apart from the language it is also possible to have context-sensitive signatures, &eg; your favourite recipe in a cooking group or the names of your twelve cats in a cat owner group.</para>
+
+<para>You find more in the section <link linkend="group-identity">Group local identities</link>.</para>
+
+<para>The next step in the configuration covers the news account.</para>
 
 </sect3>
 </sect2>
 
 <sect2 id="setting-the-news-account">
-<title
->Configuring the news account</title>
+<title>Configuring the news account</title>
 <anchor id="anc-setting-the-news-account"/>
 
-<para
->Now we must tell &knode; about where we get the news from or where to send the articles to later on. In the tree view on the right, there is an <guilabel
->Accounts</guilabel
-> entry; click on it with the mouse; then, two sub entries will be opened out. Choose the <guilabel
->News</guilabel
-> entry, because we first want to configure the news account: the list of accounts is still empty.</para>
+<para>Now we must tell &knode; about where we get the news from or where to send the articles to later on. In the tree view on the right, there is an <guilabel>Accounts</guilabel> entry; click on it with the mouse; then, two sub entries will be opened out. Choose the <guilabel>News</guilabel> entry, because we first want to configure the news account: the list of accounts is still empty.</para>
 
-<para
->To create a new account click on <guibutton
->New...</guibutton
->. The following dialogue appears:</para>
+<para>To create a new account click on <guibutton>New...</guibutton>. The following dialogue appears:</para>
 
 <screenshot>
-<screeninfo
->The <guilabel
->New Account</guilabel
-> dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-news-account.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The <guilabel
->New Account</guilabel
-> dialogue</phrase
-> 
-</textobject
-> 
+<screeninfo>The <guilabel>New Account</guilabel> dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-news-account.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The <guilabel>New Account</guilabel> dialogue</phrase> 
+</textobject> 
 <caption>
-<para
->The <guilabel
->New Account</guilabel
-> dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
+<para>The <guilabel>New Account</guilabel> dialogue</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
 
 <sect3>
-<title
-><guilabel
->Name</guilabel
-></title
-> 
-
-<para
->The <guilabel
->Name</guilabel
-> field can be filled in as you like; the text you enter will later be visible in the folder view. You could, for example, enter the name of your Internet Provider; for our example we enter the name <userinput
->My News Account</userinput
->.</para>
+<title><guilabel>Name</guilabel></title> 
+
+<para>The <guilabel>Name</guilabel> field can be filled in as you like; the text you enter will later be visible in the folder view. You could, for example, enter the name of your Internet Provider; for our example we enter the name <userinput>My News Account</userinput>.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Server</guilabel
-></title
-> 
-
-<para
->The next field is labelled <guilabel
->Server</guilabel
->. Unlike the field <guilabel
->Name</guilabel
->, what you enter here is important. The name of the news server is fixed and you should be able to get it from your Internet service provider; if you do not know the name of the news server, you should get it now: without this information you can not read any news. If your Internet service provider doesn't own a news server you can use a public one (universities often provide public news servers.)</para>
-
-<para
->For our example configuration we enter the name <userinput
-><systemitem class="systemname"
->news.server.com</systemitem
-></userinput
->; you will, of course, enter the real name of your news server.</para>
+<sect3> 
+<title><guilabel>Server</guilabel></title> 
+
+<para>The next field is labelled <guilabel>Server</guilabel>. Unlike the field <guilabel>Name</guilabel>, what you enter here is important. The name of the news server is fixed and you should be able to get it from your Internet service provider; if you do not know the name of the news server, you should get it now: without this information you can not read any news. If your Internet service provider doesn't own a news server you can use a public one (universities often provide public news servers.)</para>
+
+<para>For our example configuration we enter the name <userinput><systemitem class="systemname">news.server.com</systemitem></userinput>; you will, of course, enter the real name of your news server.</para>
 
 <tip>
-<para
->If you want to use &knode; with a local news server, enter the name <userinput
-><systemitem class="systemname"
->localhost</systemitem
-></userinput
-> here.</para>
+<para>If you want to use &knode; with a local news server, enter the name <userinput><systemitem class="systemname">localhost</systemitem></userinput> here.</para>
 </tip>
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Port</guilabel
-></title
-> 
-
-<para
-><guilabel
->Port</guilabel
->, the next field, has already a default value. The Port designates, roughly speaking, a data channel on which the server listens for whether someone wants to retrieve news: it defaults to the value 119, which is applicable in most cases; therefore, we do not change this default for our example.</para>
+<sect3> 
+<title><guilabel>Port</guilabel></title> 
+
+<para><guilabel>Port</guilabel>, the next field, has already a default value. The Port designates, roughly speaking, a data channel on which the server listens for whether someone wants to retrieve news: it defaults to the value 119, which is applicable in most cases; therefore, we do not change this default for our example.</para>
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Hold connection for</guilabel
-></title
-> 
-
-<para
->The time value you enter here is used if you have established a connection to the news server and if, for whatever reason, no data is received from or transmitted to the news server: after the specified time has elapsed &knode; will automatically disconnect. This, amongst other things, relieves the server of unnecessary connections which would otherwise reduce its availability for other subscribers; it also makes sure that an automatically-established Internet connection is not held unnecessarily even if no data is being sent or received.</para>
-
-<tip
-> 
-<para
->This settings mainly makes sense if one receives and reads news online; for local news servers it is of almost no importance. If this waiting time is set too low, there can be waiting periods if you read a longer article and do not do <quote
->anything</quote
-> for some time: &knode; will have cancelled the connection to the server by then (after the time period has elapsed) and has to reestablish it, causing a delay.</para
-> 
-<para
->If the waiting time is set too high you might waste online time whilst doing nothing (perhaps increasing your phone bill).</para
-> </tip>
+<sect3> 
+<title><guilabel>Hold connection for</guilabel></title> 
+
+<para>The time value you enter here is used if you have established a connection to the news server and if, for whatever reason, no data is received from or transmitted to the news server: after the specified time has elapsed &knode; will automatically disconnect. This, amongst other things, relieves the server of unnecessary connections which would otherwise reduce its availability for other subscribers; it also makes sure that an automatically-established Internet connection is not held unnecessarily even if no data is being sent or received.</para>
+
+<tip> 
+<para>This settings mainly makes sense if one receives and reads news online; for local news servers it is of almost no importance. If this waiting time is set too low, there can be waiting periods if you read a longer article and do not do <quote>anything</quote> for some time: &knode; will have cancelled the connection to the server by then (after the time period has elapsed) and has to reestablish it, causing a delay.</para> 
+<para>If the waiting time is set too high you might waste online time whilst doing nothing (perhaps increasing your phone bill).</para> </tip>
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Timeout</guilabel
-></title
-> 
+<sect3> 
+<title><guilabel>Timeout</guilabel></title> 
 
-<para
->If &knode; connects to the news server it waits no longer than the time specified here for an answer; if the period is exceeded &knode; cancels the connection attempt and you will get an error message stating that the server is not responding.</para>
+<para>If &knode; connects to the news server it waits no longer than the time specified here for an answer; if the period is exceeded &knode; cancels the connection attempt and you will get an error message stating that the server is not responding.</para>
 
 <tip>
-<para
->Depending on the quality of your Internet account and the news server's current load there can be busy periods where &knode; cancels the connection; if this happens frequently, you should set this setting to a higher value.</para>
+<para>Depending on the quality of your Internet account and the news server's current load there can be busy periods where &knode; cancels the connection; if this happens frequently, you should set this setting to a higher value.</para>
 </tip>
-</sect3
-> 
-
-<sect3
-> 
-<title
-> 
-<guilabel
->Fetch group descriptions</guilabel
-></title
-> 
-
-<para
->If this setting is selected, &knode; additionally requests the available group descriptions; they will be displayed in the <guilabel
->Subscribe to Newsgroups</guilabel
-> dialogue.</para>
-
-<tip
-> 
-<para
->There is not a group description for every group, so it is not an error if no group description is shown when subscribing to a group later on.</para
-> 
-</tip
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Server requires authentication</guilabel
-></title
-> 
-
-<para
->The option <guilabel
->Server requires authentication</guilabel
-> needs only to be selected if your news server requires a user name and a password when retrieving articles; you can find out if this is the case from your Internet service provider or the server's maintainer.</para>
-
-<tip
-> 
-<para
->If you do not know if this setting is necessary forget about selecting it for now: if you encounter an error later on, you can try selecting it then. Otherwise, select this option and enter your user name under <guilabel
->User</guilabel
-> and the associated password under <guilabel
->Password</guilabel
->.</para>
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->General notes</title
-> 
-
-<para
->By now you have completed the setup of your news account. You can confirm and save your settings by clicking on the <guibutton
->OK</guibutton
-> button: as soon as you have done that, the account will appear in the list by the name that you entered in <guilabel
->Name</guilabel
-> earlier; and, if you have a close look, you will see that the account also appears in the folder view.</para>
-
-<para
->Using the <guibutton
->Subscribe</guibutton
-> button you could get directly to the dialogue for subscribing to news groups; but, we still have more to do so we'll ignore it for now: there are several ways that lead to the goal.</para>
-
-<para
->In the <link linkend="multiple-news-accounts"
-> Managing multiple news accounts</link
-> chapter you can learn how to work with multiple news accounts, but first we will stay with this one; in most cases, one account is sufficient.</para>
-
-<caution
-> 
-<para
->Please note that some Internet providers only allow retrieving news from their news server if you are connected to the Internet through them.</para
-> 
-</caution
-> 
-
-<para
->We will now move on to configuring the email account; in order to do that, click on the <guilabel
->Mail</guilabel
-> entry in the tree view on the left.</para>
-
-</sect3
-> 
-</sect2
-> 
-
-<sect2 id="setting-the-mail-account"
-> 
-<title
->Setting up the mail account</title
-> 
-
-<para
->After selecting <guilabel
->Mail</guilabel
-> in the tree view, the following Dialogue Box appears.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->Dialogue Box for setting up the mail account</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-mail-account.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Setting up the mail account</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Setting up the mail account</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->You will notice this Dialogue Box is very similar to the news account settings Dialogue Box; but why do we need an email account in a newsreader?</para>
-
-<para
->Sometimes you need to answer to the author of an article directly, without posting to the newsgroup; for example, when you want to make a very personal comment or want to correct an error. Sometimes an email is more appropriate than a public remark.</para>
-
-<para
->That's why &knode; provides the possibility to reply by email; if you want to use this feature you must tell &knode; how to send emails: you just need to insert the mail server's address. If you have already configured an email account, &eg; with &kmail;, you can reuse the settings used there.</para>
-
-<sect3
-> 
-<title
-><guilabel
->Use external mail program</guilabel
-></title
-> 
-
-<para
->If this option is active &knode; will use the mail program which is configured in the control centre; the other options in this dialogue will then be disabled.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Server</guilabel
-></title
-> 
-
-<para
->The name (address) of your mail server as provided by your Internet service provider or system administrator; all you have to do here is enter the mail server's name in the <guilabel
->Server</guilabel
-> field.</para>
-
-<para
->In our example we enter<userinput
-><systemitem class="systemname"
->mail.server.de</systemitem
-></userinput
-></para>
+</sect3> 
+
+<sect3> 
+<title> 
+<guilabel>Fetch group descriptions</guilabel></title> 
+
+<para>If this setting is selected, &knode; additionally requests the available group descriptions; they will be displayed in the <guilabel>Subscribe to Newsgroups</guilabel> dialogue.</para>
+
+<tip> 
+<para>There is not a group description for every group, so it is not an error if no group description is shown when subscribing to a group later on.</para> 
+</tip> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Server requires authentication</guilabel></title> 
+
+<para>The option <guilabel>Server requires authentication</guilabel> needs only to be selected if your news server requires a user name and a password when retrieving articles; you can find out if this is the case from your Internet service provider or the server's maintainer.</para>
+
+<tip> 
+<para>If you do not know if this setting is necessary forget about selecting it for now: if you encounter an error later on, you can try selecting it then. Otherwise, select this option and enter your user name under <guilabel>User</guilabel> and the associated password under <guilabel>Password</guilabel>.</para>
+</tip> 
+</sect3> 
+
+<sect3> 
+<title>General notes</title> 
+
+<para>By now you have completed the setup of your news account. You can confirm and save your settings by clicking on the <guibutton>OK</guibutton> button: as soon as you have done that, the account will appear in the list by the name that you entered in <guilabel>Name</guilabel> earlier; and, if you have a close look, you will see that the account also appears in the folder view.</para>
+
+<para>Using the <guibutton>Subscribe</guibutton> button you could get directly to the dialogue for subscribing to news groups; but, we still have more to do so we'll ignore it for now: there are several ways that lead to the goal.</para>
+
+<para>In the <link linkend="multiple-news-accounts"> Managing multiple news accounts</link> chapter you can learn how to work with multiple news accounts, but first we will stay with this one; in most cases, one account is sufficient.</para>
+
+<caution> 
+<para>Please note that some Internet providers only allow retrieving news from their news server if you are connected to the Internet through them.</para> 
+</caution> 
+
+<para>We will now move on to configuring the email account; in order to do that, click on the <guilabel>Mail</guilabel> entry in the tree view on the left.</para>
+
+</sect3> 
+</sect2> 
+
+<sect2 id="setting-the-mail-account"> 
+<title>Setting up the mail account</title> 
+
+<para>After selecting <guilabel>Mail</guilabel> in the tree view, the following Dialogue Box appears.</para> 
+
+<screenshot> 
+<screeninfo>Dialogue Box for setting up the mail account</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-mail-account.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Setting up the mail account</phrase> 
+</textobject> 
+<caption> 
+<para>Setting up the mail account</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>You will notice this Dialogue Box is very similar to the news account settings Dialogue Box; but why do we need an email account in a newsreader?</para>
+
+<para>Sometimes you need to answer to the author of an article directly, without posting to the newsgroup; for example, when you want to make a very personal comment or want to correct an error. Sometimes an email is more appropriate than a public remark.</para>
+
+<para>That's why &knode; provides the possibility to reply by email; if you want to use this feature you must tell &knode; how to send emails: you just need to insert the mail server's address. If you have already configured an email account, &eg; with &kmail;, you can reuse the settings used there.</para>
+
+<sect3> 
+<title><guilabel>Use external mail program</guilabel></title> 
+
+<para>If this option is active &knode; will use the mail program which is configured in the control centre; the other options in this dialogue will then be disabled.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Server</guilabel></title> 
+
+<para>The name (address) of your mail server as provided by your Internet service provider or system administrator; all you have to do here is enter the mail server's name in the <guilabel>Server</guilabel> field.</para>
+
+<para>In our example we enter<userinput><systemitem class="systemname">mail.server.de</systemitem></userinput></para>
 
 <tip>
-<para
->If you have one you can send your mail via a local mail server; if this is the case local mail server enter <systemitem class="systemname"
->localhost</systemitem
-> in the <guilabel
->Server</guilabel
-> field.</para>
-</tip
-> 
+<para>If you have one you can send your mail via a local mail server; if this is the case local mail server enter <systemitem class="systemname">localhost</systemitem> in the <guilabel>Server</guilabel> field.</para>
+</tip> 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Port</guilabel
-></title
-> 
-
-<para
->Again, the <guilabel
->Port</guilabel
-> field has a default value; in this case it's port 25. You should not need to change this, unless your <acronym
->ISP</acronym
-> has a very exotic configuration and tells you to do so. We do not change this for the example.</para>
+<sect3> 
+<title><guilabel>Port</guilabel></title> 
+
+<para>Again, the <guilabel>Port</guilabel> field has a default value; in this case it's port 25. You should not need to change this, unless your <acronym>ISP</acronym> has a very exotic configuration and tells you to do so. We do not change this for the example.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
->Hold connection for</title
-> 
-
-<para
->This value is important: if you have established a connection with your mail server and there is no data transfer occurring &knode; cancels the connection to your mailserver after the specified amount of time has elapsed.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Timeout</guilabel
-></title
-> 
-
-<para
->When &knode; tries to connect to the mail server it will wait this long for a reply from the server; if this time is exceeded, you will get a error message.</para
-> 
-
-<tip
-> 
-<para
->Depending on the quality of your connection and the actual load of your mail server you might get long reply times; if &knode; cancels the connection due to this, you should increase the timeout.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->General notes</title>
-
-<caution
-> 
-<para
->Some <acronym
->ISP</acronym
->s only allow you to send email using their mail server after you have checked your mailbox for new mail: this reduces spamming.</para
-> 
-
-<para
->For the same reasons, some <acronym
->ISP</acronym
->s will only allow you to send mail using their mailservers if you are online with them or if you are logged in at the mailserver; for example, this is the normal configuration at GMX and isn't supported by &knode; or &kmail; yet.</para>
+<sect3> 
+<title>Hold connection for</title> 
+
+<para>This value is important: if you have established a connection with your mail server and there is no data transfer occurring &knode; cancels the connection to your mailserver after the specified amount of time has elapsed.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Timeout</guilabel></title> 
+
+<para>When &knode; tries to connect to the mail server it will wait this long for a reply from the server; if this time is exceeded, you will get a error message.</para> 
+
+<tip> 
+<para>Depending on the quality of your connection and the actual load of your mail server you might get long reply times; if &knode; cancels the connection due to this, you should increase the timeout.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title>General notes</title>
+
+<caution> 
+<para>Some <acronym>ISP</acronym>s only allow you to send email using their mail server after you have checked your mailbox for new mail: this reduces spamming.</para> 
+
+<para>For the same reasons, some <acronym>ISP</acronym>s will only allow you to send mail using their mailservers if you are online with them or if you are logged in at the mailserver; for example, this is the normal configuration at GMX and isn't supported by &knode; or &kmail; yet.</para>
 </caution>
 
 </sect3>
 </sect2>
 
 <sect2 id="knode-appearance">
-<title
->Defining the appearance</title>
+<title>Defining the appearance</title>
 
-<para
->With the <guilabel
->Appearance</guilabel
-> dialogue you are given the ability to set the colours, the character code and the font size of the text in the article window; the picture below shows the dialogue.</para>
+<para>With the <guilabel>Appearance</guilabel> dialogue you are given the ability to set the colours, the character code and the font size of the text in the article window; the picture below shows the dialogue.</para>
 
 <screenshot>
-<screeninfo
->Setting up the Appearance dialogue</screeninfo>
+<screeninfo>Setting up the Appearance dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-colors-fonts.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->Setting up the Appearance dialogue</phrase>
+<phrase>Setting up the Appearance dialogue</phrase>
 </textobject>
 <caption>
-<para
->Setting up the Appearance dialogue</para>
+<para>Setting up the Appearance dialogue</para>
 </caption>
 </mediaobject>
 </screenshot>
 
 <sect3>
-<title
-><guilabel
->Use custom colours</guilabel
-></title>
+<title><guilabel>Use custom colours</guilabel></title>
 
-<para
->If you select this option you can adjust the colour settings of &knode; in the list field below; to change a colour setting do a double-click with the &LMB; on the list entry to open the &kde; colour-selection dialogue.</para>
+<para>If you select this option you can adjust the colour settings of &knode; in the list field below; to change a colour setting do a double-click with the &LMB; on the list entry to open the &kde; colour-selection dialogue.</para>
 
-<para
->The colour selection can only be configured after the checkbox has been checked; otherwise, a double-click on the list entries won't do anything.</para>
+<para>The colour selection can only be configured after the checkbox has been checked; otherwise, a double-click on the list entries won't do anything.</para>
 
 <caution>
-<para
->If the <guilabel
->Use custom colours</guilabel
-> setting is selected &knode; won't use colours which have been changed later globally for &kde; but will only use the colours defined here instead.</para>
+<para>If the <guilabel>Use custom colours</guilabel> setting is selected &knode; won't use colours which have been changed later globally for &kde; but will only use the colours defined here instead.</para>
 </caution>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Use custom fonts</guilabel
-></title>
-
-<para
->If you select this setting you can adjust the fonts which &knode; uses for the display in the list field below; to choose a font do a double-click with the &LMB; on the list entry to open the &kde; font-selection dialogue.</para>
-
-<para
->The font can only be configured after the checkbox has been checked; otherwise, a double click on the list entries won't do anything.</para>
-
-<caution
-> 
-<para
->If the setting <guilabel
->Use custom fonts</guilabel
-> is selected &knode; won't use later changes to the global font settings for &kde; but will use the fonts defined here instead.</para
-> 
-</caution
-> 
-</sect3
-> 
-
-</sect2
-> 
-
-<sect2 id="setting-news-general"
-> 
-<title
->General News Settings</title
-> 
-
-<para
->Now click on <guibutton
->Reading news</guibutton
-> and then on the <guibutton
->General</guibutton
-> sub-entry; the figure below shows the dialogue containing the preferences you can configure there.</para
-> 
-
-<screenshot
-> 
-<screeninfo
-><guilabel
->General Preferences</guilabel
-> Dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-read-news-settings.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The <guilabel
->General Preferences</guilabel
-> dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The <guilabel
->General Preferences</guilabel
-> dialogue</para>
+<title><guilabel>Use custom fonts</guilabel></title>
+
+<para>If you select this setting you can adjust the fonts which &knode; uses for the display in the list field below; to choose a font do a double-click with the &LMB; on the list entry to open the &kde; font-selection dialogue.</para>
+
+<para>The font can only be configured after the checkbox has been checked; otherwise, a double click on the list entries won't do anything.</para>
+
+<caution> 
+<para>If the setting <guilabel>Use custom fonts</guilabel> is selected &knode; won't use later changes to the global font settings for &kde; but will use the fonts defined here instead.</para> 
+</caution> 
+</sect3> 
+
+</sect2> 
+
+<sect2 id="setting-news-general"> 
+<title>General News Settings</title> 
+
+<para>Now click on <guibutton>Reading news</guibutton> and then on the <guibutton>General</guibutton> sub-entry; the figure below shows the dialogue containing the preferences you can configure there.</para> 
+
+<screenshot> 
+<screeninfo><guilabel>General Preferences</guilabel> Dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-read-news-settings.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The <guilabel>General Preferences</guilabel> dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The <guilabel>General Preferences</guilabel> dialogue</para>
 </caption>
 </mediaobject>
 </screenshot>
 
-<para
->You don't need to change most of these settings, but we will discuss them step-by-step to give you an overview of the possibilities of &knode;.</para>
+<para>You don't need to change most of these settings, but we will discuss them step-by-step to give you an overview of the possibilities of &knode;.</para>
 
-<sect3
-> 
-<title
-><guilabel
->Check for new articles automatically</guilabel
-></title
-> 
+<sect3> 
+<title><guilabel>Check for new articles automatically</guilabel></title> 
 
-<para
->If this box is checked &knode; tries to request new articles from the server when selecting a newsgroup. These settings especially make sense when you use &knode; together with a local news server: downloading the messages obviously only works when the server is reachable; for a server which is only reachable via an Internet connection, this setting rarely makes sense and should stay deactivated.</para>
+<para>If this box is checked &knode; tries to request new articles from the server when selecting a newsgroup. These settings especially make sense when you use &knode; together with a local news server: downloading the messages obviously only works when the server is reachable; for a server which is only reachable via an Internet connection, this setting rarely makes sense and should stay deactivated.</para>
 
-<para
->If your system isn't set up to establish an Internet connection if necessary, you will get an error message each time you select a newsgroup.</para>
+<para>If your system isn't set up to establish an Internet connection if necessary, you will get an error message each time you select a newsgroup.</para>
 
-<para
->If you want to keep control over when a connection to the server is established, the <menuchoice
-><guimenu
->Group</guimenu
-><guimenuitem
->Get new articles</guimenuitem
-></menuchoice
-> menu option is appropriate.</para>
+<para>If you want to keep control over when a connection to the server is established, the <menuchoice><guimenu>Group</guimenu><guimenuitem>Get new articles</guimenuitem></menuchoice> menu option is appropriate.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Maximal number of articles to fetch</guilabel
-></title
-> 
-
-<para
->This sets a restriction on the number articles which are requested from the server while downloading. The value configured here is for each newsgroup separately. If this is set, for instance, to 300 only the 300 newest articles of the newsgroup are requested; other articles will be discarded.</para
-> 
-
-<warning
-> 
-<para
->For newsgroups with relatively high traffic you might lose articles if this value is too low; this especially occurs when you've just subscribed to a newsgroup or only occasionally download articles and the traffic for this reason rises above the value specified here.</para>
-</warning
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Mark article as read after</guilabel
-></title
-> 
-
-<para
->Articles you have opened in the article window are marked as read after the number of seconds specified here. If you set this value to be relatively high you avoid articles you have just glanced at being marked as read; on the other hand, it can be annoying for relatively short articles, for which you need less time to read than specified: if you browsed too quickly through the articles they would stay unread even though you have read them. Therefore, you should adjust this value to your personal preferences.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Mark crossposted articles as read</guilabel
-></title>
-
-<para
->Sometimes an <glossterm
->article</glossterm
-> will be posted to more than one group; this is known as crossposting. If you activate this option, those crossposted articles will be marked as read in all the newsgroups to which they were posted if you read it in one newsgroup.</para>
+<sect3> 
+<title><guilabel>Maximal number of articles to fetch</guilabel></title> 
+
+<para>This sets a restriction on the number articles which are requested from the server while downloading. The value configured here is for each newsgroup separately. If this is set, for instance, to 300 only the 300 newest articles of the newsgroup are requested; other articles will be discarded.</para> 
+
+<warning> 
+<para>For newsgroups with relatively high traffic you might lose articles if this value is too low; this especially occurs when you've just subscribed to a newsgroup or only occasionally download articles and the traffic for this reason rises above the value specified here.</para>
+</warning> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Mark article as read after</guilabel></title> 
+
+<para>Articles you have opened in the article window are marked as read after the number of seconds specified here. If you set this value to be relatively high you avoid articles you have just glanced at being marked as read; on the other hand, it can be annoying for relatively short articles, for which you need less time to read than specified: if you browsed too quickly through the articles they would stay unread even though you have read them. Therefore, you should adjust this value to your personal preferences.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Mark crossposted articles as read</guilabel></title>
+
+<para>Sometimes an <glossterm>article</glossterm> will be posted to more than one group; this is known as crossposting. If you activate this option, those crossposted articles will be marked as read in all the newsgroups to which they were posted if you read it in one newsgroup.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Smart scrolling</guilabel
-></title
-> 
+<title><guilabel>Smart scrolling</guilabel></title> 
 
-<para
->If this option is selected the lines in the article list are scrolled smoothly instead of jerkily. </para
->  <!-- LW: FIXME could be explained a tiny bit better -->
+<para>If this option is selected the lines in the article list are scrolled smoothly instead of jerkily. </para>  <!-- LW: FIXME could be explained a tiny bit better -->
 
-</sect3
-> 
+</sect3> 
 
 <sect3>
-<title
-><guilabel
->Show whole thread on expanding</guilabel
-></title>
+<title><guilabel>Show whole thread on expanding</guilabel></title>
 
-<para
->This setting lets a discussion be displayed completely (over multiple answer levels) if you click on the plus in front of the discussion; if this setting isn't checked, only the immediate answers to the current article are displayed.</para>
+<para>This setting lets a discussion be displayed completely (over multiple answer levels) if you click on the plus in front of the discussion; if this setting isn't checked, only the immediate answers to the current article are displayed.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Default to expanded threads</guilabel
-></title>
+<title><guilabel>Default to expanded threads</guilabel></title>
 
-<para
->Here you can toggle whether the threads are expanded by default or not.</para>
+<para>Here you can toggle whether the threads are expanded by default or not.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Show article score</guilabel
-></title
-> 
-
-<para
->Here you can toggle whether the scoring column should be shown in the article view.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Show line count</guilabel
-></title
-> 
-
-<para
->Here you can toggle whether the column with the number of lines should be shown in the article view.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Cache size for headers</guilabel
-></title>
-
-<para
->Here you can configure how much memory &knode; should use for the caching of the headers.</para>
+<title><guilabel>Show article score</guilabel></title> 
+
+<para>Here you can toggle whether the scoring column should be shown in the article view.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Show line count</guilabel></title> 
+
+<para>Here you can toggle whether the column with the number of lines should be shown in the article view.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Cache size for headers</guilabel></title>
+
+<para>Here you can configure how much memory &knode; should use for the caching of the headers.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Cache size for articles</guilabel
-></title>
+<title><guilabel>Cache size for articles</guilabel></title>
 
-<para
->Here you can configure, how much memory &knode; should use for the caching of the articles.</para>
+<para>Here you can configure, how much memory &knode; should use for the caching of the articles.</para>
 
 </sect3>
 </sect2>
 
 <sect2>
-<title
-><guilabel
->Navigation</guilabel
-></title>
+<title><guilabel>Navigation</guilabel></title>
 
-<para
->Here you can change some navigation properties of &knode;. Normally everything here is switched off, but if you don't like this kind of navigation you can change it.</para>
+<para>Here you can change some navigation properties of &knode;. Normally everything here is switched off, but if you don't like this kind of navigation you can change it.</para>
 
 <sect3>
-<title
-><guilabel
->General</guilabel
-></title>
+<title><guilabel>General</guilabel></title>
 
-<para
->The keyboard behaviour between &knode; and &kmail; is a bit different; with the <guilabel
->Emulate the keyboard behaviour of KMail</guilabel
-> switch you can activate the same keyboard behaviour as in &kmail; for &knode;.</para>
+<para>The keyboard behaviour between &knode; and &kmail; is a bit different; with the <guilabel>Emulate the keyboard behaviour of KMail</guilabel> switch you can activate the same keyboard behaviour as in &kmail; for &knode;.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Mark All as Read</guilabel
-></title>
-
-<para
->If the box <guilabel
->Switch to next group</guilabel
-> is checked, &knode; automatically switches to the next group if you mark all articles as read.</para>
+<title><guilabel>Mark All as Read</guilabel></title>
+
+<para>If the box <guilabel>Switch to next group</guilabel> is checked, &knode; automatically switches to the next group if you mark all articles as read.</para>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Mark Thread as Read</guilabel
-></title>
+<title><guilabel>Mark Thread as Read</guilabel></title>
 
-<para
->If <guilabel
->Close the current thread</guilabel
-> is checked, &knode; automatically closes a thread if you mark it as read.</para>
+<para>If <guilabel>Close the current thread</guilabel> is checked, &knode; automatically closes a thread if you mark it as read.</para>
 
-<para
->If <guilabel
->Go to next unread thread</guilabel
-> is checked, &knode; automatically shows the next thread if you mark the the previous thread as read.</para>
+<para>If <guilabel>Go to next unread thread</guilabel> is checked, &knode; automatically shows the next thread if you mark the the previous thread as read.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Ignore Thread</guilabel
-></title>
+<title><guilabel>Ignore Thread</guilabel></title>
 
-<para
->If <guilabel
->Close the current thread</guilabel
->is checked, &knode; automatically closes a thread if you choose to ignore it.</para>
+<para>If <guilabel>Close the current thread</guilabel>is checked, &knode; automatically closes a thread if you choose to ignore it.</para>
 
-<para
->If <guilabel
->Go to next unread thread</guilabel
-> is checked, &knode; automatically shows the next thread if you choose to ignore the previous one.</para>
+<para>If <guilabel>Go to next unread thread</guilabel> is checked, &knode; automatically shows the next thread if you choose to ignore the previous one.</para>
 
 </sect3>
 </sect2>
 
 <sect2 id="knode-scoring-settings">
-<title
->Scoring rules</title>
-
-<para
->To sort the articles you have the possibility to score them. The standard score is 0: a higher score means that the <glossterm
->article</glossterm
-> is interesting; a lower score means it is less interesting.</para>
-
-<para
->In the middle of the window you see a big, white area; here you can see your scoring rules. Scoring rules are used by &knode; to score the incoming articles automatically; if, for example, a person always posts nonsense you can automatically score the articles of that person down and hide them.</para>
-
-<para
->With the buttons below the list of scoring-rules you can <guibutton
->edit</guibutton
->, <guibutton
->add</guibutton
->, <guibutton
->remove</guibutton
-> and <guibutton
->copy</guibutton
-> a rule. We will skip this feature for now, because it is not essential for the setup of &knode;.</para>
-
-<para
->You can learn more about scoring; in the chapter <link linkend="anc-score-watch-ignore"
->Scoring, watching and ignoring</link
->.</para>
+<title>Scoring rules</title>
+
+<para>To sort the articles you have the possibility to score them. The standard score is 0: a higher score means that the <glossterm>article</glossterm> is interesting; a lower score means it is less interesting.</para>
+
+<para>In the middle of the window you see a big, white area; here you can see your scoring rules. Scoring rules are used by &knode; to score the incoming articles automatically; if, for example, a person always posts nonsense you can automatically score the articles of that person down and hide them.</para>
+
+<para>With the buttons below the list of scoring-rules you can <guibutton>edit</guibutton>, <guibutton>add</guibutton>, <guibutton>remove</guibutton> and <guibutton>copy</guibutton> a rule. We will skip this feature for now, because it is not essential for the setup of &knode;.</para>
+
+<para>You can learn more about scoring; in the chapter <link linkend="anc-score-watch-ignore">Scoring, watching and ignoring</link>.</para>
 
 <sect3>
-<title
-><guilabel
->Default score for ignored threads</guilabel
-></title
-> 
-
-<para
->Normally you only need the functions ignore and watch; this simply shows if a thread is interesting or not. Here you can configure a default score for the ignored threads; choosing the <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Ignore Thread</guimenuitem
-></menuchoice
-> menu item will give this score to all the posts in that thread, and will apply that score also to future posts that follow up the thread.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Default score for watched threads</guilabel
-></title
-> 
-
-<para
->If an article is interesting, it will get a score above 0. Here you can enter the default score for those articles; choosing the <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Watch Thread</guimenuitem
-></menuchoice
-> menu item will give this score to all the posts in that thread, and will apply that score also to future posts that follow up the thread.</para>
+<title><guilabel>Default score for ignored threads</guilabel></title> 
+
+<para>Normally you only need the functions ignore and watch; this simply shows if a thread is interesting or not. Here you can configure a default score for the ignored threads; choosing the <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Ignore Thread</guimenuitem></menuchoice> menu item will give this score to all the posts in that thread, and will apply that score also to future posts that follow up the thread.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Default score for watched threads</guilabel></title> 
+
+<para>If an article is interesting, it will get a score above 0. Here you can enter the default score for those articles; choosing the <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Watch Thread</guimenuitem></menuchoice> menu item will give this score to all the posts in that thread, and will apply that score also to future posts that follow up the thread.</para>
 
 <tip>
-<para
->You can use the <keycap
->W</keycap
-> key to watch a thread or the <keycap
->I</keycap
-> key to ignore it.</para
-> 
-</tip
-> 
-</sect3
-> 
-</sect2
-> 
+<para>You can use the <keycap>W</keycap> key to watch a thread or the <keycap>I</keycap> key to ignore it.</para> 
+</tip> 
+</sect3> 
+</sect2> 
 
 <sect2 id="knode-filter-settings">
-<title
->Filter settings</title>
-
-<para
->This screenshot shows the filter settings.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The filter settings</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-filters.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The filter settings</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The filter settings</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->This dialogue shows two lists. The upper list, labelled <guilabel
-> Filters</guilabel
->, shows all defined filters; when you use &knode; for the first time, you will only see the predefined filters.</para
-> 
-
-<para
->With the buttons <guibutton
->Add</guibutton
->, <guibutton
->Delete</guibutton
->, <guibutton
->Edit</guibutton
-> and <guibutton
->Copy</guibutton
-> you can add new filters or delete filters which are no longer needed; we will skip this feature for now, because it is not essential for the setup of &knode;.</para
-> 
-
-<para
->You can find more-detailed information about filters in <link linkend="using-filters"
->Defining and using filters</link
->.</para>
-
-<para
->The lower list, labelled <guilabel
->Menu</guilabel
->, shows the appearance of the <menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Filter</guisubmenu
-></menuchoice
-> menu, which you can reach from the menu bar; the order of the filters in the this menu can be configured in this list.</para>
-
-<para
->The <guibutton
->Up</guibutton
-> button shifts the selected filter one position up. Try it: select the second filter and press <guibutton
->Up</guibutton
->; this entry will then go up one position.</para
-> 
-
-<para
->The <guibutton
->Down</guibutton
-> button does the opposite action: select the filter you just shifted one up and press<guibutton
->Down</guibutton
-> until it reaches its old position.</para>
-
-<para
->With the two buttons <guibutton
->Add Separator</guibutton
-> and <guibutton
->Remove Separator</guibutton
-> you can visually group the filters on the menu. The separators are shown as <literal
->====</literal
-> in the list; in the Menu they show up as some more-appealing horizontal lines. Try adding separator; then, select the separator and remove it by pressing <guibutton
->Remove separator</guibutton
->.</para
-> 
-
-<para
->Any changes you make here, you can see in <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-></menuchoice
-> after closing this dialogue.</para
-> 
-
-</sect2
-> 
-
-<sect2 id="knode-headers"
-> 
-<title
-><guilabel
->Customise displayed article headers</guilabel
-></title
-> 
+<title>Filter settings</title>
+
+<para>This screenshot shows the filter settings.</para> 
+
+<screenshot> 
+<screeninfo>The filter settings</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-filters.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The filter settings</phrase> 
+</textobject> 
+<caption> 
+<para>The filter settings</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>This dialogue shows two lists. The upper list, labelled <guilabel> Filters</guilabel>, shows all defined filters; when you use &knode; for the first time, you will only see the predefined filters.</para> 
+
+<para>With the buttons <guibutton>Add</guibutton>, <guibutton>Delete</guibutton>, <guibutton>Edit</guibutton> and <guibutton>Copy</guibutton> you can add new filters or delete filters which are no longer needed; we will skip this feature for now, because it is not essential for the setup of &knode;.</para> 
+
+<para>You can find more-detailed information about filters in <link linkend="using-filters">Defining and using filters</link>.</para>
+
+<para>The lower list, labelled <guilabel>Menu</guilabel>, shows the appearance of the <menuchoice><guimenu>View</guimenu> <guisubmenu>Filter</guisubmenu></menuchoice> menu, which you can reach from the menu bar; the order of the filters in the this menu can be configured in this list.</para>
+
+<para>The <guibutton>Up</guibutton> button shifts the selected filter one position up. Try it: select the second filter and press <guibutton>Up</guibutton>; this entry will then go up one position.</para> 
+
+<para>The <guibutton>Down</guibutton> button does the opposite action: select the filter you just shifted one up and press<guibutton>Down</guibutton> until it reaches its old position.</para>
+
+<para>With the two buttons <guibutton>Add Separator</guibutton> and <guibutton>Remove Separator</guibutton> you can visually group the filters on the menu. The separators are shown as <literal>====</literal> in the list; in the Menu they show up as some more-appealing horizontal lines. Try adding separator; then, select the separator and remove it by pressing <guibutton>Remove separator</guibutton>.</para> 
+
+<para>Any changes you make here, you can see in <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu></menuchoice> after closing this dialogue.</para> 
+
+</sect2> 
+
+<sect2 id="knode-headers"> 
+<title><guilabel>Customise displayed article headers</guilabel></title> 
 
 <anchor id="anc-knode-headers"/> 
 
-<para
->In this dialogue you can set how the single header lines are displayed in the article window.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The <guilabel
->Customise displayed article headers</guilabel
-> Dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-header-settings.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The <guilabel
->Customise displayed article headers</guilabel
-> dialogue</phrase
-> 
-</textobject
-> 
+<para>In this dialogue you can set how the single header lines are displayed in the article window.</para> 
+
+<screenshot> 
+<screeninfo>The <guilabel>Customise displayed article headers</guilabel> Dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-header-settings.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The <guilabel>Customise displayed article headers</guilabel> dialogue</phrase> 
+</textobject> 
 <caption>
-<para
->The <guilabel
->Customise displayed article headers</guilabel
-> dialogue</para>
+<para>The <guilabel>Customise displayed article headers</guilabel> dialogue</para>
 </caption>
 </mediaobject>
 </screenshot>
 
-<para
->This list shows all the header lines which are to be display in the article window. The identifiers at the left will be displayed alongside the header lines in &lt; &gt; to their right; the header lines are taken from each message, &eg; for <guilabel
->From</guilabel
-> the From header line will be used (indicating who send the message).</para>
-
-<para
->Using <guibutton
->Edit</guibutton
-> you can alter the shown identifiers, alter the header line shown by each identifier and change the font settings of the text used. To make things clearer, we'll now simply select the <guilabel
->From:&lt;From&gt;</guilabel
-> entry in the list and open the dialogue for editing the header display by clicking on <guibutton
->Edit</guibutton
->.</para
-> 
+<para>This list shows all the header lines which are to be display in the article window. The identifiers at the left will be displayed alongside the header lines in &lt; &gt; to their right; the header lines are taken from each message, &eg; for <guilabel>From</guilabel> the From header line will be used (indicating who send the message).</para>
+
+<para>Using <guibutton>Edit</guibutton> you can alter the shown identifiers, alter the header line shown by each identifier and change the font settings of the text used. To make things clearer, we'll now simply select the <guilabel>From:&lt;From&gt;</guilabel> entry in the list and open the dialogue for editing the header display by clicking on <guibutton>Edit</guibutton>.</para> 
 
 <screenshot>
-<screeninfo
->The Header Properties Dialogue</screeninfo>
+<screeninfo>The Header Properties Dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-edit-header1.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->The Header Properties dialogue</phrase>
+<phrase>The Header Properties dialogue</phrase>
 </textobject>
 <caption>
-<para
->The Header Properties dialogue</para>
+<para>The Header Properties dialogue</para>
 </caption>
-</mediaobject
-> 
-</screenshot
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Header</guilabel
-></title
-> 
-
-<para
->The <guilabel
->Header</guilabel
-> selection box shows the entry <guilabel
->From</guilabel
->: that is the name of the header line for the sender, as present in the article and evaluated by the newsreader. If you drop down the selection box &knode; shows a range of other identifiers, which stand all for a certain header lines in the article: for now, we'll leave the <guilabel
->From</guilabel
-> identifier configured; we'll work with this list later, when we add a header line to the display.</para
-> 
+</mediaobject> 
+</screenshot> 
+
+<sect3> 
+<title><guilabel>Header</guilabel></title> 
+
+<para>The <guilabel>Header</guilabel> selection box shows the entry <guilabel>From</guilabel>: that is the name of the header line for the sender, as present in the article and evaluated by the newsreader. If you drop down the selection box &knode; shows a range of other identifiers, which stand all for a certain header lines in the article: for now, we'll leave the <guilabel>From</guilabel> identifier configured; we'll work with this list later, when we add a header line to the display.</para> 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Displayed Name</guilabel
-></title
-> 
-
-<para
->This field holds the name you'd like to be later shown in the article window as a label alongside the actual header line text; for example, for the <guilabel
->From</guilabel
-> header line the label <guilabel
->From</guilabel
-> is used. If you leave this field blank, only the content of the header line appears in the article window; this is, for example, the default setting for the <guilabel
->Subject</guilabel
-> header line. We won't change anything here either, for now.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Name</guilabel
-></title
-> 
-
-<para
->Here you can influence the way the 'Displayed Name' text is displayed; in our case, the <guilabel
->Bold</guilabel
-> attribute is selected for the name <guilabel
->From</guilabel
->, &ie; the text will be shown in bold letters in the article window. Of course, you can combine different attributes, for example <guilabel
->Bold</guilabel
-> and <guilabel
->Underlined</guilabel
->.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Value</title
-> 
-
-<para
->Here you can influence the way the header text is displayed in the article window; for example, if the <guilabel
->Italic</guilabel
-> entry is selected the sender, &eg; <quote
->John Doe &lt;johndoe@doubleguns.com&gt;</quote
-> will appears in an italic font.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Add and remove header lines to the display</title>
-
-<para
->To explain the possibilities of this dialogue to you we're going to add a new header line to the display.</para>
-
-<example
-> 
-<title
->Show the newsreader used for a post in the article window</title
-> 
-
-<para
->This pictures shows the dialogue with the header line <literal
->X-Newsreader</literal
->.</para
-> 
-<screenshot
-> 
-<screeninfo
->The Header Properties Dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-edit-header2.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The Header Properties dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The Header Properties dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
+<sect3> 
+<title><guilabel>Displayed Name</guilabel></title> 
+
+<para>This field holds the name you'd like to be later shown in the article window as a label alongside the actual header line text; for example, for the <guilabel>From</guilabel> header line the label <guilabel>From</guilabel> is used. If you leave this field blank, only the content of the header line appears in the article window; this is, for example, the default setting for the <guilabel>Subject</guilabel> header line. We won't change anything here either, for now.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Name</guilabel></title> 
+
+<para>Here you can influence the way the 'Displayed Name' text is displayed; in our case, the <guilabel>Bold</guilabel> attribute is selected for the name <guilabel>From</guilabel>, &ie; the text will be shown in bold letters in the article window. Of course, you can combine different attributes, for example <guilabel>Bold</guilabel> and <guilabel>Underlined</guilabel>.</para>
+
+</sect3> 
+
+<sect3> 
+<title>Value</title> 
+
+<para>Here you can influence the way the header text is displayed in the article window; for example, if the <guilabel>Italic</guilabel> entry is selected the sender, &eg; <quote>John Doe &lt;johndoe@doubleguns.com&gt;</quote> will appears in an italic font.</para>
+
+</sect3> 
+
+<sect3> 
+<title>Add and remove header lines to the display</title>
+
+<para>To explain the possibilities of this dialogue to you we're going to add a new header line to the display.</para>
+
+<example> 
+<title>Show the newsreader used for a post in the article window</title> 
+
+<para>This pictures shows the dialogue with the header line <literal>X-Newsreader</literal>.</para> 
+<screenshot> 
+<screeninfo>The Header Properties Dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-edit-header2.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The Header Properties dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The Header Properties dialogue</para> 
+</caption> 
+</mediaobject> 
 </screenshot>
 
-<para
->It would be nice if one could see which newsreader another subscriber uses in the article window; it is actually quite easy to do this because there is a (optional) header line which contains the necessary information.</para>
+<para>It would be nice if one could see which newsreader another subscriber uses in the article window; it is actually quite easy to do this because there is a (optional) header line which contains the necessary information.</para>
 
-<para
->Drop down the <guilabel
->Header</guilabel
-> selection field and select the <guilabel
->X-Newsreader</guilabel
-> entry from the list.</para>
+<para>Drop down the <guilabel>Header</guilabel> selection field and select the <guilabel>X-Newsreader</guilabel> entry from the list.</para>
 
-<para
->In the <guilabel
->Displayed name</guilabel
-> field, enter <userinput
->Newsreader</userinput
->.</para>
+<para>In the <guilabel>Displayed name</guilabel> field, enter <userinput>Newsreader</userinput>.</para>
 
-<para
->Now you can select any attribute for the display of the field and its content; next, acknowledge your input with the <guibutton
->OK</guibutton
->: the new header line appears now in the list and will later be shown in the article window.</para>
+<para>Now you can select any attribute for the display of the field and its content; next, acknowledge your input with the <guibutton>OK</guibutton>: the new header line appears now in the list and will later be shown in the article window.</para>
 
 </example>
 
-<para
->Use the <guibutton
->up</guibutton
-> and <guibutton
->Down</guibutton
-> buttons to arrange the order of the headers in the article window.</para
-> 
-
-<tip
-> 
-<para
->The statement that the new header line will be shown in the article window is actually pretty optimistic, because the entry X-Newsreader isn't required for Usenet articles; therefore, not all articles will contain that header line: if the line doesn't exist, the according entry simply won't be shown. You can get more information about headers at <ulink url="http://www.kirchwitz.de/~amk/dni/headerzeilen"
->http://www.kirchwitz.de/~amk/dni/headerzeilen</ulink
-> (german)</para
-> 
-</tip
-> 
-</sect3
-> 
-</sect2
-> 
+<para>Use the <guibutton>up</guibutton> and <guibutton>Down</guibutton> buttons to arrange the order of the headers in the article window.</para> 
+
+<tip> 
+<para>The statement that the new header line will be shown in the article window is actually pretty optimistic, because the entry X-Newsreader isn't required for Usenet articles; therefore, not all articles will contain that header line: if the line doesn't exist, the according entry simply won't be shown. You can get more information about headers at <ulink url="http://www.kirchwitz.de/~amk/dni/headerzeilen">http://www.kirchwitz.de/~amk/dni/headerzeilen</ulink> (german)</para> 
+</tip> 
+</sect3> 
+</sect2> 
 
 <sect2>
-<title
-><guilabel
->Viewer</guilabel
-></title
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Show fancy header decorations</guilabel
-></title>
-
-<para
->If this is active, the headers will be 'beautified' a bit; otherwise, only the plain text is shown.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Rewrap text when necessary</guilabel
-></title
-> 
-
-<para
->If this option is active, the text wrapping in the viewer will be automatically corrected.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Remove trailing empty lines</guilabel
-></title>
-
-<para
->If this is active empty lines at the end of the article will be automatically hidden.</para
-> 
+<title><guilabel>Viewer</guilabel></title> 
+
+<sect3> 
+<title><guilabel>Show fancy header decorations</guilabel></title>
+
+<para>If this is active, the headers will be 'beautified' a bit; otherwise, only the plain text is shown.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Rewrap text when necessary</guilabel></title> 
+
+<para>If this option is active, the text wrapping in the viewer will be automatically corrected.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Remove trailing empty lines</guilabel></title>
+
+<para>If this is active empty lines at the end of the article will be automatically hidden.</para> 
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Show signature</guilabel
-></title
-> 
-
-<para
->If this setting is activated, the <glossterm
->signature</glossterm
-> of the sender is displayed in the article window; if it isn't, the signature is suppressed.</para
-> 
-
-<caution
-> 
-<para
->Please notice that &knode; can display the signature correctly only if it can be separated correctly from the article content in the current article: there are newsreaders which do this separation incorrectly. Two <quote
->-</quote
-> characters followed by a <quote
->&nbsp;</quote
-> (space) is correct.</para>
-</caution
-> 
-
-<tip
-> 
-<para
->Many participants in the newsgroups give hints on their homepage or say that they have intentionally erroneously specified their Email addresses in the header fields: if you disable displaying the signature, you might lose this information; on the other hand, you might save yourself from reading strange quotes.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Interpret text-format tags</guilabel
-></title
-> 
-
-<para
->If this is active, all text format tags in the message like <literal
->*bold*</literal
->, <literal
->/italic/</literal
-> and <literal
->_underline_</literal
-> are shown directly in the viewer. These text-format tags are an unofficial standard.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Recognise quote characters</guilabel
-></title
-> 
-
-<para
->To display the quoted text in another size or colour, &knode; needs to recognise that it's quoted text. Quoted text is normally marked with a <quote
->&gt;</quote
-> at the beginning of the line, but sometimes there are other characters. In this field you can enter all characters that should mark quoted text.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Show attachments inline if possible</guilabel
-></title
-> 
-
-<para
->If this setting is marked, &knode; tries to display the contents of possible attachment directly in the window when opening an article; for instance, a picture would be displayed directly below the article text.</para
-> 
-
-<para
->Additionally, you have the possibility to save the attachment or open it with the application you have associated with the <acronym
->MIME</acronym
-> type of the attachment by using the context menu.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Open attachments on click</guilabel
-></title
-> 
-
-<para
->If this box is checked, attachments are opened with the external program which is configured for the <acronym
->MIME</acronym
-> type; if there is no such association, a dialogue for saving a file is opened and you can save the attachment to a separate file.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Show alternative contents as attachments</guilabel
-></title
-> 
-
-<para
->Articles which are sent as Multipart <acronym
->MIME</acronym
-> contain the text of the message in multiple formats, for example as raw text and <acronym
->HTML</acronym
->; the newsreader decides which part of the article is displayed. This setting makes it possible for the other formats to be opened as if they were attachments with a mouse click.</para>
-
-<para
->If this setting is disabled, alternative contents are not displayed.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Open links with</guilabel
-></title
-> 
-
-<para
->Here you can select which browser is used for displaying links you clicked on in a message. Currently, you can either select the <application
->Netscape Navigator</application
-> or the default, &konqueror;; the selected browser has to be installed, of course.</para>
-
-</sect3
-> 
-</sect2
-> 
-
-<sect2 id="knode-post-news-settings"
-> 
-<title
->Settings for publishing articles</title>
-
-<para
->When you post articles with &knode; the settings in the following dialogue box are used.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The Technical Settings dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-post-settings.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The Technical Settings dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The Technical Settings dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<caution
-> 
-<para
->If you choose the wrong settings here your articles could be unreadable or not sendable at all, so please be careful with these settings.</para
-> 
-</caution
-> 
+<sect3> 
+<title><guilabel>Show signature</guilabel></title> 
+
+<para>If this setting is activated, the <glossterm>signature</glossterm> of the sender is displayed in the article window; if it isn't, the signature is suppressed.</para> 
+
+<caution> 
+<para>Please notice that &knode; can display the signature correctly only if it can be separated correctly from the article content in the current article: there are newsreaders which do this separation incorrectly. Two <quote>-</quote> characters followed by a <quote>&nbsp;</quote> (space) is correct.</para>
+</caution> 
+
+<tip> 
+<para>Many participants in the newsgroups give hints on their homepage or say that they have intentionally erroneously specified their Email addresses in the header fields: if you disable displaying the signature, you might lose this information; on the other hand, you might save yourself from reading strange quotes.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Interpret text-format tags</guilabel></title> 
+
+<para>If this is active, all text format tags in the message like <literal>*bold*</literal>, <literal>/italic/</literal> and <literal>_underline_</literal> are shown directly in the viewer. These text-format tags are an unofficial standard.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Recognise quote characters</guilabel></title> 
+
+<para>To display the quoted text in another size or colour, &knode; needs to recognise that it's quoted text. Quoted text is normally marked with a <quote>&gt;</quote> at the beginning of the line, but sometimes there are other characters. In this field you can enter all characters that should mark quoted text.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Show attachments inline if possible</guilabel></title> 
+
+<para>If this setting is marked, &knode; tries to display the contents of possible attachment directly in the window when opening an article; for instance, a picture would be displayed directly below the article text.</para> 
+
+<para>Additionally, you have the possibility to save the attachment or open it with the application you have associated with the <acronym>MIME</acronym> type of the attachment by using the context menu.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Open attachments on click</guilabel></title> 
+
+<para>If this box is checked, attachments are opened with the external program which is configured for the <acronym>MIME</acronym> type; if there is no such association, a dialogue for saving a file is opened and you can save the attachment to a separate file.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Show alternative contents as attachments</guilabel></title> 
+
+<para>Articles which are sent as Multipart <acronym>MIME</acronym> contain the text of the message in multiple formats, for example as raw text and <acronym>HTML</acronym>; the newsreader decides which part of the article is displayed. This setting makes it possible for the other formats to be opened as if they were attachments with a mouse click.</para>
+
+<para>If this setting is disabled, alternative contents are not displayed.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Open links with</guilabel></title> 
+
+<para>Here you can select which browser is used for displaying links you clicked on in a message. Currently, you can either select the <application>Netscape Navigator</application> or the default, &konqueror;; the selected browser has to be installed, of course.</para>
+
+</sect3> 
+</sect2> 
+
+<sect2 id="knode-post-news-settings"> 
+<title>Settings for publishing articles</title>
+
+<para>When you post articles with &knode; the settings in the following dialogue box are used.</para> 
+
+<screenshot> 
+<screeninfo>The Technical Settings dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-post-settings.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The Technical Settings dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The Technical Settings dialogue</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<caution> 
+<para>If you choose the wrong settings here your articles could be unreadable or not sendable at all, so please be careful with these settings.</para> 
+</caution> 
 
 <sect3>
-<title
-><guilabel
->Charset</guilabel
-></title>
+<title><guilabel>Charset</guilabel></title>
 
-<para
->Here you can choose the charset used for encoding your articles. Normally this is <acronym
->US-ASCII</acronym
-> for English speaking countries, but your charset may differ. The default is the charset used in your global &kde; settings, so you should not have to change this.</para>
+<para>Here you can choose the charset used for encoding your articles. Normally this is <acronym>US-ASCII</acronym> for English speaking countries, but your charset may differ. The default is the charset used in your global &kde; settings, so you should not have to change this.</para>
 
-<para
->When you want to post articles in newsgroups with other charsets (&eg; eastern European or Asian) you can set the required charset here.</para>
+<para>When you want to post articles in newsgroups with other charsets (&eg; eastern European or Asian) you can set the required charset here.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Encoding</guilabel
-></title
-> 
+<title><guilabel>Encoding</guilabel></title> 
 
-<para
->Here you set the encoding of the characters for the message transfer; you can choose between 8-bit and 7-bit (quoted-printable).</para>
+<para>Here you set the encoding of the characters for the message transfer; you can choose between 8-bit and 7-bit (quoted-printable).</para>
 
-<para
->If you choose 8-bit encoding most special characters are transfered correctly; this is, for example, the normal option for the German groups (de.*).</para
-> 
+<para>If you choose 8-bit encoding most special characters are transfered correctly; this is, for example, the normal option for the German groups (de.*).</para> 
 
-<para
->If you choose quoted-printable 8-bit characters (&eg; German umlauts or special characters) are send as encoded 7-bit characters.</para>
+<para>If you choose quoted-printable 8-bit characters (&eg; German umlauts or special characters) are send as encoded 7-bit characters.</para>
 
 <tip>
-<para
->In the English newsgroups 7-bit encoding is quite normal.</para>
-</tip
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Use own default charset when replying</guilabel
-></title
-> 
-
-<para
->If this option is active, &knode; uses your default charset for replying instead of the charset of the article you're answering on.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Generate Message-ID</guilabel
-></title
-> 
-
-<para
->When this is active, &knode; generates its own Message-IDs for all articles you post.</para
-> 
-
-<caution
-> 
-<para
->The Message-ID must be unique worldwide: there would otherwise be collisions between messages with the same Message-ID and the news server would reject the second article because it thinks this article has already been received.</para>
-
-<para
->A Message-ID consists of a valid <acronym
->FQDN</acronym
-> (Full Qualified Domain Name); this means it looks similar to an email address with an identification before the <literal
->@</literal
-> and the domain.</para>
-
-<para
->The identification is generated by &knode; automatically, but you must provide a valid domain name in <guilabel
->Hostname</guilabel
->; if you do not have your own domain, you should not activate this option &mdash; let the newsserver generate a Message-ID for you.</para
-> 
-
-<example
-> 
-<title
->Message-ID</title>
-
-<para
->An example for a valid domain would be: <literal
->kde.org</literal
->; a Message-ID generated with this domain would look like:</para
-> 
-
-<screen
->934lek9934@kde.org</screen
-> 
-</example
-> 
-
-<para
->An unique identification is only guaranteed if you have your own domain. Even when you do not use &knode; for generating your Message-IDs there may be collisions when you are using a local newsserver; for example, <application
->leafnode</application
-> generates a Message-ID which it derives from the local hostname.</para>
-
-</caution
-> 
-
-<tip
-> 
-<para
->You can get more information about this and how to own a free domain at <ulink url="http://www.qad.org/faq/faq-messageid.html"
->http://www.qad.org/faq/faq-messageid.html</ulink
->.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Hostname</guilabel
-></title
-> 
-
-<para
->Here you enter the Hostname of your computer; this is used to generate the Message-ID. If you do not have your own domain you should not activate this option &mdash; let the newsserver generate a Message-ID for you. Using the example above this would be: <userinput
->kde.org</userinput
->.</para>
+<para>In the English newsgroups 7-bit encoding is quite normal.</para>
+</tip> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Use own default charset when replying</guilabel></title> 
+
+<para>If this option is active, &knode; uses your default charset for replying instead of the charset of the article you're answering on.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Generate Message-ID</guilabel></title> 
+
+<para>When this is active, &knode; generates its own Message-IDs for all articles you post.</para> 
+
+<caution> 
+<para>The Message-ID must be unique worldwide: there would otherwise be collisions between messages with the same Message-ID and the news server would reject the second article because it thinks this article has already been received.</para>
+
+<para>A Message-ID consists of a valid <acronym>FQDN</acronym> (Full Qualified Domain Name); this means it looks similar to an email address with an identification before the <literal>@</literal> and the domain.</para>
+
+<para>The identification is generated by &knode; automatically, but you must provide a valid domain name in <guilabel>Hostname</guilabel>; if you do not have your own domain, you should not activate this option &mdash; let the newsserver generate a Message-ID for you.</para> 
+
+<example> 
+<title>Message-ID</title>
+
+<para>An example for a valid domain would be: <literal>kde.org</literal>; a Message-ID generated with this domain would look like:</para> 
+
+<screen>934lek9934@kde.org</screen> 
+</example> 
+
+<para>An unique identification is only guaranteed if you have your own domain. Even when you do not use &knode; for generating your Message-IDs there may be collisions when you are using a local newsserver; for example, <application>leafnode</application> generates a Message-ID which it derives from the local hostname.</para>
+
+</caution> 
+
+<tip> 
+<para>You can get more information about this and how to own a free domain at <ulink url="http://www.qad.org/faq/faq-messageid.html">http://www.qad.org/faq/faq-messageid.html</ulink>.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Hostname</guilabel></title> 
+
+<para>Here you enter the Hostname of your computer; this is used to generate the Message-ID. If you do not have your own domain you should not activate this option &mdash; let the newsserver generate a Message-ID for you. Using the example above this would be: <userinput>kde.org</userinput>.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->X-Headers</guilabel
-></title
-> 
-
-<para
->Here you can enter X-Headers which are not provided by &knode;; for example, <userinput
->X-No-Archive: yes</userinput
->, which can be used to prevent your articles from being archived by archive services such as Google.</para>
-
-<para
->X-Headers are experimental headers, which are not included in the standard for Internet-Messages; they are, for example, used for extended information transfer. To prevent collisions with later standard headers, they have a <quote
->X-</quote
-> prefix.</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Don't add the "User-Agent" identification header</guilabel
-></title
-> 
-
-<para
->When this option is checked &knode; does not include the corresponding line in the Header before posting.</para>
-
-<para
->This header is used for identification of the newsreader the article was written in; apart from statistical reasons, this allows non-standard newsreaders to be identified. You should not activate this option &mdash; &knode; has no need to hide.</para
-> </sect3
-> 
+<sect3> 
+<title><guilabel>X-Headers</guilabel></title> 
+
+<para>Here you can enter X-Headers which are not provided by &knode;; for example, <userinput>X-No-Archive: yes</userinput>, which can be used to prevent your articles from being archived by archive services such as Google.</para>
+
+<para>X-Headers are experimental headers, which are not included in the standard for Internet-Messages; they are, for example, used for extended information transfer. To prevent collisions with later standard headers, they have a <quote>X-</quote> prefix.</para>
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Don't add the "User-Agent" identification header</guilabel></title> 
+
+<para>When this option is checked &knode; does not include the corresponding line in the Header before posting.</para>
+
+<para>This header is used for identification of the newsreader the article was written in; apart from statistical reasons, this allows non-standard newsreaders to be identified. You should not activate this option &mdash; &knode; has no need to hide.</para> </sect3> 
 </sect2>
 
-<sect2 id="knode-composer-settings"
-> 
-<title
->The Composer Settings</title
-> 
-
-<screenshot
-> 
-<screeninfo
->The Composer Settings dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-composer-settings.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The Composer Settings dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The Composer Settings dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Word-wrap at column</guilabel
-></title
-> 
-
-<para
->Here you can set the column number at which &knode; wraps the line; also, you can deactivate the automatic word-wrapping completely.</para
-> 
-
-<tip
-> 
-<para
->It is recommended to use no more than 76 characters even if you are able to display more: many Usenet users use text-based newsreaders which can not display more than 80 characters and it is difficult to read your articles in such a newsreader if you increase this value &mdash; this would reduce the probability of your articles being read at all.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Append signature automatically</guilabel
-></title>
-
-<para
->When you write a new <glossterm
->article</glossterm
-> or a <glossterm
->followup</glossterm
->, your <glossterm
->signature</glossterm
-> is appended automatically if you have configured one in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Identity</guilabel
-></menuchoice
->.</para>
+<sect2 id="knode-composer-settings"> 
+<title>The Composer Settings</title> 
+
+<screenshot> 
+<screeninfo>The Composer Settings dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-composer-settings.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The Composer Settings dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The Composer Settings dialogue</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<sect3> 
+<title><guilabel>Word-wrap at column</guilabel></title> 
+
+<para>Here you can set the column number at which &knode; wraps the line; also, you can deactivate the automatic word-wrapping completely.</para> 
+
+<tip> 
+<para>It is recommended to use no more than 76 characters even if you are able to display more: many Usenet users use text-based newsreaders which can not display more than 80 characters and it is difficult to read your articles in such a newsreader if you increase this value &mdash; this would reduce the probability of your articles being read at all.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Append signature automatically</guilabel></title>
+
+<para>When you write a new <glossterm>article</glossterm> or a <glossterm>followup</glossterm>, your <glossterm>signature</glossterm> is appended automatically if you have configured one in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Identity</guilabel></menuchoice>.</para>
 
 </sect3>
 
-<sect3
-> 
-<title
-><guilabel
->Introduction Phrase:</guilabel
-></title
-> 
-
-<para
->When you write a followup, &knode; inserts an introduction phrase before the quoted original text. You can put arbitrary text here; you can also use the variables which &knode; extracts from the original article, &eg; the name of the author or the date the article was written.</para>
-
-<para
->The following variable are available:</para>
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
-><varname
->%NAME</varname
-></term
-> 
-<listitem
-> 
-<para
->The name of the original author;</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><varname
->%DATE</varname
-></term
-> 
-<listitem
-> 
-<para
->The date on which the original article was written;</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><varname
->%EMAIL</varname
-></term
-> 
-<listitem
-> 
-<para
->The original author's email address;</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><varname
->%MSID</varname
-></term
-> 
-<listitem
-> 
-<para
->The Message-ID of the original article;</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><varname
->%GROUP</varname
-></term
-> 
-<listitem
-> 
-<para
->The name of the <glossterm
->newsgroup</glossterm
-> the article comes from.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
-
-<tip
-> 
-<para
->Keep this short, because this introductory line appears in every followup: a long introductory line can be as repelling as a long signature.</para
-> 
-</tip
-> 
-
-<example
-> 
-<title
->An example introductory line</title
-> 
-
-<screen
-><userinput
->On <varname
->%DATE</varname
-> <varname
->%NAME</varname
-> wrote in <varname
->%MSID</varname
-></userinput
-></screen
-> 
-
-<para
->Let us assume the original article was written by Konqui on Saturday the 17th of June at 17:42:32 - 0500. The article has the Message-ID &lt;8igdg5.3vvijgt.3@lizard.physos.com&gt;. &knode; will then insert the following introductionary line.</para
-> 
-
-<screen
-><computeroutput
->On Sat, 17 Jun 2000 17:42:32 +0200 Konqui wrote in
-&lt;8igdg5.3vvijgt.3@lizard.physos.com&gt;:</computeroutput
-></screen
-> 
-
-</example
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Rewrap quoted text automatically</guilabel
-></title
-> 
-
-<para
->When this is checked, the quoted text is wrapped at the correct border value; hence, every new line will be at the correct quoting level.</para
-> 
+<sect3> 
+<title><guilabel>Introduction Phrase:</guilabel></title> 
+
+<para>When you write a followup, &knode; inserts an introduction phrase before the quoted original text. You can put arbitrary text here; you can also use the variables which &knode; extracts from the original article, &eg; the name of the author or the date the article was written.</para>
+
+<para>The following variable are available:</para>
+
+<variablelist> 
+<varlistentry> 
+<term><varname>%NAME</varname></term> 
+<listitem> 
+<para>The name of the original author;</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><varname>%DATE</varname></term> 
+<listitem> 
+<para>The date on which the original article was written;</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><varname>%EMAIL</varname></term> 
+<listitem> 
+<para>The original author's email address;</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><varname>%MSID</varname></term> 
+<listitem> 
+<para>The Message-ID of the original article;</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><varname>%GROUP</varname></term> 
+<listitem> 
+<para>The name of the <glossterm>newsgroup</glossterm> the article comes from.</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
+
+<tip> 
+<para>Keep this short, because this introductory line appears in every followup: a long introductory line can be as repelling as a long signature.</para> 
+</tip> 
+
+<example> 
+<title>An example introductory line</title> 
+
+<screen><userinput>On <varname>%DATE</varname> <varname>%NAME</varname> wrote in <varname>%MSID</varname></userinput></screen> 
+
+<para>Let us assume the original article was written by Konqui on Saturday the 17th of June at 17:42:32 - 0500. The article has the Message-ID &lt;8igdg5.3vvijgt.3@lizard.physos.com&gt;. &knode; will then insert the following introductionary line.</para> 
+
+<screen><computeroutput>On Sat, 17 Jun 2000 17:42:32 +0200 Konqui wrote in
+&lt;8igdg5.3vvijgt.3@lizard.physos.com&gt;:</computeroutput></screen> 
+
+</example> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Rewrap quoted text automatically</guilabel></title> 
+
+<para>When this is checked, the quoted text is wrapped at the correct border value; hence, every new line will be at the correct quoting level.</para> 
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Include the author's signature</guilabel
-></title>
+<title><guilabel>Include the author's signature</guilabel></title>
 
-<para
->When this is activated not only the text of the original message, but also the signature of the author, is quoted in a reply.</para>
+<para>When this is activated not only the text of the original message, but also the signature of the author, is quoted in a reply.</para>
 
 <tip>
-<para
->Quoting a signature is unnecessary and is often considered impolite.</para>
+<para>Quoting a signature is unnecessary and is often considered impolite.</para>
 </tip>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Put the cursor below the introduction phrase</guilabel
-></title>
+<title><guilabel>Put the cursor below the introduction phrase</guilabel></title>
 
-<para
->Normally the cursor will appear below the whole message when answering; with this option turned on the cursor appears below the introduction phrase.</para>
+<para>Normally the cursor will appear below the whole message when answering; with this option turned on the cursor appears below the introduction phrase.</para>
 
 <tip>
-<para
->This is especially helpful if you quote an article and wish to write between the quoted lines from top to bottom.</para>
+<para>This is especially helpful if you quote an article and wish to write between the quoted lines from top to bottom.</para>
 </tip>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Define external editor</guilabel
-></title>
-
-<para
->You can define an external editor here which is opened by selecting <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Start external editor</guimenuitem
-></menuchoice
-> in the Composer window.</para
-> 
-
-<para
->When <guilabel
->Start external editor automatically</guilabel
-> is checked the external editor is opened directly.</para>
+<title><guilabel>Define external editor</guilabel></title>
+
+<para>You can define an external editor here which is opened by selecting <menuchoice><guimenu>Tools</guimenu><guimenuitem>Start external editor</guimenuitem></menuchoice> in the Composer window.</para> 
+
+<para>When <guilabel>Start external editor automatically</guilabel> is checked the external editor is opened directly.</para>
 
 <caution>
-<para
->Notice the <varname
->%f</varname
-> after the name of the editor: this is a variable for the filename of the article you want to edit; do not delete this &mdash; you will get an error message when opening the external editor if you do.</para>
+<para>Notice the <varname>%f</varname> after the name of the editor: this is a variable for the filename of the article you want to edit; do not delete this &mdash; you will get an error message when opening the external editor if you do.</para>
 </caution>
 
 <tip>
-<para
->If you have problems with starting your external editor, the reason may be that the editor starting in "the background"; this is called forking: &knode; only notices the sub-process started and has finished, and thinks you have quit the editor. The editor <application
->gvim</application
-> is an example for this; you can disable the forking of <application
->gvim</application
-> with the commandline switch <option
->-f</option
->. It is recommended that you refer to the documentation of your editor you are experiencing this problem.</para>
-
-<para
->If you want to use <application
->gvim</application
-> in <guilabel
->Specify Editor</guilabel
-> enter the following:</para>
+<para>If you have problems with starting your external editor, the reason may be that the editor starting in "the background"; this is called forking: &knode; only notices the sub-process started and has finished, and thinks you have quit the editor. The editor <application>gvim</application> is an example for this; you can disable the forking of <application>gvim</application> with the commandline switch <option>-f</option>. It is recommended that you refer to the documentation of your editor you are experiencing this problem.</para>
+
+<para>If you want to use <application>gvim</application> in <guilabel>Specify Editor</guilabel> enter the following:</para>
 
 <para>
-<userinput
->gvim -f %f</userinput>
+<userinput>gvim -f %f</userinput>
 </para>
 </tip>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Start external editor automatically</guilabel
-></title>
+<title><guilabel>Start external editor automatically</guilabel></title>
 
-<para
->If this option is active the external editor will be used for editing articles.</para>
+<para>If this option is active the external editor will be used for editing articles.</para>
 
 </sect3>
 </sect2>
 
 <sect2>
-<title
-><guilabel
->Spelling</guilabel
-></title>
+<title><guilabel>Spelling</guilabel></title>
 
-<para
->Here you can configure the behaviour of the spell checker.</para>
+<para>Here you can configure the behaviour of the spell checker.</para>
 
 <sect3>
-<title
-><guilabel
->Create root/affix not in dictionary</guilabel
-></title>
+<title><guilabel>Create root/affix not in dictionary</guilabel></title>
 
-<para
->If this is checked a known word-root with an unknown affix will be automatically accepted as a new word.</para>
+<para>If this is checked a known word-root with an unknown affix will be automatically accepted as a new word.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Consider run-together words as spelling errors</guilabel
-></title>
+<title><guilabel>Consider run-together words as spelling errors</guilabel></title>
 
-<para
->Here you can toggle if two known words that run together to form an unknown word should be treated as an error or not.)</para>
+<para>Here you can toggle if two known words that run together to form an unknown word should be treated as an error or not.)</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Dictionary</guilabel
-></title>
+<title><guilabel>Dictionary</guilabel></title>
 
-<para
->Here you chose the dictionary the spell-checker should use.</para>
+<para>Here you chose the dictionary the spell-checker should use.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Encoding</guilabel
-></title>
+<title><guilabel>Encoding</guilabel></title>
 
-<para
->Here you can tell &knode; which encoding should be used for spell checking; for English text this should normally be <acronym
->US-ASCII</acronym
->.</para>
+<para>Here you can tell &knode; which encoding should be used for spell checking; for English text this should normally be <acronym>US-ASCII</acronym>.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Client</guilabel
-></title>
-
-<para
->Here you can switch between the spell-checkers; you can use <application
->International Ispell</application
-> or <application
->Aspell</application
->.</para>
+<title><guilabel>Client</guilabel></title>
+
+<para>Here you can switch between the spell-checkers; you can use <application>International Ispell</application> or <application>Aspell</application>.</para>
 
 </sect3>
 
 </sect2>
 
 <sect2>
-<title
-><guilabel
->Signing and verifying</guilabel
-></title>
-
-<para
->Here you can configure &knode; for signing articles with <application
->GnuPG</application
-> or <application
->PGP</application
->. Your <application
->GnuPG</application
->/<application
->PGP</application
-> <acronym
->ID</acronym
-> will be built automatically from your configured name and email address; it is identical to the from line in the header of the <glossterm
->article</glossterm
->.</para>
+<title><guilabel>Signing and verifying</guilabel></title>
+
+<para>Here you can configure &knode; for signing articles with <application>GnuPG</application> or <application>PGP</application>. Your <application>GnuPG</application>/<application>PGP</application> <acronym>ID</acronym> will be built automatically from your configured name and email address; it is identical to the from line in the header of the <glossterm>article</glossterm>.</para>
 
 <sect3>
-<title
-><guilabel
->Encryption tool</guilabel
-></title>
+<title><guilabel>Encryption tool</guilabel></title>
 
-<para
->Here you can choose your encryption tool.</para>
+<para>Here you can choose your encryption tool.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Keep passphrase in memory</guilabel
-></title>
+<title><guilabel>Keep passphrase in memory</guilabel></title>
 
-<para
->If this option is active you only need to type the passphrase for your private key once; &knode; will remember your passphrase until you close &knode; again.</para>
+<para>If this option is active you only need to type the passphrase for your private key once; &knode; will remember your passphrase until you close &knode; again.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Show ciphered/signed text after composing</guilabel
-></title>
+<title><guilabel>Show ciphered/signed text after composing</guilabel></title>
 
-<para
->If this option is activated &knode; will show the signed message in an extra window for confirmation before changing it in the editor.</para>
+<para>If this option is activated &knode; will show the signed message in an extra window for confirmation before changing it in the editor.</para>
 
 </sect3>
 
 <sect3>
-<title
->Always show the encryption keys for approval</title>
+<title>Always show the encryption keys for approval</title>
 
-<para
->If you are using public newsgroups (on Usenet) you can safely ignore this option as it would not be useful to encrypt messages sent to Usenet; this option may, however, be useful in private newsgroups on private networks where encryption is desired.</para>
+<para>If you are using public newsgroups (on Usenet) you can safely ignore this option as it would not be useful to encrypt messages sent to Usenet; this option may, however, be useful in private newsgroups on private networks where encryption is desired.</para>
 <!-- FIXME: LW - I can see use for -->
 <!-- encryption, on private networks etc.  This needs a rewrite -->
 <!-- AndrewColes: is this revision any better? -->
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Check signatures automatically</guilabel
-></title
-> 
-
-<para
->If this is marked, the <application
->PGP</application
-> signature of the article is automatically checked when showing the article; if there's no mark, you can check the signature for correctness manually with the <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Verify PGP-Signature</guimenuitem
-></menuchoice
-> menu entry.</para
-> 
-
-</sect3
-> 
-
-</sect2
-> 
-
-
-<sect2 id="knode-article-cleanup"
-> 
-<title
->The article-cleanup settings.</title
-> 
-
-<para
->The dialogue below shows the settings for the article cleanup; these settings are used to keep the number of articles on your local harddisk to a reasonable number. &knode; administrates the articles in memory so there can be some decrease in speed if you have to many articles lying around; most of the time it makes no sense to keep articles for a very long time. Services like Google and Altavista make archiving unnecessary.</para>
-
-<caution
-> 
-<para
->&knode; isn't an offline reader, so all of the configuration refers to the headers which are managed by &knode;; if you are running a local news server, such as <application
->leafnode</application
->, you should refer to its documentation to handle expiring the articles on the server &mdash; &knode; cannot do this for you.</para>
-</caution
-> 
-
-<screenshot
-> 
-<screeninfo
->The cleanup settings</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-cleanup.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The cleanup settings</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The cleanup settings</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Expire old articles automatically</guilabel
-></title
-> 
-
-<para
->When this option is active all subscribed groups are checked for old articles in the time interval set here; the old articles will then be deleted.</para>
+<title><guilabel>Check signatures automatically</guilabel></title> 
+
+<para>If this is marked, the <application>PGP</application> signature of the article is automatically checked when showing the article; if there's no mark, you can check the signature for correctness manually with the <menuchoice><guimenu>View</guimenu><guimenuitem>Verify PGP-Signature</guimenuitem></menuchoice> menu entry.</para> 
+
+</sect3> 
+
+</sect2> 
+
+
+<sect2 id="knode-article-cleanup"> 
+<title>The article-cleanup settings.</title> 
+
+<para>The dialogue below shows the settings for the article cleanup; these settings are used to keep the number of articles on your local harddisk to a reasonable number. &knode; administrates the articles in memory so there can be some decrease in speed if you have to many articles lying around; most of the time it makes no sense to keep articles for a very long time. Services like Google and Altavista make archiving unnecessary.</para>
+
+<caution> 
+<para>&knode; isn't an offline reader, so all of the configuration refers to the headers which are managed by &knode;; if you are running a local news server, such as <application>leafnode</application>, you should refer to its documentation to handle expiring the articles on the server &mdash; &knode; cannot do this for you.</para>
+</caution> 
+
+<screenshot> 
+<screeninfo>The cleanup settings</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-cleanup.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The cleanup settings</phrase> 
+</textobject> 
+<caption> 
+<para>The cleanup settings</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<sect3> 
+<title><guilabel>Expire old articles automatically</guilabel></title> 
+
+<para>When this option is active all subscribed groups are checked for old articles in the time interval set here; the old articles will then be deleted.</para>
 
 
 <tip>
-<para
->You can force this check by selecting <menuchoice
-><guimenu
->Group</guimenu
-><guimenuitem
->Expire group</guimenuitem
-></menuchoice
-></para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Purge groups every</guilabel
-></title>
-
-<para
->Here you can configure how often subscribed groups should be checked for old <glossterm
->article</glossterm
->s and how often those articles should be deleted; this option only has an effect when <guilabel
->Expire old articles automatically</guilabel
-> is selected.</para>
+<para>You can force this check by selecting <menuchoice><guimenu>Group</guimenu><guimenuitem>Expire group</guimenuitem></menuchoice></para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Purge groups every</guilabel></title>
+
+<para>Here you can configure how often subscribed groups should be checked for old <glossterm>article</glossterm>s and how often those articles should be deleted; this option only has an effect when <guilabel>Expire old articles automatically</guilabel> is selected.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Keep read articles</guilabel
-></title>
+<title><guilabel>Keep read articles</guilabel></title>
 
-<para
->Read articles are deleted by the next cleanup if they are older than this value; &knode; uses the creation date for this.</para>
+<para>Read articles are deleted by the next cleanup if they are older than this value; &knode; uses the creation date for this.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Keep unread articles</guilabel
-></title>
+<title><guilabel>Keep unread articles</guilabel></title>
 
-<para
->Unread articles are deleted by the next cleanup if they are older than this value; &knode; uses the creation date for this.</para>
+<para>Unread articles are deleted by the next cleanup if they are older than this value; &knode; uses the creation date for this.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Remove articles that are not available on the server</guilabel
-></title>
+<title><guilabel>Remove articles that are not available on the server</guilabel></title>
 
-<para
->It may happen that you'll see a <glossterm
->header</glossterm
-> in &knode; but the article is not available on the server; if this option is set, those articles will automatically deleted in &knode;.</para>
+<para>It may happen that you'll see a <glossterm>header</glossterm> in &knode; but the article is not available on the server; if this option is set, those articles will automatically deleted in &knode;.</para>
 
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Preserve threads</guilabel
-></title
-> 
-
-<para
->This selection forces a thread to be deleted only if all articles contained in it fulfil the delete conditions; this means that a thread will not be deleted until the last article in the thread should be deleted.</para
-> 
-
-<para
->This prevents old articles in a long thread from vanishing before the discussion has ended.</para>
-
-<caution
-> 
-<para
->&knode; can not predict whether there will be a reply after the set conditions are fulfilled; you will have to find your own settings for this. Some newsgroups have days between replies; others only hours. Use your own judgement.</para
-> 
-</caution
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Compact folders automatically</guilabel
-></title
-> 
-
-<para
->This option refers to the memory behaviour of &knode;. If an <glossterm
->article</glossterm
-> in a folder is deleted it will be marked as deleted but still take up space on your hard disk; with this option you can tell &knode; to actually delete the articles and free the hard-disk space regularly.</para>
+<title><guilabel>Preserve threads</guilabel></title> 
+
+<para>This selection forces a thread to be deleted only if all articles contained in it fulfil the delete conditions; this means that a thread will not be deleted until the last article in the thread should be deleted.</para> 
+
+<para>This prevents old articles in a long thread from vanishing before the discussion has ended.</para>
+
+<caution> 
+<para>&knode; can not predict whether there will be a reply after the set conditions are fulfilled; you will have to find your own settings for this. Some newsgroups have days between replies; others only hours. Use your own judgement.</para> 
+</caution> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>Compact folders automatically</guilabel></title> 
+
+<para>This option refers to the memory behaviour of &knode;. If an <glossterm>article</glossterm> in a folder is deleted it will be marked as deleted but still take up space on your hard disk; with this option you can tell &knode; to actually delete the articles and free the hard-disk space regularly.</para>
 
 <tip>
-<para
->You can force this check by selecting <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Compact folder</guimenuitem
-></menuchoice
-> or for all folders together with <menuchoice
-><guimenu
->Folder</guimenu
-><guimenuitem
->Compact all folders</guimenuitem
-></menuchoice
->.</para>
+<para>You can force this check by selecting <menuchoice><guimenu>Folder</guimenu><guimenuitem>Compact folder</guimenuitem></menuchoice> or for all folders together with <menuchoice><guimenu>Folder</guimenu><guimenuitem>Compact all folders</guimenuitem></menuchoice>.</para>
 </tip>
 </sect3>
 
 <sect3>
-<title
-><guilabel
->Purge folders every</guilabel
-></title>
-
-<para
->Here you can configure how often the folder is checked for deleted articles; this option only has an effect if the <guilabel
->Compact folders automatically</guilabel
-> is set.</para>
+<title><guilabel>Purge folders every</guilabel></title>
+
+<para>Here you can configure how often the folder is checked for deleted articles; this option only has an effect if the <guilabel>Compact folders automatically</guilabel> is set.</para>
 </sect3>
 </sect2>
 
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/using-morefeatures.docbook b/tde-i18n-en_GB/docs/tdepim/knode/using-morefeatures.docbook
index 925be293bb3..11789163099 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/using-morefeatures.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/using-morefeatures.docbook
@@ -1,1278 +1,485 @@
 <sect1 id="more-knode-features">
-<title
->The Advanced &knode; Features</title>
+<title>The Advanced &knode; Features</title>
 
 <sect2 id="using-filters">
-<title
->Defining and Using Filters</title>
+<title>Defining and Using Filters</title>
 
-<para
->You may already have read about using filters in the chapter explaining the configuration of &knode;; there, we were talking about the built-in filters provided by &knode; there. You can configure the built-in filters like all the others. The screenshot below shows the dialogue box for configuring the filters.</para>
+<para>You may already have read about using filters in the chapter explaining the configuration of &knode;; there, we were talking about the built-in filters provided by &knode; there. You can configure the built-in filters like all the others. The screenshot below shows the dialogue box for configuring the filters.</para>
 
-<tip
-><para
->While filters and scoring are very powerful and have many uses, one of the most common requirements is simply to add all posts written by someone you don't wish to read to a <quote
->killfile</quote
->. At the <link linkend="killfiles"
->end of this section</link
-> is a quick guide to using filters and scores to create such a killfile.</para
-></tip>
+<tip><para>While filters and scoring are very powerful and have many uses, one of the most common requirements is simply to add all posts written by someone you don't wish to read to a <quote>killfile</quote>. At the <link linkend="killfiles">end of this section</link> is a quick guide to using filters and scores to create such a killfile.</para></tip>
 
 <screenshot>
-<screeninfo
->The <guilabel
->New Filter</guilabel
-> dialogue</screeninfo>
+<screeninfo>The <guilabel>New Filter</guilabel> dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-edit-filter.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->The <guilabel
->New Filter</guilabel
-> dialogue</phrase>
+<phrase>The <guilabel>New Filter</guilabel> dialogue</phrase>
 </textobject>
 <caption>
-<para
->The <guilabel
->New Filter</guilabel
-> dialogue</para>
+<para>The <guilabel>New Filter</guilabel> dialogue</para>
 </caption>
 </mediaobject>
 </screenshot>
 
-<para
->First we will create a new filter. You may, at some point, want to find your own articles amongst all the others; or, you may not want to see the articles posted by a particular person at all: both cases can be solved by a simple filter on the Sender. Here are some examples:</para
-> 
-
-<procedure
-> 
-<title
->Do Not Show The Articles by a Particular Person</title
-> 
-<step performance="required"
-> 
-<para
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Filters</guilabel
-></menuchoice
-></para
-> 
-</step
-> 
-<step performance="required"
-> 
-<para
->Select <guibutton
->New...</guibutton
-></para>
-</step
-> 
-<step performance="required"
-> 
-<para
->Insert <userinput
->Do not show idiot</userinput
-> in the Text Box <guilabel
->Name</guilabel
-></para
-> 
-</step
-> 
-<step performance="required"
-> 
-<para
->To make the filter appear on the menu, check <guilabel
->Show in menu</guilabel
->.</para>
-</step
-> 
-<step performance="required"
-> 
-<para
->Go to the <guilabel
->From</guilabel
-> area.</para
-> 
-</step
-> 
-<step performance="required"
-> 
-<para
->Choose <guilabel
->Does NOT contain</guilabel
-> from the drop-down box.</para
-> 
+<para>First we will create a new filter. You may, at some point, want to find your own articles amongst all the others; or, you may not want to see the articles posted by a particular person at all: both cases can be solved by a simple filter on the Sender. Here are some examples:</para> 
+
+<procedure> 
+<title>Do Not Show The Articles by a Particular Person</title> 
+<step performance="required"> 
+<para><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Filters</guilabel></menuchoice></para> 
+</step> 
+<step performance="required"> 
+<para>Select <guibutton>New...</guibutton></para>
+</step> 
+<step performance="required"> 
+<para>Insert <userinput>Do not show idiot</userinput> in the Text Box <guilabel>Name</guilabel></para> 
+</step> 
+<step performance="required"> 
+<para>To make the filter appear on the menu, check <guilabel>Show in menu</guilabel>.</para>
+</step> 
+<step performance="required"> 
+<para>Go to the <guilabel>From</guilabel> area.</para> 
+</step> 
+<step performance="required"> 
+<para>Choose <guilabel>Does NOT contain</guilabel> from the drop-down box.</para> 
 </step>
-<step performance="required"
-> 
-<para
->Insert the name of the person you want to ignore in the now- active Text Box; for example, <userinput
->Idiot</userinput
->.</para>
-</step
-> 
-<step performance="required"
-> 
-<para
->Confirm the filter settings with <guibutton
->OK</guibutton
->.</para>
+<step performance="required"> 
+<para>Insert the name of the person you want to ignore in the now- active Text Box; for example, <userinput>Idiot</userinput>.</para>
+</step> 
+<step performance="required"> 
+<para>Confirm the filter settings with <guibutton>OK</guibutton>.</para>
 </step>
 </procedure>
 
-<para
->The filter now shows all articles, except the ones containing <quote
->Idiot</quote
-> in the From: line.</para>
+<para>The filter now shows all articles, except the ones containing <quote>Idiot</quote> in the From: line.</para>
 
-<para
->You can combine the settings of the 'Subject + From' tab with the settings on the other tabs. For example:</para>
+<para>You can combine the settings of the 'Subject + From' tab with the settings on the other tabs. For example:</para>
 
 <procedure>
-<title
->Show only discussion with unread follow-ups on own articles.</title>
+<title>Show only discussion with unread follow-ups on own articles.</title>
 <step>
-<para
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Filters</guilabel
-></menuchoice
-></para>
+<para><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Filters</guilabel></menuchoice></para>
 </step>
 <step>
-<para
->Select the predefined filter <guilabel
->threads with own articles</guilabel
-></para>
+<para>Select the predefined filter <guilabel>threads with own articles</guilabel></para>
 </step>
 <step>
-<para
->Select <guibutton
->Copy</guibutton
-></para>
+<para>Select <guibutton>Copy</guibutton></para>
 </step>
 <step>
-<para
->Insert <userinput
->My threads with unread</userinput
-> in the <guilabel
->Name</guilabel
-> field.</para>
+<para>Insert <userinput>My threads with unread</userinput> in the <guilabel>Name</guilabel> field.</para>
 </step>
 <step>
-<para
->Select the <guilabel
->Status</guilabel
-> tab</para>
+<para>Select the <guilabel>Status</guilabel> tab</para>
 </step>
 <step>
-<para
->Select <guilabel
->has new followups</guilabel
-></para>
+<para>Select <guilabel>has new followups</guilabel></para>
 </step>
 <step>
-<para
->Select <guilabel
->true</guilabel
-> in the drop-down box next to it.</para>
+<para>Select <guilabel>true</guilabel> in the drop-down box next to it.</para>
 </step>
 <step>
-<para
->Confirm the filter settings with <guibutton
->OK</guibutton
-></para>
-<para
->This filter shows all the threads your are participating in which have unread messages; also, you have seen the possibility of using existing filters as a base for new ones: this makes life easier for complex filters.</para>
+<para>Confirm the filter settings with <guibutton>OK</guibutton></para>
+<para>This filter shows all the threads your are participating in which have unread messages; also, you have seen the possibility of using existing filters as a base for new ones: this makes life easier for complex filters.</para>
 </step>
 </procedure>
 
 <procedure>
-<title
->Show all articles, no older than 3 days, containing KNode in the subject.</title>
-<step
-> 
-<para
-><menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Filters</guilabel
-></menuchoice
-></para>
+<title>Show all articles, no older than 3 days, containing KNode in the subject.</title>
+<step> 
+<para><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Filters</guilabel></menuchoice></para>
 </step>
 <step>
-<para
->Select <guibutton
->Add</guibutton
-></para>
+<para>Select <guibutton>Add</guibutton></para>
 </step>
 <step>
-<para
->Insert <userinput
->Latest KNode threads</userinput
-> in the <guilabel
->Name</guilabel
-> field.</para>
+<para>Insert <userinput>Latest KNode threads</userinput> in the <guilabel>Name</guilabel> field.</para>
 </step>
 <step>
-<para
->To make the filter appear in the menu, check <guilabel
->show in menu</guilabel
->.</para
-> 
-</step
-> 
-<step
-> 
-<para
->From the <guilabel
->apply on</guilabel
-> drop-down box select <guilabel
->single articles</guilabel
-></para
-> 
-</step
-> 
-<step
-> 
-<para
->Go to the <guilabel
->Subject</guilabel
-> area and select <guilabel
->does contain</guilabel
-> in the drop-down box.</para
-> 
-</step
-> 
-<step
-> 
-<para
->Insert <userinput
->knode</userinput
-> in the text box.</para>
-</step
-> 
-<step
-> 
-<para
->Change to the <guilabel
->Additional</guilabel
-> tab</para
-> 
+<para>To make the filter appear in the menu, check <guilabel>show in menu</guilabel>.</para> 
+</step> 
+<step> 
+<para>From the <guilabel>apply on</guilabel> drop-down box select <guilabel>single articles</guilabel></para> 
+</step> 
+<step> 
+<para>Go to the <guilabel>Subject</guilabel> area and select <guilabel>does contain</guilabel> in the drop-down box.</para> 
+</step> 
+<step> 
+<para>Insert <userinput>knode</userinput> in the text box.</para>
+</step> 
+<step> 
+<para>Change to the <guilabel>Additional</guilabel> tab</para> 
 </step>
-<step
-> 
-<para
->Select the <guilabel
->Age</guilabel
-> check box</para
-> 
-</step
-> 
-<step
-> 
-<para
->Enter the following settings: <guilabel
->0 &lt; days &lt;= 3</guilabel
-></para
-> 
-</step
-> 
-<step
-> 
-<para
->Confirm the filter settings with <guibutton
->OK</guibutton
-></para>
-<para
->This filter, now, shows all articles, no older than 3 days, containing <emphasis
->knode</emphasis
-> in the subject.</para
-> 
-</step
-> 
-</procedure
-> 
+<step> 
+<para>Select the <guilabel>Age</guilabel> check box</para> 
+</step> 
+<step> 
+<para>Enter the following settings: <guilabel>0 &lt; days &lt;= 3</guilabel></para> 
+</step> 
+<step> 
+<para>Confirm the filter settings with <guibutton>OK</guibutton></para>
+<para>This filter, now, shows all articles, no older than 3 days, containing <emphasis>knode</emphasis> in the subject.</para> 
+</step> 
+</procedure> 
 
 <sect3 id="killfiles">
-<title
->Creating a Killfile</title>
+<title>Creating a Killfile</title>
 
-<para
->&knode; offers viewing filters (<guilabel
->all</guilabel
->, <guilabel
->unread only</guilabel
->, <guilabel
->my posts</guilabel
-> &etc;) and scoring filters (threads and articles start with a score of zero and can be adjusted according to author, thread &etc;).</para>
+<para>&knode; offers viewing filters (<guilabel>all</guilabel>, <guilabel>unread only</guilabel>, <guilabel>my posts</guilabel> &etc;) and scoring filters (threads and articles start with a score of zero and can be adjusted according to author, thread &etc;).</para>
 
-<para
->Using viewing filters you could hide articles according to poster, but this is not really suitable when you want to kill several posters universally.</para>
+<para>Using viewing filters you could hide articles according to poster, but this is not really suitable when you want to kill several posters universally.</para>
 
-<para
->Using the scoring gives lots of control but filters only at the thread level, i.e. you can watch and ignore threads; the disadvantage of this, however, is that you may lose otherwise-useful threads just because of one poster.</para>
+<para>Using the scoring gives lots of control but filters only at the thread level, i.e. you can watch and ignore threads; the disadvantage of this, however, is that you may lose otherwise-useful threads just because of one poster.</para>
 
-<para
->The solution is to use these in combination.</para>
+<para>The solution is to use these in combination.</para>
 
 <procedure>
-<title
->Creating a Killfile</title>
+<title>Creating a Killfile</title>
 <step>
-<para
->Go to <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Filters</guilabel
-></menuchoice
->.</para>
+<para>Go to <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode</guimenuitem><guilabel>Reading News</guilabel><guilabel>Filters</guilabel></menuchoice>.</para>
 </step>
 
 <step>
-<para
->Create a new filter below <guilabel
->unread</guilabel
->, called <userinput
->killfile on</userinput
->. Be sure that <guilabel
->Apply to single articles</guilabel
-> is set and then click on the <guilabel
->Additional</guilabel
-> tab. Set score <quote
->equal to or less than zero</quote
-> (<guilabel
->&lt;=</guilabel
->); then click the <guibutton
->OK</guibutton
-> until you have exited the dialogue.</para>
+<para>Create a new filter below <guilabel>unread</guilabel>, called <userinput>killfile on</userinput>. Be sure that <guilabel>Apply to single articles</guilabel> is set and then click on the <guilabel>Additional</guilabel> tab. Set score <quote>equal to or less than zero</quote> (<guilabel>&lt;=</guilabel>); then click the <guibutton>OK</guibutton> until you have exited the dialogue.</para>
 </step>
 
 <step>
-<para
->Open an article whose author should be killed and just type <keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
->(or select, from the <guimenu
->Scoring</guimenu
-> menu, <guimenuitem
->Lower Score for Author</guimenuitem
->). This opens the Rule Editor (a part of scoring). You can optionally give the rule a name that matches the author (<userinput
->Kook</userinput
->, for example.) and then, if this is to be permanent, uncheck the <guilabel
->expire automatically</guilabel
-> box; you'll see that this rule will change the author's score to minus ten (or the score you entered); finally, click <guibutton
->OK</guibutton
->.</para>
+<para>Open an article whose author should be killed and just type <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo>(or select, from the <guimenu>Scoring</guimenu> menu, <guimenuitem>Lower Score for Author</guimenuitem>). This opens the Rule Editor (a part of scoring). You can optionally give the rule a name that matches the author (<userinput>Kook</userinput>, for example.) and then, if this is to be permanent, uncheck the <guilabel>expire automatically</guilabel> box; you'll see that this rule will change the author's score to minus ten (or the score you entered); finally, click <guibutton>OK</guibutton>.</para>
 </step>
 
 <step>
-<para
->Go to the menu item <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->killfile on.</guimenuitem
-> </menuchoice
-></para>
+<para>Go to the menu item <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>killfile on.</guimenuitem> </menuchoice></para>
 </step>
 </procedure>
 
-<para
->This will cause any articles with scores less than zero will disappear; to kill additional authors you only need repeat the <keycombo action="simul"
->&Ctrl;<keycap
->L</keycap
-></keycombo
-> part of these instructions.</para>
+<para>This will cause any articles with scores less than zero will disappear; to kill additional authors you only need repeat the <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> part of these instructions.</para>
 
 </sect3>
 
-</sect2
-> 
+</sect2> 
 
-<sect2 id="knode-editor-advanced"
-> 
-<title
->The Composer</title
-> 
+<sect2 id="knode-editor-advanced"> 
+<title>The Composer</title> 
 <anchor id="anc-knode-editor-advanced"/> 
 
-<para
->The &knode; composer provides many features, especially for posting and replying to articles.</para
-> 
-
-<sect3
-> 
-<title
->Publish Articles in Multiple Newsgroups</title>
-
-<para
->By selecting the Button <guilabel
->Browse</guilabel
-> you can choose additional newsgroups you want to publish your article in.</para
-> 
-
-<caution
-> 
-<para
->It is generally undesirable to post articles in multiple newsgroups: please think twice about it; if you are not sure where to post your article ask in one of the possible groups &mdash; somebody will tell you were to post.</para
-> 
-</caution
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->Redirect Followups</title
-> 
-
-<para
->The main use of this feature is when a thread has gone off topic for the newsgroup in which it is posted; for example, a thread may start in a &kde; newsgroup discussing how to redirect a followup in &knode;, but may leads to a discussion about graphical and text based newsreaders.</para>
-
-<para
->Sometimes it happens that usenet users post an article into the wrong newsgroup; very often those articles are just ignored. If it looks like the author did this unintentionally, you might like to tell them politely and make the followup articles go into the right group.</para>
-
-<para
->Another reason for using <guilabel
->Followup-To:</guilabel
-> is a when dealing with articles cross-posted across in multiple newsgroups: you should take care that the replies are only posted in one single newsgroup.</para
-> 
-
-<para
->You can activate this by filling the text box <guilabel
->Followups - To:</guilabel
->; here you can enter the suitable group. If there are multiple newsgroups in the <guilabel
->Groups:</guilabel
-> field, they are shown in the drop-down list.</para
-> 
-
-<tip
-> 
-<para
->If you enter <userinput
->poster</userinput
-> here, instead of a newsgroup, the replies will go directly to the author, not to the newsgroup.</para
-> 
-
-<para
->Some people put an email address here, but this is not a valid entry: use <userinput
->poster</userinput
-> and correctly set your Reply-To address in the normal &knode; settings.</para>
-
-</tip
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Working With an External Editor</title
-> 
-
-<para
->Using <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Start External Editor</guimenuitem
-></menuchoice
-> you can start an editor of your choice for editing the reply; this way you can use your preferred Editor for writing articles and e-mails.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Spelling</title
-> 
-
-<para
->By selecting <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Spelling</guimenuitem
-></menuchoice
->, you can check the article in the composer for spelling errors.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Sending Attachments</title
-> 
-
-<para
->By selecting <menuchoice
-><guimenu
->Attach</guimenu
-><guimenuitem
->Attach File</guimenuitem
-></menuchoice
-> you can open the File Selection Dialogue Box; here you can choose the file you want to attach.</para
-> 
-
-<para
->Most of the time, &knode; determines the correct <acronym
->MIME</acronym
-> type for the attachment; if &knode; detects it incorrectly, you can correct the <acronym
->MIME</acronym
-> type manually.</para>
-
-<para
->This screenshot shows the Composer with 2 attachments: a text file and a PNG picture.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->Sending Attachments</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-composer-attachments.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Sending Attachments</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Sending Attachments</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<caution
-> 
-<para
->Only do this if you know what you're doing! An incorrect <acronym
->MIME</acronym
-> type could cause the attachment to be sent incorrectly, or mean that the attachment will not be able to be rebuilt after sending.</para
-> 
-</caution
-> 
-
-<tip
-> 
-<para
->The English word attachment is used all over the world; you can use it in your language, too.</para
-> 
-</tip
-> 
-
-<important
-> 
-<para
->In most newsgroups, attachments are prohibited: do not send unsolicited attachments; if you are asked to send them, look who is asking for them &mdash; normally, the person will want you to send them by email.</para
-> 
-
-<para
->The news server will probably reject articles with attachments for most groups anyway; those that do accept attachments normally have the word <quote
->binaries</quote
-> in their name. Some news servers even stop carrying non-binaries newsgroups that continuously receive attachments.</para>
-</important
-> 
-</sect3
-> 
-</sect2
-> 
-
-<sect2
-> 
-<title
->Searching for Articles</title
-> 
-
-<para
->Sooner or later, you will want to search for one specific article; the &knode; search feature is an easy way to do this.</para
-> 
-
-<para
->You can reach the search function by selecting <menuchoice
-><guimenu
->Edit</guimenu
-><guimenuitem
->Search Articles...</guimenuitem
-></menuchoice
-> or the by pressing <keycap
->F4</keycap
->. The screenshot below shows the Search Dialogue Box.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The Search Dialogue Box</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-search.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The Search Dialogue Box</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The Search Dialogue Box</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->The Search Dialogue Box has four tabs which allow several search criteria: the first tab contains the settings for the <guilabel
->Subject</guilabel
-> and <guilabel
->From</guilabel
-> criteria; the second tab contains the settings for the <guilabel
->message-IDs</guilabel
-> of an article and its references; the third tab contains the settings for the <guilabel
->Status</guilabel
-> of an article; the fourth tab, <guilabel
->Additional</guilabel
->, contains the remaining criteria.</para>
-
-<para
->You have probably already noticed the similarities between the Filter Dialogue Box and the Search Dialogue Box: the usage is the same and should not be too complicated if you have already defined your own filters.</para
-> 
-
-<para
->&knode; always searches in the currently-active newsgroup; a search in all newsgroups is not possible at the moment. After the Search has finished the articles found appear in the article view; when you close the Search Dialogue Box using <guibutton
->Close</guibutton
-> the search results are deleted, and the old view of the newsgroup appears again.</para
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Start Search</guilabel
-></title
-> 
-
-<para
->With this button you start the Search with the search criteria you defined; all articles in the selected newsgroup, fulfilling these criteria, appear in the article view.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->New Search</guilabel
-></title
-> 
-
-<para
->This button resets all search criteria.</para>
+<para>The &knode; composer provides many features, especially for posting and replying to articles.</para> 
+
+<sect3> 
+<title>Publish Articles in Multiple Newsgroups</title>
+
+<para>By selecting the Button <guilabel>Browse</guilabel> you can choose additional newsgroups you want to publish your article in.</para> 
+
+<caution> 
+<para>It is generally undesirable to post articles in multiple newsgroups: please think twice about it; if you are not sure where to post your article ask in one of the possible groups &mdash; somebody will tell you were to post.</para> 
+</caution> 
+</sect3> 
+
+<sect3> 
+<title>Redirect Followups</title> 
+
+<para>The main use of this feature is when a thread has gone off topic for the newsgroup in which it is posted; for example, a thread may start in a &kde; newsgroup discussing how to redirect a followup in &knode;, but may leads to a discussion about graphical and text based newsreaders.</para>
+
+<para>Sometimes it happens that usenet users post an article into the wrong newsgroup; very often those articles are just ignored. If it looks like the author did this unintentionally, you might like to tell them politely and make the followup articles go into the right group.</para>
+
+<para>Another reason for using <guilabel>Followup-To:</guilabel> is a when dealing with articles cross-posted across in multiple newsgroups: you should take care that the replies are only posted in one single newsgroup.</para> 
+
+<para>You can activate this by filling the text box <guilabel>Followups - To:</guilabel>; here you can enter the suitable group. If there are multiple newsgroups in the <guilabel>Groups:</guilabel> field, they are shown in the drop-down list.</para> 
+
+<tip> 
+<para>If you enter <userinput>poster</userinput> here, instead of a newsgroup, the replies will go directly to the author, not to the newsgroup.</para> 
+
+<para>Some people put an email address here, but this is not a valid entry: use <userinput>poster</userinput> and correctly set your Reply-To address in the normal &knode; settings.</para>
+
+</tip> 
+
+</sect3> 
+
+<sect3> 
+<title>Working With an External Editor</title> 
+
+<para>Using <menuchoice><guimenu>Tools</guimenu><guimenuitem>Start External Editor</guimenuitem></menuchoice> you can start an editor of your choice for editing the reply; this way you can use your preferred Editor for writing articles and e-mails.</para> 
+
+</sect3> 
+
+<sect3> 
+<title>Spelling</title> 
+
+<para>By selecting <menuchoice><guimenu>Tools</guimenu><guimenuitem>Spelling</guimenuitem></menuchoice>, you can check the article in the composer for spelling errors.</para> 
+
+</sect3> 
+
+<sect3> 
+<title>Sending Attachments</title> 
+
+<para>By selecting <menuchoice><guimenu>Attach</guimenu><guimenuitem>Attach File</guimenuitem></menuchoice> you can open the File Selection Dialogue Box; here you can choose the file you want to attach.</para> 
+
+<para>Most of the time, &knode; determines the correct <acronym>MIME</acronym> type for the attachment; if &knode; detects it incorrectly, you can correct the <acronym>MIME</acronym> type manually.</para>
+
+<para>This screenshot shows the Composer with 2 attachments: a text file and a PNG picture.</para> 
+
+<screenshot> 
+<screeninfo>Sending Attachments</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-composer-attachments.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Sending Attachments</phrase> 
+</textobject> 
+<caption> 
+<para>Sending Attachments</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<caution> 
+<para>Only do this if you know what you're doing! An incorrect <acronym>MIME</acronym> type could cause the attachment to be sent incorrectly, or mean that the attachment will not be able to be rebuilt after sending.</para> 
+</caution> 
+
+<tip> 
+<para>The English word attachment is used all over the world; you can use it in your language, too.</para> 
+</tip> 
+
+<important> 
+<para>In most newsgroups, attachments are prohibited: do not send unsolicited attachments; if you are asked to send them, look who is asking for them &mdash; normally, the person will want you to send them by email.</para> 
+
+<para>The news server will probably reject articles with attachments for most groups anyway; those that do accept attachments normally have the word <quote>binaries</quote> in their name. Some news servers even stop carrying non-binaries newsgroups that continuously receive attachments.</para>
+</important> 
+</sect3> 
+</sect2> 
+
+<sect2> 
+<title>Searching for Articles</title> 
+
+<para>Sooner or later, you will want to search for one specific article; the &knode; search feature is an easy way to do this.</para> 
+
+<para>You can reach the search function by selecting <menuchoice><guimenu>Edit</guimenu><guimenuitem>Search Articles...</guimenuitem></menuchoice> or the by pressing <keycap>F4</keycap>. The screenshot below shows the Search Dialogue Box.</para> 
+
+<screenshot> 
+<screeninfo>The Search Dialogue Box</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-search.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The Search Dialogue Box</phrase> 
+</textobject> 
+<caption> 
+<para>The Search Dialogue Box</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>The Search Dialogue Box has four tabs which allow several search criteria: the first tab contains the settings for the <guilabel>Subject</guilabel> and <guilabel>From</guilabel> criteria; the second tab contains the settings for the <guilabel>message-IDs</guilabel> of an article and its references; the third tab contains the settings for the <guilabel>Status</guilabel> of an article; the fourth tab, <guilabel>Additional</guilabel>, contains the remaining criteria.</para>
+
+<para>You have probably already noticed the similarities between the Filter Dialogue Box and the Search Dialogue Box: the usage is the same and should not be too complicated if you have already defined your own filters.</para> 
+
+<para>&knode; always searches in the currently-active newsgroup; a search in all newsgroups is not possible at the moment. After the Search has finished the articles found appear in the article view; when you close the Search Dialogue Box using <guibutton>Close</guibutton> the search results are deleted, and the old view of the newsgroup appears again.</para> 
+
+<sect3> 
+<title><guilabel>Start Search</guilabel></title> 
+
+<para>With this button you start the Search with the search criteria you defined; all articles in the selected newsgroup, fulfilling these criteria, appear in the article view.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>New Search</guilabel></title> 
+
+<para>This button resets all search criteria.</para>
  
-</sect3
-> 
-</sect2
-> 
-
-<sect2 id="supersede-and-cancel"
-> 
-<title
->Supersede and Cancel Articles</title
-> 
-
-<para
->This chapter deals with superseding and cancelling articles. You will not use these two features very often, but they do exist should you, one day, need them.</para
-> 
-
-<caution
-> 
-<para
->Both functions need a news server prepared to handle them; you should also remember that there is no guarantee that no one has already read your article before it is superseded or cancelled. </para>
-
-<para
->So first think, then post.</para
-> 
-</caution
-> 
-
-<sect3
-> 
-<title
->Cancel</title>
-
-<para
->Cancelling an article means deleting it from the newsgroup.</para
-> 
-
-<para
->Why should you want to cancel an article? Perhaps you flamed somebody in a rage and now you want to get this article out of the newsgroup because you regret what you wrote: a personal insult, read by everybody, doesn't look good, especially when you regret it; so, there is only one thing you can do &mdash; cancel the article.</para
-> 
-
-<para
->Select the article you want to cancel and choose <guimenuitem
->Cancel article</guimenuitem
-> from its context menu. If you are sure it is the right article, confirm &knode;s question with <guibutton
->Yes</guibutton
->. Now you will be asked if you want to send the Cancel message now or later; for this example we decide to send it <guibutton
->Later</guibutton
->. You will notice the new message in the folder <guilabel
->Outbox</guilabel
->.</para
-> 
-
-<para
->Now we want to look at the so-called cancel message. In the subject you will find something like:</para
-> 
-
-<screen
-><computeroutput
->cancel of &lt;n177m8.1m.ln@konqui.org&gt;</computeroutput
-> 
-</screen
-> 
-
-<para
->This strange letters between the brackets are the Message-ID of the article you want to cancel. This message tells the newsserver to delete your article: if you look at complete header of this message, by selecting <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Show all headers</guimenuitem
-></menuchoice
->, you will notice a line with the name <emphasis
->control</emphasis
-> and the content <emphasis
->cancel &lt;xxxxx@ddddd.dd&gt;</emphasis
-> &mdash; this line tells the server that this message is a control message and, in our case, tells the server to cancel your article.</para
-> 
-
-<para
->You can still delete the control message from the <guilabel
->Outbox</guilabel
-> should you change your mind.</para
-> 
-
-<caution
-> 
-<para
->Keep in mind that articles can only be identified by their Message-IDs; you need this Message-ID if you want to cancel an article. Normally, your article gets a Message-ID when it arrives at the newsserver &mdash; that's why you can only cancel an article once it has been published. The articles in the <guilabel
->Sent</guilabel
-> folder have no Message-ID, so you cannot cancel them from there.</para
-> 
-
-<para
->There is one exception: if you have configured &knode; to generate a Message-ID you can cancel you articles in folder <guilabel
->Sent</guilabel
-> too.</para
-> 
-
-<para
->&knode; allows only to cancel your own articles: it refuses to cancel articles from other authors.</para
-> 
-</caution
-> 
+</sect3> 
+</sect2> 
+
+<sect2 id="supersede-and-cancel"> 
+<title>Supersede and Cancel Articles</title> 
+
+<para>This chapter deals with superseding and cancelling articles. You will not use these two features very often, but they do exist should you, one day, need them.</para> 
+
+<caution> 
+<para>Both functions need a news server prepared to handle them; you should also remember that there is no guarantee that no one has already read your article before it is superseded or cancelled. </para>
+
+<para>So first think, then post.</para> 
+</caution> 
+
+<sect3> 
+<title>Cancel</title>
+
+<para>Cancelling an article means deleting it from the newsgroup.</para> 
+
+<para>Why should you want to cancel an article? Perhaps you flamed somebody in a rage and now you want to get this article out of the newsgroup because you regret what you wrote: a personal insult, read by everybody, doesn't look good, especially when you regret it; so, there is only one thing you can do &mdash; cancel the article.</para> 
+
+<para>Select the article you want to cancel and choose <guimenuitem>Cancel article</guimenuitem> from its context menu. If you are sure it is the right article, confirm &knode;s question with <guibutton>Yes</guibutton>. Now you will be asked if you want to send the Cancel message now or later; for this example we decide to send it <guibutton>Later</guibutton>. You will notice the new message in the folder <guilabel>Outbox</guilabel>.</para> 
+
+<para>Now we want to look at the so-called cancel message. In the subject you will find something like:</para> 
+
+<screen><computeroutput>cancel of &lt;n177m8.1m.ln@konqui.org&gt;</computeroutput> 
+</screen> 
+
+<para>This strange letters between the brackets are the Message-ID of the article you want to cancel. This message tells the newsserver to delete your article: if you look at complete header of this message, by selecting <menuchoice><guimenu>View</guimenu><guimenuitem>Show all headers</guimenuitem></menuchoice>, you will notice a line with the name <emphasis>control</emphasis> and the content <emphasis>cancel &lt;xxxxx@ddddd.dd&gt;</emphasis> &mdash; this line tells the server that this message is a control message and, in our case, tells the server to cancel your article.</para> 
+
+<para>You can still delete the control message from the <guilabel>Outbox</guilabel> should you change your mind.</para> 
+
+<caution> 
+<para>Keep in mind that articles can only be identified by their Message-IDs; you need this Message-ID if you want to cancel an article. Normally, your article gets a Message-ID when it arrives at the newsserver &mdash; that's why you can only cancel an article once it has been published. The articles in the <guilabel>Sent</guilabel> folder have no Message-ID, so you cannot cancel them from there.</para> 
+
+<para>There is one exception: if you have configured &knode; to generate a Message-ID you can cancel you articles in folder <guilabel>Sent</guilabel> too.</para> 
+
+<para>&knode; allows only to cancel your own articles: it refuses to cancel articles from other authors.</para> 
+</caution> 
 
 <warning>
-<para
->Since the cancel feature is so easily fooled, by newsreaders that let you cancel any post, many news servers do not acknowledge cancel messages from posters; even if your own <acronym
->ISP</acronym
-> accepts the cancel and passes it on, many other servers will ignore it <emphasis
->and will not pass it on</emphasis
->.</para>
-
-<para
->You should consider any previously-sent article, cancelled or not, to be published and publicly available.</para>
+<para>Since the cancel feature is so easily fooled, by newsreaders that let you cancel any post, many news servers do not acknowledge cancel messages from posters; even if your own <acronym>ISP</acronym> accepts the cancel and passes it on, many other servers will ignore it <emphasis>and will not pass it on</emphasis>.</para>
+
+<para>You should consider any previously-sent article, cancelled or not, to be published and publicly available.</para>
 </warning>
 
-</sect3
-> 
-
-<sect3
-> 
-<title
->Supersede</title
-> 
-
-<para
->Supersede overwrites your article with a new version. One reason for doing this could be:</para
-> 
-
-<para
->You have written a long article and have already posted it; now, you have found an error in this article: you could cancel this article, and post a new, corrected, article; or, you can use Supersede.</para
-> 
-
-<para
->Select the article in the article view. From its context menu select <guimenuitem
->Supersede article...</guimenuitem
->. &knode; will ask you if you really want to overwrite this article; if you confirm with <guibutton
->Yes</guibutton
-> the Composer appears.</para
-> 
-
-<para
->In the Composer you can now make the desired corrections and changes. You can then publish this article in the same way as you post every other article; when the newsserver receives this article it reads some special lines in the header which tell the newsserver to supersede the older article. Select <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Later</guimenuitem
-></menuchoice
-> for now, because we want to look at the article's header in the <guilabel
->Outbox</guilabel
->.</para>
-
-<para
->Activate <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Show all headers</guimenuitem
-></menuchoice
->, because we want to see all the headers the newsserver receives. You will notice a line like:</para
-> 
-
-<para
->Supersedes: &lt;oggcm8.4n5.ln@konqi.org&gt;</para
-> 
-
-<para
->This is the instruction for the newsserver for superseding the article with the Message-ID &lt;oggcm8.4n5.ln@konqi.org&gt; with the new article.</para
-> 
-
-<para
->Besides this, Supersede is used for periodical posted articles, &eg; an <acronym
->FAQ</acronym
->. The new article supersedes the old one and the newsgroups do not end up with lots of different versions.</para
-> 
-
-<caution
-> 
-<para
->Again, using this function is only possible if the article already has a Message-ID. Normally, articles get their Message-ID from the newsserver: this means that you can only supersede articles which have already been published.</para
-> 
-
-<para
->You can configure &knode; to generate this Message-ID, then you can supersede your articles in the folder <guilabel
->Sent</guilabel
->, too.</para
-> 
-
-<para
->&knode; allows you to only supersede your own articles.</para
-> 
-
-</caution
-> 
+</sect3> 
+
+<sect3> 
+<title>Supersede</title> 
+
+<para>Supersede overwrites your article with a new version. One reason for doing this could be:</para> 
+
+<para>You have written a long article and have already posted it; now, you have found an error in this article: you could cancel this article, and post a new, corrected, article; or, you can use Supersede.</para> 
+
+<para>Select the article in the article view. From its context menu select <guimenuitem>Supersede article...</guimenuitem>. &knode; will ask you if you really want to overwrite this article; if you confirm with <guibutton>Yes</guibutton> the Composer appears.</para> 
+
+<para>In the Composer you can now make the desired corrections and changes. You can then publish this article in the same way as you post every other article; when the newsserver receives this article it reads some special lines in the header which tell the newsserver to supersede the older article. Select <menuchoice><guimenu>File</guimenu><guimenuitem>Send Later</guimenuitem></menuchoice> for now, because we want to look at the article's header in the <guilabel>Outbox</guilabel>.</para>
+
+<para>Activate <menuchoice><guimenu>View</guimenu><guimenuitem>Show all headers</guimenuitem></menuchoice>, because we want to see all the headers the newsserver receives. You will notice a line like:</para> 
+
+<para>Supersedes: &lt;oggcm8.4n5.ln@konqi.org&gt;</para> 
+
+<para>This is the instruction for the newsserver for superseding the article with the Message-ID &lt;oggcm8.4n5.ln@konqi.org&gt; with the new article.</para> 
+
+<para>Besides this, Supersede is used for periodical posted articles, &eg; an <acronym>FAQ</acronym>. The new article supersedes the old one and the newsgroups do not end up with lots of different versions.</para> 
+
+<caution> 
+<para>Again, using this function is only possible if the article already has a Message-ID. Normally, articles get their Message-ID from the newsserver: this means that you can only supersede articles which have already been published.</para> 
+
+<para>You can configure &knode; to generate this Message-ID, then you can supersede your articles in the folder <guilabel>Sent</guilabel>, too.</para> 
+
+<para>&knode; allows you to only supersede your own articles.</para> 
+
+</caution> 
 
 <warning>
-<para
->As with cancels, supersede messages have been abused in the past, with, for example, certain parties sending hundreds or even thousands of them to overwrite legitimate posts with random computer generated junk; again, as with cancels, many news servers do not honour supersede messages, nor do they pass them on.</para>
+<para>As with cancels, supersede messages have been abused in the past, with, for example, certain parties sending hundreds or even thousands of them to overwrite legitimate posts with random computer generated junk; again, as with cancels, many news servers do not honour supersede messages, nor do they pass them on.</para>
 </warning>
 
-</sect3
-> 
-</sect2
-> 
+</sect3> 
+</sect2> 
 
-<sect2 id="score-watch-ignore"
-> 
-<title
->Score, watch, ignore</title>
+<sect2 id="score-watch-ignore"> 
+<title>Score, watch, ignore</title>
  
 <anchor id="anc-score-watch-ignore"/> 
-<para
->Score, Watch and Ignore are different names for the same feature.</para
-> 
-
-<para
->By scoring a thread, you determine its importance. &knode; allows scores between -100000 and 100000. A normal article will get a score of 0 if you do not change this; threads with a score below 0 are less important than average; threads with a score above 0 are more important than average.</para
-> 
-
-<para
->The score is an attribute of the thread and the articles in this thread, so you can use the score for filtering and searching articles; for example, you can define a filter to show only articles with a score &gt; 0, i.e. all articles in which you are specifically interested.</para
-> 
-
-<para
->The function <guilabel
->Watch</guilabel
-> sets the score of all article in a thread to 100; this way they get a high score and &knode; labels them with a special icon.</para>
-
-<para
->The function <guilabel
->Ignore</guilabel
-> does the opposite: it scores all articles in a thread with -100 so &knode; does not show these articles anymore.</para>
-
-<tip
-> 
-<para
->The English word <quote
->scoring</quote
-> is used in many other countries, too.</para>
-</tip
-> 
-
-<para
->You can score an article or a thread manually with the right mouse button or with the <guimenu
->Scoring</guimenu
-> menu &mdash; here you can score with <guilabel
->Watch Thread</guilabel
-> and <guilabel
->Ignore Thread</guilabel
-> directly. Apart from scoring manually you can let &knode; score the articles with scoring rules automatically; you can configure these rules at <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guimenuitem
->Reading News</guimenuitem
-><guimenuitem
->Scoring</guimenuitem
-></menuchoice
-> or at <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Edit scoring rules...</guimenuitem
-></menuchoice
-> &mdash; the only difference between these dialogues is that the last one has the rule-list next to the rule configuration. In the following guide I'm using the editor that appears if <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Edit scoring rules...</guimenuitem
-></menuchoice
-> is chosen.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->The Rule Editor</screeninfo>
+<para>Score, Watch and Ignore are different names for the same feature.</para> 
+
+<para>By scoring a thread, you determine its importance. &knode; allows scores between -100000 and 100000. A normal article will get a score of 0 if you do not change this; threads with a score below 0 are less important than average; threads with a score above 0 are more important than average.</para> 
+
+<para>The score is an attribute of the thread and the articles in this thread, so you can use the score for filtering and searching articles; for example, you can define a filter to show only articles with a score &gt; 0, i.e. all articles in which you are specifically interested.</para> 
+
+<para>The function <guilabel>Watch</guilabel> sets the score of all article in a thread to 100; this way they get a high score and &knode; labels them with a special icon.</para>
+
+<para>The function <guilabel>Ignore</guilabel> does the opposite: it scores all articles in a thread with -100 so &knode; does not show these articles anymore.</para>
+
+<tip> 
+<para>The English word <quote>scoring</quote> is used in many other countries, too.</para>
+</tip> 
+
+<para>You can score an article or a thread manually with the right mouse button or with the <guimenu>Scoring</guimenu> menu &mdash; here you can score with <guilabel>Watch Thread</guilabel> and <guilabel>Ignore Thread</guilabel> directly. Apart from scoring manually you can let &knode; score the articles with scoring rules automatically; you can configure these rules at <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guimenuitem>Reading News</guimenuitem><guimenuitem>Scoring</guimenuitem></menuchoice> or at <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Edit scoring rules...</guimenuitem></menuchoice> &mdash; the only difference between these dialogues is that the last one has the rule-list next to the rule configuration. In the following guide I'm using the editor that appears if <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Edit scoring rules...</guimenuitem></menuchoice> is chosen.</para> 
+
+<screenshot> 
+<screeninfo>The Rule Editor</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="knode-rule-editor.png" format="PNG"/> </imageobject>
 <textobject>
-<phrase
->The Rule Editor</phrase>
+<phrase>The Rule Editor</phrase>
 </textobject>
 <caption>
-<para
->The Rule Editor</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->The composer consists of 4 areas: on the left side is the list of the rules; with the buttons below the list you can add, delete or copy an existing rule; below that you have the possibility to limit the rules which are shown &mdash; you have the choice whether to show all rules or only the rules for a specific <glossterm
->newsgroup</glossterm
->.</para
-> 
-
-<para
->If you chose a rule-name in the list you the rule will be displayed on the right-hand side; now you can edit the rule. At the top you can change the name of the rule and set the newsgroups to which this rule applies. You can choose one or more than one group, note that group names must be separated by a semicolon. You can choose from the subscribed groups with the drop-down list and the <guibutton
->Add group</guibutton
-> button; or you can use regular expressions and wild cards, &eg; <quote
->.*</quote
-> for all groups. The <guilabel
->Expire rule automatically</guilabel
-> option makes it possible to delete the rule automatically after the configured number of days; this is useful if a specific person behaves badly and you do not want to read anything from this person for a few days.</para
-> 
-
-<para
->In the <guilabel
->Condition</guilabel
-> field you enter the condition on which this rule is activated. Normally, you can enter only one condition, but you can change this by pressing the <guibutton
->More</guibutton
-> and <guibutton
->Fewer</guibutton
-> buttons. If you have more than one condition, you must tell knode whether all conditions need to be fulfilled or only one of them; this can be done by choosing <guilabel
->Match all conditions</guilabel
-> or <guilabel
->Match any condition</guilabel
-> respectively. </para
-> 
-
-<para
->Each condition consists of 2 drop-down lists and a text field. In the first list you chose the part of the message which should be used for the condition &mdash; this part will be compared with the text field; the second drop-down list tells &knode; how it is to be compared, for example, whether the chosen header should be identical to the text entered in the text field, or if it just needs to match part of it. Regular expressions are allowed, too. If you check <guilabel
->Not</guilabel
-> then the conditions under which the condition is satisfied are reversed, and the condition will be satisfied if the opposite of its shown conditions is true.</para
-> 
-
-<para
->Now, let's have a look at some examples.</para>
-
-<itemizedlist
-> 
+<para>The Rule Editor</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>The composer consists of 4 areas: on the left side is the list of the rules; with the buttons below the list you can add, delete or copy an existing rule; below that you have the possibility to limit the rules which are shown &mdash; you have the choice whether to show all rules or only the rules for a specific <glossterm>newsgroup</glossterm>.</para> 
+
+<para>If you chose a rule-name in the list you the rule will be displayed on the right-hand side; now you can edit the rule. At the top you can change the name of the rule and set the newsgroups to which this rule applies. You can choose one or more than one group, note that group names must be separated by a semicolon. You can choose from the subscribed groups with the drop-down list and the <guibutton>Add group</guibutton> button; or you can use regular expressions and wild cards, &eg; <quote>.*</quote> for all groups. The <guilabel>Expire rule automatically</guilabel> option makes it possible to delete the rule automatically after the configured number of days; this is useful if a specific person behaves badly and you do not want to read anything from this person for a few days.</para> 
+
+<para>In the <guilabel>Condition</guilabel> field you enter the condition on which this rule is activated. Normally, you can enter only one condition, but you can change this by pressing the <guibutton>More</guibutton> and <guibutton>Fewer</guibutton> buttons. If you have more than one condition, you must tell knode whether all conditions need to be fulfilled or only one of them; this can be done by choosing <guilabel>Match all conditions</guilabel> or <guilabel>Match any condition</guilabel> respectively. </para> 
+
+<para>Each condition consists of 2 drop-down lists and a text field. In the first list you chose the part of the message which should be used for the condition &mdash; this part will be compared with the text field; the second drop-down list tells &knode; how it is to be compared, for example, whether the chosen header should be identical to the text entered in the text field, or if it just needs to match part of it. Regular expressions are allowed, too. If you check <guilabel>Not</guilabel> then the conditions under which the condition is satisfied are reversed, and the condition will be satisfied if the opposite of its shown conditions is true.</para> 
+
+<para>Now, let's have a look at some examples.</para>
+
+<itemizedlist> 
 <listitem>
-<para
->Maybe you want to filter away all the postings by Theodor Test; to do this choose the <guilabel
->From</guilabel
-> header line from the first drop-down list, choose <guilabel
->is exactly the same as</guilabel
-> from the second drop-down list, and enter his name in the text field. But, before doing this you should have a look at the <glossterm
->header</glossterm
-> of one of Theodor's articles and see what is in the <quote
->From</quote
-> line.</para>
-</listitem
-> 
+<para>Maybe you want to filter away all the postings by Theodor Test; to do this choose the <guilabel>From</guilabel> header line from the first drop-down list, choose <guilabel>is exactly the same as</guilabel> from the second drop-down list, and enter his name in the text field. But, before doing this you should have a look at the <glossterm>header</glossterm> of one of Theodor's articles and see what is in the <quote>From</quote> line.</para>
+</listitem> 
 <listitem>
-<para
->If you do not want to read articles with more than 100 lines, choose the header entry <guilabel
->Lines</guilabel
-> from the first drop-down list, choose <guilabel
->greater than</guilabel
-> from the second, and enter <userinput
->100</userinput
-> in the text field. You probably, then, want to score down the message.</para>
+<para>If you do not want to read articles with more than 100 lines, choose the header entry <guilabel>Lines</guilabel> from the first drop-down list, choose <guilabel>greater than</guilabel> from the second, and enter <userinput>100</userinput> in the text field. You probably, then, want to score down the message.</para>
 </listitem>
 <listitem>
-<para
->Last example: of course, you're very interested in every article that refers to &knode;. Choose the header entry <guilabel
->Subject</guilabel
->, then <guilabel
->contains substring</guilabel
-> and enter <userinput
->knode</userinput
-> in the text field. But what do you do if &knode; is not mentioned in the <guilabel
->Subject</guilabel
->? I suggest using a regular expression: change <guilabel
->contains substring</guilabel
-> to <guilabel
->matches regular expression</guilabel
-> and type <userinput
->knode|newsreader|usenet</userinput
-> into the text field to match either knode, newsreader or usenet &mdash; the <userinput
->|</userinput
-> symbol means OR. Alternatively, you can make 3 conditions &mdash; one that matches knode, one that matches newsreader and so on &mdash; and choose <guilabel
->Match any condition</guilabel
->; but, this needs a lot of space and it is not very elegant, is it?</para>
+<para>Last example: of course, you're very interested in every article that refers to &knode;. Choose the header entry <guilabel>Subject</guilabel>, then <guilabel>contains substring</guilabel> and enter <userinput>knode</userinput> in the text field. But what do you do if &knode; is not mentioned in the <guilabel>Subject</guilabel>? I suggest using a regular expression: change <guilabel>contains substring</guilabel> to <guilabel>matches regular expression</guilabel> and type <userinput>knode|newsreader|usenet</userinput> into the text field to match either knode, newsreader or usenet &mdash; the <userinput>|</userinput> symbol means OR. Alternatively, you can make 3 conditions &mdash; one that matches knode, one that matches newsreader and so on &mdash; and choose <guilabel>Match any condition</guilabel>; but, this needs a lot of space and it is not very elegant, is it?</para>
 </listitem>
  
-</itemizedlist
-> 
-
-<para
->Once your condition is ready you should set an action down in the <guilabel
->Actions</guilabel
-> section. The most important action is <guilabel
->adjust score</guilabel
->; if this action is chosen you can raise or lower the score, by the configured value, for articles to which this rule applies. &knode; can also show you a little message when finding such an article or colourise the header in the article list; for example, you could make interesting articles screaming pink so you would notice them very quickly.</para
-> 
-
-<para
->When leaving the editor, or when the <menuchoice
-><guimenu
->Scoring</guimenu
-><guimenuitem
->Recalculate scores</guimenuitem
-></menuchoice
-> menu item is chosen, the rules are executed; furthermore, the rules are automatically used for new <glossterm
->articles</glossterm
->. Scoring makes the most sense when used with filters: by scoring some articles down and filtering them away they won't appear in the article list.</para>
+</itemizedlist> 
+
+<para>Once your condition is ready you should set an action down in the <guilabel>Actions</guilabel> section. The most important action is <guilabel>adjust score</guilabel>; if this action is chosen you can raise or lower the score, by the configured value, for articles to which this rule applies. &knode; can also show you a little message when finding such an article or colourise the header in the article list; for example, you could make interesting articles screaming pink so you would notice them very quickly.</para> 
+
+<para>When leaving the editor, or when the <menuchoice><guimenu>Scoring</guimenu><guimenuitem>Recalculate scores</guimenuitem></menuchoice> menu item is chosen, the rules are executed; furthermore, the rules are automatically used for new <glossterm>articles</glossterm>. Scoring makes the most sense when used with filters: by scoring some articles down and filtering them away they won't appear in the article list.</para>
 
 </sect2>
 
-<sect2 id="group-identity"
-> 
-<title
->Group identities</title
-> 
-
-<para
->With &knode; you can use a different identity with every newsgroup to which you are subscribed; i.e. you can set a name, email address, reply-to address and signature to use with that group.</para>
-
-<para
->It is easy to set group identities. First, with the right mouse button, click on the name of the newsgroup in which to have a different identity in; then, select <guimenuitem
->Group Properties</guimenuitem
-> from the context menu that appears. In the dialogue that appears the second tab contains fields identical to the global identity settings; enter your settings here and click <guibutton
->OK</guibutton
-> to confirm the changes: then, your articles in this group will always posted with this newly-entered identity.</para
-> 
-
-<caution
-> 
-<para
->When you unsubscribe from a group you lose its identity settings for this group: if you re-subscribe to the group, you will need to re-enter its identity settings. For new newsgroups, the global identity is used.</para
-> 
-</caution
-> 
-
-</sect2
-> 
-
-<sect2 id="multiple-news-accounts"
-> 
-<title
->Managing Multiple News Accounts</title
-> 
-
-<para
->&knode; can handle an unlimited number of news server accounts in addition to your main news server; most users don't need this feature, but it can be very useful to if your main newsserver does not provide all groups you want to read. Typical cases of this are when support groups for commercial software are hosted on a special, private, server or binary newsgroups, which are only available from some servers.</para
-> 
-
-<para
->Another example of why you sometimes need more than one newsserver is that sometimes not all interesting newsgroups are on one server; in fact, there is very often only a selection of newsgroups. For example, many servers do not support binary groups with pictures or programs; if you want such a newsgroup and your newsserver provider does not want to serve it you can configure &knode; to get it from another server.</para>
-
-<para
->Or, perhaps you find you are just subscribed to too many newsgroups, and would like to organise them a little better; you could set up several accounts for the same server, perhaps one for groups you read every day, and one for groups you read less often, so that you do not have to search for your <quote
->everyday</quote
-> groups in a long list of subscribed groups.</para>
-
-<para
->In order to add an new account, open the preferences dialogue via <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Accounts</guilabel
-><guilabel
->News</guilabel
-> </menuchoice
->. The <guibutton
->New</guibutton
-> button creates a new account; you then have to enter the same data as for your first account, typically a name for the account, the host name, and a user name and password if the server requires authentication. When this is done the new server will appear both in the configuration dialogue and in the group view: you can now subscribe to newsgroups.</para>
-
-<para
->You can delete the currently-selected account by pressing the <guibutton
->Delete</guibutton
-> button.</para
-> 
+<sect2 id="group-identity"> 
+<title>Group identities</title> 
+
+<para>With &knode; you can use a different identity with every newsgroup to which you are subscribed; i.e. you can set a name, email address, reply-to address and signature to use with that group.</para>
+
+<para>It is easy to set group identities. First, with the right mouse button, click on the name of the newsgroup in which to have a different identity in; then, select <guimenuitem>Group Properties</guimenuitem> from the context menu that appears. In the dialogue that appears the second tab contains fields identical to the global identity settings; enter your settings here and click <guibutton>OK</guibutton> to confirm the changes: then, your articles in this group will always posted with this newly-entered identity.</para> 
+
+<caution> 
+<para>When you unsubscribe from a group you lose its identity settings for this group: if you re-subscribe to the group, you will need to re-enter its identity settings. For new newsgroups, the global identity is used.</para> 
+</caution> 
+
+</sect2> 
+
+<sect2 id="multiple-news-accounts"> 
+<title>Managing Multiple News Accounts</title> 
+
+<para>&knode; can handle an unlimited number of news server accounts in addition to your main news server; most users don't need this feature, but it can be very useful to if your main newsserver does not provide all groups you want to read. Typical cases of this are when support groups for commercial software are hosted on a special, private, server or binary newsgroups, which are only available from some servers.</para> 
+
+<para>Another example of why you sometimes need more than one newsserver is that sometimes not all interesting newsgroups are on one server; in fact, there is very often only a selection of newsgroups. For example, many servers do not support binary groups with pictures or programs; if you want such a newsgroup and your newsserver provider does not want to serve it you can configure &knode; to get it from another server.</para>
+
+<para>Or, perhaps you find you are just subscribed to too many newsgroups, and would like to organise them a little better; you could set up several accounts for the same server, perhaps one for groups you read every day, and one for groups you read less often, so that you do not have to search for your <quote>everyday</quote> groups in a long list of subscribed groups.</para>
+
+<para>In order to add an new account, open the preferences dialogue via <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Accounts</guilabel><guilabel>News</guilabel> </menuchoice>. The <guibutton>New</guibutton> button creates a new account; you then have to enter the same data as for your first account, typically a name for the account, the host name, and a user name and password if the server requires authentication. When this is done the new server will appear both in the configuration dialogue and in the group view: you can now subscribe to newsgroups.</para>
+
+<para>You can delete the currently-selected account by pressing the <guibutton>Delete</guibutton> button.</para> 
 
 <tip>
-<para
->In the <guimenu
->Account properties</guimenu
-> dialogue (available from the context menu of the newsserver) you can setup an identity for use only on this newsserver.</para>
+<para>In the <guimenu>Account properties</guimenu> dialogue (available from the context menu of the newsserver) you can setup an identity for use only on this newsserver.</para>
 </tip>
 </sect2>
 
 <sect2 id="PGP-support">
-<title
->Sign and Verify Articles with <acronym
->PGP</acronym
-></title>
+<title>Sign and Verify Articles with <acronym>PGP</acronym></title>
 <anchor id="anc-PGP-support"/>
 
-<para
-><acronym
->PGP</acronym
-> is the most-widespread method used to encrypt or sign data. Using the <glossterm
->PGP-signature</glossterm
-> you can verify if an article is really from the original author or if it has been changed by others. You can find PGP-programs and guides at <ulink url="http://www.pgpi.org"
->http://www.pgpi.org</ulink
->.</para>
-
-<para
->With &knode; you can sign an article with <acronym
->PGP</acronym
-> and to verify <acronym
->PGP</acronym
->-signed article. After you have configured the <acronym
->PGP</acronym
-> support, at <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Knode...</guimenuitem
-><guilabel
->Signing/Verifying</guilabel
-></menuchoice
->, you can sign articles in the editor with the <menuchoice
-><guimenu
->Tools</guimenu
-><guimenuitem
->Sign article with PGP</guimenuitem
-></menuchoice
-> menu item &mdash; you will be asked for your passphrase and after that the article will be signed.</para>
-
-<caution
-> 
-<para
->Your <application
->GnuPG</application
->/<acronym
->PGP</acronym
-> <acronym
->ID</acronym
-> is automatically built from your name and your email address and is identical to the sender of the message (<quote
->From</quote
->-header).</para>
+<para><acronym>PGP</acronym> is the most-widespread method used to encrypt or sign data. Using the <glossterm>PGP-signature</glossterm> you can verify if an article is really from the original author or if it has been changed by others. You can find PGP-programs and guides at <ulink url="http://www.pgpi.org">http://www.pgpi.org</ulink>.</para>
+
+<para>With &knode; you can sign an article with <acronym>PGP</acronym> and to verify <acronym>PGP</acronym>-signed article. After you have configured the <acronym>PGP</acronym> support, at <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Knode...</guimenuitem><guilabel>Signing/Verifying</guilabel></menuchoice>, you can sign articles in the editor with the <menuchoice><guimenu>Tools</guimenu><guimenuitem>Sign article with PGP</guimenuitem></menuchoice> menu item &mdash; you will be asked for your passphrase and after that the article will be signed.</para>
+
+<caution> 
+<para>Your <application>GnuPG</application>/<acronym>PGP</acronym> <acronym>ID</acronym> is automatically built from your name and your email address and is identical to the sender of the message (<quote>From</quote>-header).</para>
 </caution>
 
-<para
->To verify a <glossterm
->PGP-signature</glossterm
-> you have to choose the menu item <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Verify PGP-signature</guimenuitem
-></menuchoice
->.</para
-> 
+<para>To verify a <glossterm>PGP-signature</glossterm> you have to choose the menu item <menuchoice><guimenu>View</guimenu><guimenuitem>Verify PGP-signature</guimenuitem></menuchoice>.</para> 
 </sect2>
 
-</sect1
-> 
+</sect1> 
 <!--
 Local Variables:
 mode: sgml
diff --git a/tde-i18n-en_GB/docs/tdepim/knode/using-subscribing.docbook b/tde-i18n-en_GB/docs/tdepim/knode/using-subscribing.docbook
index 57d854be2cd..2f54372ec2f 100644
--- a/tde-i18n-en_GB/docs/tdepim/knode/using-subscribing.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knode/using-subscribing.docbook
@@ -2,2138 +2,795 @@
 <!DOCTYPE sect1 PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd">
 
 -->
-<sect1 id="subscribing"
-> 
-<title
->Working with newsgroups</title
-> 
+<sect1 id="subscribing"> 
+<title>Working with newsgroups</title> 
 
-<para
->After the configuration of &knode; we will now try to get your first news; to achieve this, you need to do some more steps of configuration, but you will not have to do this very often.</para>
+<para>After the configuration of &knode; we will now try to get your first news; to achieve this, you need to do some more steps of configuration, but you will not have to do this very often.</para>
 
 <sect2 id="fetch-group-list">
-<title
->Fetching the group-list from the news server</title
-> 
+<title>Fetching the group-list from the news server</title> 
 
 <anchor id="anc-fetch-group-list"/>
 
-<para
->If you want to read a newsgroup you first have to subscribe to it. &RMB;-click with your mouse on the entry of your newsserver in the folder-list; from the context menu that appears select the <guimenuitem
->Subscribe to Newsgroups</guimenuitem
-> entry. &knode;, at this moment, does not know which newsgroups are available from this server and will ask you if it should fetch a list of available newsgroups: confirm with <guibutton
->Yes</guibutton
->. Now you should see the following dialogue.</para>
-
-<screenshot
-> 
-<screeninfo
->The <guilabel
->Subscribe to Newsgroups</guilabel
-> Dialogue</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-subscribe.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The <guilabel
->Subscribe to Newsgroups</guilabel
-> dialogue</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The <guilabel
->Subscribe to Newsgroups</guilabel
-> dialogue</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->After some time &knode; will has fetched the list of available newsgroups and will show them in the left window, <guilabel
->Groups on</guilabel
->, in a tree; this tree view shows the newsgroup hierarchy.</para>
+<para>If you want to read a newsgroup you first have to subscribe to it. &RMB;-click with your mouse on the entry of your newsserver in the folder-list; from the context menu that appears select the <guimenuitem>Subscribe to Newsgroups</guimenuitem> entry. &knode;, at this moment, does not know which newsgroups are available from this server and will ask you if it should fetch a list of available newsgroups: confirm with <guibutton>Yes</guibutton>. Now you should see the following dialogue.</para>
+
+<screenshot> 
+<screeninfo>The <guilabel>Subscribe to Newsgroups</guilabel> Dialogue</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-subscribe.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The <guilabel>Subscribe to Newsgroups</guilabel> dialogue</phrase> 
+</textobject> 
+<caption> 
+<para>The <guilabel>Subscribe to Newsgroups</guilabel> dialogue</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>After some time &knode; will has fetched the list of available newsgroups and will show them in the left window, <guilabel>Groups on</guilabel>, in a tree; this tree view shows the newsgroup hierarchy.</para>
 
 <tip>
-<para
->You can find a short description about the structure of the usenet and the hierarchy of the single newsgroups at <ulink url="http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung"
->http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung</ulink
-> (German).</para>
+<para>You can find a short description about the structure of the usenet and the hierarchy of the single newsgroups at <ulink url="http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung">http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung</ulink> (German).</para>
 </tip>
 
 <sect3>
-<title
-><guilabel
->Search</guilabel
-></title>
-
-<para
->The simplest method to navigate in the tree is to use the <guilabel
->Search</guilabel
-> input field: &knode; will filter the groups displayed according to your input. If you are searching for a group about &kde;, but you do not know its exact position in the hierarchy, just type <userinput
->kde</userinput
-> in the <guilabel
->Search</guilabel
-> field.</para>
-
-<para
->When you enter the <userinput
->k</userinput
->, you will already see the list changing; the second letter, <userinput
->d</userinput
->, give you a significantly-reduced list of shown groups; and the final <userinput
->e</userinput
-> reduces the list to the groups with kde in their name. You will most likely end with just one group:</para>
-
-<simplelist
-> 
-<member
->comp.windows.x.kde</member
-> 
-</simplelist
-> 
-
-<para
->If your server carries the international groups, you might find your list is:</para>
-
-<simplelist
-> 
-<member
->comp.windows.x.kde</member
-> 
-<member
->de.comp.os.unix.apps.kde</member
-> 
-</simplelist
-> 
-
-<para
->This incremental search gives you the possibility to search for newsgroups without knowing their exact paths.</para
-> 
-
-<tip
-> 
-<para
->On a closer look, you will see &knode; showing the groups without a tree if there are only a few groups left; this is not a bug, it is a feature.</para
-> 
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->disable tree view</guilabel
-></title
-> 
-
-<para
->Normally &knode; shows all the groups in a tree; if this option is activated, all newsgroups are listed amongst one another.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-> 
-<guilabel
->subscribed only</guilabel
-></title
-> 
-
-<para
->If <guilabel
->subscribed only</guilabel
-> is checked the tree-view <guilabel
->Groups on</guilabel
-> shows only the groups you are already subscribed to; this is very convenient if you want to unsubscribe from some groups: you then won't have to search the whole tree for these groups.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->new only</guilabel
-></title
-> 
-
-<para
->If <guilabel
->new only</guilabel
-> is checked the tree-view <guilabel
->Groups on</guilabel
-> shows only the groups which are new since you last fetched the group list; for this to be functional, you first have to fetch a new group list with <guibutton
->New List</guibutton
->.</para
-> 
-
-<para
->The <guibutton
->New Groups</guibutton
-> button give the possibility to show all the new groups since a specific date.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Groups on</guilabel
-></title
-> 
-
-<para
->This list shows all newsgroups on this server; if you check one of the checkboxes, <guilabel
->subscribed only</guilabel
-> or <guilabel
->new only</guilabel
->, you get the corresponding selection.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->Current changes</guilabel
-></title
-> 
-
-<para
->The <guilabel
->Current changes</guilabel
-> window shows all changes you have made since you opened the dialogue.</para
-> 
-
-<para
->The <guilabel
->subscribe to</guilabel
-> list shows the newsgroups you have chosen to subscribe to.</para
-> 
-
-<para
->Below you can see the <guilabel
->unsubscribe from</guilabel
-> list, which shows all newsgroups from which you have chosen to unsubscribe. You cannot unsubscribe from groups you are not subscribed to.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guilabel
->New Groups</guilabel
-></title
-> 
-
-<para
->This button opens a dialogue which allows you to configure the list of new groups; you can choose between showing all groups since the last refresh or all groups since a given date. With the date option, &knode; provides a more-flexible possibility to check for new groups; you can even check for new groups since before the last refresh of the group list.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
-><guibutton
->New List</guibutton
-></title
-> 
-
-<para
->The <guibutton
->New List</guibutton
-> button tells &knode; to fetch a new group list from the news server.</para
-> 
-
-
-<para
->The newsgroup hierarchy is in a constant flux; all the time there are groups introduced, renamed or moved; some groups just disappear: they are no longer available and get deleted. To reflect this, &knode; gives you the possibility to refresh the the group list. This is, normally, only needed to see if your server now provides a group which was not there before.</para
-> 
+<title><guilabel>Search</guilabel></title>
+
+<para>The simplest method to navigate in the tree is to use the <guilabel>Search</guilabel> input field: &knode; will filter the groups displayed according to your input. If you are searching for a group about &kde;, but you do not know its exact position in the hierarchy, just type <userinput>kde</userinput> in the <guilabel>Search</guilabel> field.</para>
+
+<para>When you enter the <userinput>k</userinput>, you will already see the list changing; the second letter, <userinput>d</userinput>, give you a significantly-reduced list of shown groups; and the final <userinput>e</userinput> reduces the list to the groups with kde in their name. You will most likely end with just one group:</para>
+
+<simplelist> 
+<member>comp.windows.x.kde</member> 
+</simplelist> 
+
+<para>If your server carries the international groups, you might find your list is:</para>
+
+<simplelist> 
+<member>comp.windows.x.kde</member> 
+<member>de.comp.os.unix.apps.kde</member> 
+</simplelist> 
+
+<para>This incremental search gives you the possibility to search for newsgroups without knowing their exact paths.</para> 
+
+<tip> 
+<para>On a closer look, you will see &knode; showing the groups without a tree if there are only a few groups left; this is not a bug, it is a feature.</para> 
+</tip> 
+</sect3> 
+
+<sect3> 
+<title><guilabel>disable tree view</guilabel></title> 
+
+<para>Normally &knode; shows all the groups in a tree; if this option is activated, all newsgroups are listed amongst one another.</para> 
+
+</sect3> 
+
+<sect3> 
+<title> 
+<guilabel>subscribed only</guilabel></title> 
+
+<para>If <guilabel>subscribed only</guilabel> is checked the tree-view <guilabel>Groups on</guilabel> shows only the groups you are already subscribed to; this is very convenient if you want to unsubscribe from some groups: you then won't have to search the whole tree for these groups.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>new only</guilabel></title> 
+
+<para>If <guilabel>new only</guilabel> is checked the tree-view <guilabel>Groups on</guilabel> shows only the groups which are new since you last fetched the group list; for this to be functional, you first have to fetch a new group list with <guibutton>New List</guibutton>.</para> 
+
+<para>The <guibutton>New Groups</guibutton> button give the possibility to show all the new groups since a specific date.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Groups on</guilabel></title> 
+
+<para>This list shows all newsgroups on this server; if you check one of the checkboxes, <guilabel>subscribed only</guilabel> or <guilabel>new only</guilabel>, you get the corresponding selection.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>Current changes</guilabel></title> 
+
+<para>The <guilabel>Current changes</guilabel> window shows all changes you have made since you opened the dialogue.</para> 
+
+<para>The <guilabel>subscribe to</guilabel> list shows the newsgroups you have chosen to subscribe to.</para> 
+
+<para>Below you can see the <guilabel>unsubscribe from</guilabel> list, which shows all newsgroups from which you have chosen to unsubscribe. You cannot unsubscribe from groups you are not subscribed to.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guilabel>New Groups</guilabel></title> 
+
+<para>This button opens a dialogue which allows you to configure the list of new groups; you can choose between showing all groups since the last refresh or all groups since a given date. With the date option, &knode; provides a more-flexible possibility to check for new groups; you can even check for new groups since before the last refresh of the group list.</para> 
+
+</sect3> 
+
+<sect3> 
+<title><guibutton>New List</guibutton></title> 
+
+<para>The <guibutton>New List</guibutton> button tells &knode; to fetch a new group list from the news server.</para> 
+
+
+<para>The newsgroup hierarchy is in a constant flux; all the time there are groups introduced, renamed or moved; some groups just disappear: they are no longer available and get deleted. To reflect this, &knode; gives you the possibility to refresh the the group list. This is, normally, only needed to see if your server now provides a group which was not there before.</para> 
 
 <tip>
-<para
->If you simply want to make sure you have seen every new group, it is more effective to use <guibutton
->New Groups</guibutton
->; fetching the complete list is much more time consuming, but you do make sure that any deleted groups vanish from the grouplist.</para
-> 
-</tip
-> 
-
-<para
->Unfortunately there is no guarantee that your newsserver is providing all available newsgroups: many newsserver refuse groups publishing binary attachments; other groups are only available from special servers. &knode; provides you the possibility to use more than one news-server if you want to access alternative servers providing these groups; you can read more about this in <xref linkend="multiple-news-accounts"/> .</para>
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Working with the dialogue</title
-> 
-
-<para
->We now want to subscribe to the &kde; group: mark the the box beside the name; you can now see the group in the list labelled <guilabel
->subscribe to</guilabel
->. Another possibility is to use the arrows between the two windows.</para
-> 
-
-<para
->If you picked the wrong newsgroup by mistake you can undo your selection by unchecking the checkbox next to the group's name in the <guilabel
->Groups on</guilabel
-> window; again, you could use the arrow (you probably noticed the arrow changing direction.)</para
-> 
-
-<para
->If you want to unsubscribe from a newsgroup it is as easy as subscribing to it: you just uncheck the box next to its name. The groups you wish to unsubscribe from are shown in the <guilabel
->unsubscribe from</guilabel
-> list. Again, the arrow is another way of doing things: to correct your actions you can use the arrow again; this works as long as the dialogue is not closed by clicking <guibutton
->OK</guibutton
->.</para>
-
-<para
->As a &kde; and &knode; user you will probably want to subscribe to the group, so make sure you checked the box and press <guibutton
->OK</guibutton
->. This group now appears in the tree view under the server entry it was chosen from; in our example this is <emphasis
->My News Account</emphasis
->. If you can not see the group, click on the cross next to the server entry or on the server entry itself; the list of subscribed newsgroups should appear.</para>
-
-<para
->Click on the newsgroup; now you see on the right in the article view an empty folder: &knode; has to fetch the articles for the new newsgroup. If you have, in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode</guimenuitem
-><guimenuitem
->Reading news</guimenuitem
-><guimenuitem
->General</guimenuitem
-></menuchoice
->, the check box <guilabel
->Check for new article automatically</guilabel
-> checked &knode; tries to fetch the articles from the server when the newsgroup is first selected; if this is unchecked, you have to use <menuchoice
-><guimenu
->Account</guimenu
-><guimenuitem
->Get new articles</guimenuitem
-></menuchoice
->.</para>
-
-<important
-> 
-<para
->When you are using <application
->leafnode</application
-> as a server, there will be a single article in the group: <application
->leafnode</application
-> generates an article in every new subscribed group; this indicates that <application
->leafnode</application
-> will consider this group the next time it fetches articles. You can ignore an error message saying the article can not be found. If you select this article you tell <application
->leafnode</application
-> you are really interested in this group.</para
-> 
-
-<para
->You get the real articles when your local newsserver fetches them from the Internet and provides them to you; details about this can be found in the documentation of your local newsserver.</para
-> 
-</important
-> 
-
-<para
->When everything works the articles of the subscribed newsgroup appear in the upper right window &mdash; the article view.</para
-> 
-
-</sect3
-> 
+<para>If you simply want to make sure you have seen every new group, it is more effective to use <guibutton>New Groups</guibutton>; fetching the complete list is much more time consuming, but you do make sure that any deleted groups vanish from the grouplist.</para> 
+</tip> 
+
+<para>Unfortunately there is no guarantee that your newsserver is providing all available newsgroups: many newsserver refuse groups publishing binary attachments; other groups are only available from special servers. &knode; provides you the possibility to use more than one news-server if you want to access alternative servers providing these groups; you can read more about this in <xref linkend="multiple-news-accounts"/> .</para>
+
+</sect3> 
+
+<sect3> 
+<title>Working with the dialogue</title> 
+
+<para>We now want to subscribe to the &kde; group: mark the the box beside the name; you can now see the group in the list labelled <guilabel>subscribe to</guilabel>. Another possibility is to use the arrows between the two windows.</para> 
+
+<para>If you picked the wrong newsgroup by mistake you can undo your selection by unchecking the checkbox next to the group's name in the <guilabel>Groups on</guilabel> window; again, you could use the arrow (you probably noticed the arrow changing direction.)</para> 
+
+<para>If you want to unsubscribe from a newsgroup it is as easy as subscribing to it: you just uncheck the box next to its name. The groups you wish to unsubscribe from are shown in the <guilabel>unsubscribe from</guilabel> list. Again, the arrow is another way of doing things: to correct your actions you can use the arrow again; this works as long as the dialogue is not closed by clicking <guibutton>OK</guibutton>.</para>
+
+<para>As a &kde; and &knode; user you will probably want to subscribe to the group, so make sure you checked the box and press <guibutton>OK</guibutton>. This group now appears in the tree view under the server entry it was chosen from; in our example this is <emphasis>My News Account</emphasis>. If you can not see the group, click on the cross next to the server entry or on the server entry itself; the list of subscribed newsgroups should appear.</para>
+
+<para>Click on the newsgroup; now you see on the right in the article view an empty folder: &knode; has to fetch the articles for the new newsgroup. If you have, in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode</guimenuitem><guimenuitem>Reading news</guimenuitem><guimenuitem>General</guimenuitem></menuchoice>, the check box <guilabel>Check for new article automatically</guilabel> checked &knode; tries to fetch the articles from the server when the newsgroup is first selected; if this is unchecked, you have to use <menuchoice><guimenu>Account</guimenu><guimenuitem>Get new articles</guimenuitem></menuchoice>.</para>
+
+<important> 
+<para>When you are using <application>leafnode</application> as a server, there will be a single article in the group: <application>leafnode</application> generates an article in every new subscribed group; this indicates that <application>leafnode</application> will consider this group the next time it fetches articles. You can ignore an error message saying the article can not be found. If you select this article you tell <application>leafnode</application> you are really interested in this group.</para> 
+
+<para>You get the real articles when your local newsserver fetches them from the Internet and provides them to you; details about this can be found in the documentation of your local newsserver.</para> 
+</important> 
+
+<para>When everything works the articles of the subscribed newsgroup appear in the upper right window &mdash; the article view.</para> 
+
+</sect3> 
 </sect2>
 
-<sect2 id="fetch-and-read-news"
-> 
-<title
->Fetching and reading Articles</title
-> 
-
-<para
->&knode; always shows three views: the folder view, the article view and the article window; you can change height and width of these views with the mouse. If you click in a window it gets the focus; this is important if you want to use &knode; with the keyboard. The <keycap
->Tab</keycap
-> key changes the focus between the views; the currently-active view is indicated by a small colored bar over the column headers.</para
-> 
-
-<para
->This picture shows &knode; with the subscribed &kde; newsgroup.</para>
-
-<screenshot
-> 
-<screeninfo
->The three views of &knode;</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-views.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->The three views of &knode;</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->The three views of &knode;</para
-> 
+<sect2 id="fetch-and-read-news"> 
+<title>Fetching and reading Articles</title> 
+
+<para>&knode; always shows three views: the folder view, the article view and the article window; you can change height and width of these views with the mouse. If you click in a window it gets the focus; this is important if you want to use &knode; with the keyboard. The <keycap>Tab</keycap> key changes the focus between the views; the currently-active view is indicated by a small colored bar over the column headers.</para> 
+
+<para>This picture shows &knode; with the subscribed &kde; newsgroup.</para>
+
+<screenshot> 
+<screeninfo>The three views of &knode;</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-views.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>The three views of &knode;</phrase> 
+</textobject> 
+<caption> 
+<para>The three views of &knode;</para> 
 </caption>
-</mediaobject
-> 
-</screenshot
-> 
+</mediaobject> 
+</screenshot> 
 
-<para
->It is possible to select more than one group or article. You can select an area by clicking on the first entry with the &LMB;, holding the &Shift; key and clicking on the last entry with the &LMB; again.</para
-> 
+<para>It is possible to select more than one group or article. You can select an area by clicking on the first entry with the &LMB;, holding the &Shift; key and clicking on the last entry with the &LMB; again.</para> 
 
-<para
->If you want to select more than one single entry, but they are not next to each other in the list, you have to select the first by clicking on it with the &LMB; and then select the other entries by holding down the &Ctrl; key and clicking on them with the &LMB;.</para>
+<para>If you want to select more than one single entry, but they are not next to each other in the list, you have to select the first by clicking on it with the &LMB; and then select the other entries by holding down the &Ctrl; key and clicking on them with the &LMB;.</para>
 
-<para
->In either case you can clear your selection by clicking on another entry with the &LMB;.</para>
+<para>In either case you can clear your selection by clicking on another entry with the &LMB;.</para>
 
 <caution>
-<para
->If you have selected more than one entry you have to activate the context menu with the &Shift; key pressed, otherwise you'll clear the selection.</para
-> 
-</caution
-> 
-
-<sect3
-> 
-<title
->The Folder View</title
-> 
-
-<para
->The folder views contains not only the accounts you configured &mdash; in our example this is <emphasis
->My News Account</emphasis
-> &mdash; but also three other folders. When you are subscribed to some newsgroups there will be plus next to the name of the account: clicking on the plus or the name of the account opens the tree to show the names of the newsgroups you have chosen to subscribe to using that account.</para>
-
-<tip
-> 
-<para
->Using the &RMB; you can get a context menu for the selected item (folders or newsgroups): if you select a newsgroup and choose Properties you can, amongst other things, specify your identity for this particular group; you can find more about this in the <link linkend="group-identity"
->Local Identities</link
-> chapter.</para>
+<para>If you have selected more than one entry you have to activate the context menu with the &Shift; key pressed, otherwise you'll clear the selection.</para> 
+</caution> 
+
+<sect3> 
+<title>The Folder View</title> 
+
+<para>The folder views contains not only the accounts you configured &mdash; in our example this is <emphasis>My News Account</emphasis> &mdash; but also three other folders. When you are subscribed to some newsgroups there will be plus next to the name of the account: clicking on the plus or the name of the account opens the tree to show the names of the newsgroups you have chosen to subscribe to using that account.</para>
+
+<tip> 
+<para>Using the &RMB; you can get a context menu for the selected item (folders or newsgroups): if you select a newsgroup and choose Properties you can, amongst other things, specify your identity for this particular group; you can find more about this in the <link linkend="group-identity">Local Identities</link> chapter.</para>
 </tip>
 
-<para
->When you select a newsgroup with your mouse a list of articles of this group appears in the upper-right window; if there are no articles in the upper-right window there are two possibilities &mdash; either there are no articles for this newsgroup on the newsserver or the newsserver did not fetch them yet. Select <menuchoice
-><guimenu
->Account</guimenu
-><guimenuitem
->Get new articles in all groups</guimenuitem
-></menuchoice
->: if there are still no articles appearing you either have some problems with your settings or there really are no articles for this group. Try another group: if there are no articles for this group you will probably have to work through the first chapters, about the configuration of &knode;, again; the <link linkend="faq"
->Frequently Asked Questions</link
-> chapter may help you, too.</para>
-
-<caution
-> 
-<para
->If you are using a local newsserver the articles only appear if the newsserver has already got them from the internet; if you are using <application
->leafnode</application
-> this is done by the <command
->fetchnews</command
-> program.</para>
-</caution
-> 
-
-<sect4
-> 
-<title
->The Newsgroup Folders</title
-> 
-
-<para
->The newsgroup folders appear with the name they are given by the hierarchy on the newsserver; in our example this is <guilabel
->comp.windows.x.kde</guilabel
->. You can change the name shown in this view: in the context menu (click with the &RMB; on the newsgroup's name) choose <menuchoice
-><guimenuitem
->Rename group</guimenuitem
-></menuchoice
->, then you can change the name in the input field. A good name for <guilabel
->comp.windows.x.kde</guilabel
-> would be, for example, <guilabel
->The KDE Newsgroup</guilabel
->.</para>
-
-<para
->If you don't change this, the hierarchical name will still be shown.</para>
-
-<para
->Besides the name of newsgroups the folder view shows more information by altering its appearance: if a newsgroup contains new articles its name is shown bold; the columns <guilabel
->Total</guilabel
-> and <guilabel
->Unread</guilabel
-> also tell you how many articles are in the corresponding group or folder and how many are marked as unread.</para
-> 
-
-</sect4
-> 
-
-<sect4
-> 
-<title
->The <guilabel
->Outbox</guilabel
-> folder</title
-> 
-
-<para
->The <guilabel
->Outbox</guilabel
-> folder contains all articles which are to be sent later, or which could not be sent because of an error. If you want to sent an article later choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Later</guimenuitem
-></menuchoice
-> in the editor: the article is then filed in the <guilabel
->Outbox</guilabel
-> folder; it is possible to edit, delete or send these articles later.</para
-> 
-
-<tip
-> 
-<para
->If an article was not sent because of an error, it is stored in this folder; you will not lose these articles.</para
-> 
-</tip
-> 
-</sect4
-> 
-
-<sect4
-> 
-<title
->The <guilabel
->Drafts</guilabel
-> folder</title
-> 
-
-<para
->This folder is used for storing drafts of your articles; for example, if you want to do some further work on them but you have no time for it right now. To store an article in this folder choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Save as Draft</guimenuitem
-></menuchoice
-> in the editor.</para
-> 
-
-<para
->You can edit, delete and send the articles in this folder.</para
-> 
-
-</sect4
-> 
-
-<sect4
-> 
-<title
->The <guilabel
->Sent</guilabel
-> Folder</title
-> 
-
-<para
->This folder contains copies of the articles that you have successfully sent, including your e-mail replies; you can delete the messages in this folder, but it will not un-send the messages already sent.</para
-> 
-
-<caution
-> 
-<para
->If your are using a local newsserver an article appearing in the folder <guilabel
->Sent</guilabel
-> only indicates the local newsserver received the article; it is possible this article will never appears in any newsgroup if the local newsserver was not able to send it for some reason. If you notice some articles not appearing in the according newsgroup first make sure it was sent by the local newsserver.</para
-> 
-</caution
-> 
-
-<tip
-> 
-<para
->If you are using <application
->leafnode</application
-> then articles leafnode was unable to send are normally found in <filename
->/var/spool/failed.postings</filename
->.</para
-> 
-</tip
-> 
-</sect4
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->The Article View</title
-> 
-
-<para
->The article view gives you a list of all articles in the selected newsgroup or folder; you can change the appearance of this view using the <guimenu
->View</guimenu
-> menu. The uppermost row of the view contains the column headers.</para
-> 
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
-><guilabel
->Subject</guilabel
-></term
-> 
-<listitem
-> 
-<para
->The <guilabel
->Subject</guilabel
-> column shows the subjects of an articles which, most of the time, give you a clue about the content of this article. The subject is chosen by the article author. You can find more about this in <link linkend="post-and-mail-news"
->How to post and reply to news</link
->.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><guilabel
->From</guilabel
-></term
-> 
-<listitem
-> 
-<para
->The <guilabel
->From</guilabel
-> column shows the author, or their e-mail address if the author didn't give a name. You can configure your settings in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode</guimenuitem
-><guilabel
->Identity</guilabel
-></menuchoice
->; when you publish an article &knode; will show these settings in the <guilabel
->From</guilabel
-> column.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><guilabel
->Score</guilabel
-></term>
-<listitem
-> 
-<para
->The <guilabel
->Score</guilabel
-> column shows the scoring of an article as a number; the default is 0. Articles which are important to you can be scored up; articles you want to ignore can be scored down: the range is -100000 to +100000. You can read more about this in the <link linkend="score-watch-ignore"
->Scoring, Watching and Ignoring</link
-> chapter.</para
-> 
-<para
->The <guilabel
->Score</guilabel
-> column is only shown if <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->General</guilabel
-><guilabel
->Show article score</guilabel
-></menuchoice
-> is activated.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><guilabel
->Date</guilabel
-></term
-> 
-<listitem
-> 
-<para
->The <guilabel
->Date</guilabel
-> column shows the date and time when the article was written.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
-><guilabel
->Lines</guilabel
-></term
-> 
-<listitem
-> 
-<para
->The <guilabel
->Lines</guilabel
-> column shows the number of lines of the <glossterm
->article</glossterm
->; this column is only shown if <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->General</guilabel
-><guilabel
->Show line count</guilabel
-></menuchoice
-> is activated.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
-
-<sect4
-> 
-<title
->The Symbols and Highlighting Used</title>
-
-<para
->This is a short explanation of the different symbols for labelling articles.</para
-> 
-
-<itemizedlist
-> 
-<listitem
-> 
-<para
-><inlinemediaobject
-> 
-<imageobject
-> 
+<para>When you select a newsgroup with your mouse a list of articles of this group appears in the upper-right window; if there are no articles in the upper-right window there are two possibilities &mdash; either there are no articles for this newsgroup on the newsserver or the newsserver did not fetch them yet. Select <menuchoice><guimenu>Account</guimenu><guimenuitem>Get new articles in all groups</guimenuitem></menuchoice>: if there are still no articles appearing you either have some problems with your settings or there really are no articles for this group. Try another group: if there are no articles for this group you will probably have to work through the first chapters, about the configuration of &knode;, again; the <link linkend="faq">Frequently Asked Questions</link> chapter may help you, too.</para>
+
+<caution> 
+<para>If you are using a local newsserver the articles only appear if the newsserver has already got them from the internet; if you are using <application>leafnode</application> this is done by the <command>fetchnews</command> program.</para>
+</caution> 
+
+<sect4> 
+<title>The Newsgroup Folders</title> 
+
+<para>The newsgroup folders appear with the name they are given by the hierarchy on the newsserver; in our example this is <guilabel>comp.windows.x.kde</guilabel>. You can change the name shown in this view: in the context menu (click with the &RMB; on the newsgroup's name) choose <menuchoice><guimenuitem>Rename group</guimenuitem></menuchoice>, then you can change the name in the input field. A good name for <guilabel>comp.windows.x.kde</guilabel> would be, for example, <guilabel>The KDE Newsgroup</guilabel>.</para>
+
+<para>If you don't change this, the hierarchical name will still be shown.</para>
+
+<para>Besides the name of newsgroups the folder view shows more information by altering its appearance: if a newsgroup contains new articles its name is shown bold; the columns <guilabel>Total</guilabel> and <guilabel>Unread</guilabel> also tell you how many articles are in the corresponding group or folder and how many are marked as unread.</para> 
+
+</sect4> 
+
+<sect4> 
+<title>The <guilabel>Outbox</guilabel> folder</title> 
+
+<para>The <guilabel>Outbox</guilabel> folder contains all articles which are to be sent later, or which could not be sent because of an error. If you want to sent an article later choose <menuchoice><guimenu>File</guimenu><guimenuitem>Send Later</guimenuitem></menuchoice> in the editor: the article is then filed in the <guilabel>Outbox</guilabel> folder; it is possible to edit, delete or send these articles later.</para> 
+
+<tip> 
+<para>If an article was not sent because of an error, it is stored in this folder; you will not lose these articles.</para> 
+</tip> 
+</sect4> 
+
+<sect4> 
+<title>The <guilabel>Drafts</guilabel> folder</title> 
+
+<para>This folder is used for storing drafts of your articles; for example, if you want to do some further work on them but you have no time for it right now. To store an article in this folder choose <menuchoice><guimenu>File</guimenu><guimenuitem>Save as Draft</guimenuitem></menuchoice> in the editor.</para> 
+
+<para>You can edit, delete and send the articles in this folder.</para> 
+
+</sect4> 
+
+<sect4> 
+<title>The <guilabel>Sent</guilabel> Folder</title> 
+
+<para>This folder contains copies of the articles that you have successfully sent, including your e-mail replies; you can delete the messages in this folder, but it will not un-send the messages already sent.</para> 
+
+<caution> 
+<para>If your are using a local newsserver an article appearing in the folder <guilabel>Sent</guilabel> only indicates the local newsserver received the article; it is possible this article will never appears in any newsgroup if the local newsserver was not able to send it for some reason. If you notice some articles not appearing in the according newsgroup first make sure it was sent by the local newsserver.</para> 
+</caution> 
+
+<tip> 
+<para>If you are using <application>leafnode</application> then articles leafnode was unable to send are normally found in <filename>/var/spool/failed.postings</filename>.</para> 
+</tip> 
+</sect4> 
+</sect3> 
+
+<sect3> 
+<title>The Article View</title> 
+
+<para>The article view gives you a list of all articles in the selected newsgroup or folder; you can change the appearance of this view using the <guimenu>View</guimenu> menu. The uppermost row of the view contains the column headers.</para> 
+
+<variablelist> 
+<varlistentry> 
+<term><guilabel>Subject</guilabel></term> 
+<listitem> 
+<para>The <guilabel>Subject</guilabel> column shows the subjects of an articles which, most of the time, give you a clue about the content of this article. The subject is chosen by the article author. You can find more about this in <link linkend="post-and-mail-news">How to post and reply to news</link>.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><guilabel>From</guilabel></term> 
+<listitem> 
+<para>The <guilabel>From</guilabel> column shows the author, or their e-mail address if the author didn't give a name. You can configure your settings in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode</guimenuitem><guilabel>Identity</guilabel></menuchoice>; when you publish an article &knode; will show these settings in the <guilabel>From</guilabel> column.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><guilabel>Score</guilabel></term>
+<listitem> 
+<para>The <guilabel>Score</guilabel> column shows the scoring of an article as a number; the default is 0. Articles which are important to you can be scored up; articles you want to ignore can be scored down: the range is -100000 to +100000. You can read more about this in the <link linkend="score-watch-ignore">Scoring, Watching and Ignoring</link> chapter.</para> 
+<para>The <guilabel>Score</guilabel> column is only shown if <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>General</guilabel><guilabel>Show article score</guilabel></menuchoice> is activated.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><guilabel>Date</guilabel></term> 
+<listitem> 
+<para>The <guilabel>Date</guilabel> column shows the date and time when the article was written.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term><guilabel>Lines</guilabel></term> 
+<listitem> 
+<para>The <guilabel>Lines</guilabel> column shows the number of lines of the <glossterm>article</glossterm>; this column is only shown if <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>General</guilabel><guilabel>Show line count</guilabel></menuchoice> is activated.</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
+
+<sect4> 
+<title>The Symbols and Highlighting Used</title>
+
+<para>This is a short explanation of the different symbols for labelling articles.</para> 
+
+<itemizedlist> 
+<listitem> 
+<para><inlinemediaobject> 
+<imageobject> 
 <imagedata fileref="greyball.png" format="PNG"/> </imageobject>
-</inlinemediaobject
-> Already-read articles are labelled with this symbol.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
+</inlinemediaobject> Already-read articles are labelled with this symbol.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
 <imagedata fileref="greyballchk.png" format="PNG"/> </imageobject>
-</inlinemediaobject
-> Articles labelled with this symbol are read and the body was fetched from the server.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="redball.png" format="PNG"/> </imageobject
-> </inlinemediaobject
-> Articles labelled with this symbol are unread and the body has not yet been fetched.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="redballchk.png" format="PNG"/> </imageobject
-> </inlinemediaobject
-> Articles labeled with this symbol are unread but the body has already been already fetched.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="newsubs.png" format="PNG"/> </imageobject
-> </inlinemediaobject
-> Articles labelled with this symbol are part of a thread with new and/or unread articles in it.</para
-> 
-</listitem
-> 
-<listitem
-> 
-<para
-> 
-<inlinemediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="eyes.png" format="PNG"/> </imageobject
-> </inlinemediaobject
-> Articles labelled with this symbol are parts of a guarded thread. This corresponds to a score of 100.</para
-> 
-</listitem
-> 
-</itemizedlist
-> 
-
-<para
->Besides different symbols, &knode; is using the following highlighting:</para>
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
->Bold article subjects.</term
-> 
-<listitem
-> 
-<para
->The article is new in this group; it was fetched during the last connection with the server.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Article subjects printed in grey.</term
-> 
-<listitem
-> 
-<para
->There are no unread follow-up articles.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
-</sect4
-> 
-
-<sect4
-> 
-<title
->Navigation in the Article View.</title
-> 
-
-<para
->You can navigate in articles, display an article and open or close threads with your mouse or keyboard.</para
-> 
-
-<para
->When you select an article with your mouse its entry in the the article view gets colored; at the same time the header and body of this article appear in in the article window. If you want to read another article you can use the mouse to select it, or you can use the cursor keys. If you use the cursor keys you can move the dashed frame to the article you want to read and then press <keycap
->Enter</keycap
-> to mark and display the article.</para>
-
-<para
->There are many key commands to provide comfortable navigation within a news group and to switching between newsgroups. Here the most common key commands of the standard key configuration are listed; you can configure the key bindings in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure Shortcuts</guimenuitem
-></menuchoice
->.</para
-> 
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
->Toggle Subthreads <keycap
->T</keycap
-> </term
-> 
-<listitem
-> 
-<para
->The replies to an article are either shown or hidden by multiply pressing this key; another way to open threads is to use the <keycap
->Right Arrow</keycap
-> key.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Filter <keycap
->F6</keycap
-></term
-> 
-<listitem
-> 
-<para
->A dialogue is shown where you can choose the filter for the articles.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Sort <keycap
->F7</keycap
-> </term
-> 
-<listitem
-> 
-<para
->A dialogue is shown where you can change the sorting of the articles; if you choose a column for a second time it will change the sorting direction.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
+</inlinemediaobject> Articles labelled with this symbol are read and the body was fetched from the server.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
+<imagedata fileref="redball.png" format="PNG"/> </imageobject> </inlinemediaobject> Articles labelled with this symbol are unread and the body has not yet been fetched.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
+<imagedata fileref="redballchk.png" format="PNG"/> </imageobject> </inlinemediaobject> Articles labeled with this symbol are unread but the body has already been already fetched.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
+<imagedata fileref="newsubs.png" format="PNG"/> </imageobject> </inlinemediaobject> Articles labelled with this symbol are part of a thread with new and/or unread articles in it.</para> 
+</listitem> 
+<listitem> 
+<para> 
+<inlinemediaobject> 
+<imageobject> 
+<imagedata fileref="eyes.png" format="PNG"/> </imageobject> </inlinemediaobject> Articles labelled with this symbol are parts of a guarded thread. This corresponds to a score of 100.</para> 
+</listitem> 
+</itemizedlist> 
+
+<para>Besides different symbols, &knode; is using the following highlighting:</para>
+
+<variablelist> 
+<varlistentry> 
+<term>Bold article subjects.</term> 
+<listitem> 
+<para>The article is new in this group; it was fetched during the last connection with the server.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Article subjects printed in grey.</term> 
+<listitem> 
+<para>There are no unread follow-up articles.</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
+</sect4> 
+
+<sect4> 
+<title>Navigation in the Article View.</title> 
+
+<para>You can navigate in articles, display an article and open or close threads with your mouse or keyboard.</para> 
+
+<para>When you select an article with your mouse its entry in the the article view gets colored; at the same time the header and body of this article appear in in the article window. If you want to read another article you can use the mouse to select it, or you can use the cursor keys. If you use the cursor keys you can move the dashed frame to the article you want to read and then press <keycap>Enter</keycap> to mark and display the article.</para>
+
+<para>There are many key commands to provide comfortable navigation within a news group and to switching between newsgroups. Here the most common key commands of the standard key configuration are listed; you can configure the key bindings in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts</guimenuitem></menuchoice>.</para> 
+
+<variablelist> 
+<varlistentry> 
+<term>Toggle Subthreads <keycap>T</keycap> </term> 
+<listitem> 
+<para>The replies to an article are either shown or hidden by multiply pressing this key; another way to open threads is to use the <keycap>Right Arrow</keycap> key.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Filter <keycap>F6</keycap></term> 
+<listitem> 
+<para>A dialogue is shown where you can choose the filter for the articles.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Sort <keycap>F7</keycap> </term> 
+<listitem> 
+<para>A dialogue is shown where you can change the sorting of the articles; if you choose a column for a second time it will change the sorting direction.</para> 
+</listitem> 
+</varlistentry> 
 <varlistentry>
-<term
->Browsing articles <keycap
->Space</keycap
-></term>
+<term>Browsing articles <keycap>Space</keycap></term>
 <listitem>
-<para
->This key gives you a convenient possibility for browsing through the article view: by pressing this key the article in the article window is scrolled; when you reach the end of the article by repeatedly pressing <keycap
->Space</keycap
->, it takes you to the next article; when you have read all articles in one newsgroup, <keycap
->Space</keycap
-> takes you to the first article of the next newsgroup. By repeatedly pressing <keycap
->Space</keycap
-> you can browse through all subscribed newsgroups like this.</para>
+<para>This key gives you a convenient possibility for browsing through the article view: by pressing this key the article in the article window is scrolled; when you reach the end of the article by repeatedly pressing <keycap>Space</keycap>, it takes you to the next article; when you have read all articles in one newsgroup, <keycap>Space</keycap> takes you to the first article of the next newsgroup. By repeatedly pressing <keycap>Space</keycap> you can browse through all subscribed newsgroups like this.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
-<term
->Next unread article <keycombo action="simul"
->&Alt;<keycap
->Space</keycap
-></keycombo
-> </term
-> 
-<listitem
-> 
-<para
->This key binding jumps to the next unread article. The sequence follows the order of articles in the article view; threads are opened if necessary.</para>
-</listitem
-> 
-</varlistentry
-> 
+<term>Next unread article <keycombo action="simul">&Alt;<keycap>Space</keycap></keycombo> </term> 
+<listitem> 
+<para>This key binding jumps to the next unread article. The sequence follows the order of articles in the article view; threads are opened if necessary.</para>
+</listitem> 
+</varlistentry> 
 <varlistentry>
-<term
->Next unread thread <keycombo action="simul"
->&Ctrl;<keycap
->Space</keycap
-></keycombo
-> </term
-> 
-<listitem
-> 
-<para
->This command jumps to the next thread containing unread articles: the first unread article is then selected and shown. The sequence follows the order of articles in the article view.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Next article <keycap
->N</keycap
-> </term
-> 
-<listitem
-> 
-<para
->This command jumps to the next article; the sequence follows the order of articles in the article view. Replies in closed threads are ignored.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Previous article <keycap
->B</keycap
-></term
-> 
-<listitem
-> 
-<para
->This command jumps to the previous article in the group; the sequence follows the order of articles in the article view. Replies in closed threads are ignored.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Next group <keycap
-> +</keycap
-> </term
-> 
-<listitem
-> 
-<para
->This command jumps to the next newsgroup; the sequence follows the order of newsgroups in the folder view.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Previous group <keycap
->-</keycap
-> </term
-> 
-<listitem
-> 
-<para
->This command jumps to the previous newsgroup; the sequence follows the order of newsgroups in the folder view.</para
-> 
-</listitem
-> 
-</varlistentry
-> 
-</variablelist
-> 
-</sect4
-> 
-
-<sect4
-> 
-<title
->Sorting and Filtering of Articles</title
-> 
-
-<para
->Some newsgroups are very crowded and contain lots of articles; perhaps only some of them are interesting to you. One possibility to keep track of the news you are interested in is to sort your articles with a certain criterion.</para>
-
-<para
->Sorting your articles, and choosing sorting criteria, is done with the column titles in the article view: clicking on a column title makes it the current sorting criterion; another click on the same column title changes the order of sorting.</para>
-
-<tip
-> 
-<para
->The current sorting criterion is indicated with an arrow next to the title; this gives you an easy sign which column is used for sorting, too. You have to make the column wide enough, though, so you can actually see the arrow; you can change the column width by moving the mouse pointer on the small area between two column titles: the pointer changes its appearance to two horizontal arrows; clicking and holding the &LMB; mouse button now allows you to change the width of the column to the left of the mouse pointer.</para>
+<term>Next unread thread <keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo> </term> 
+<listitem> 
+<para>This command jumps to the next thread containing unread articles: the first unread article is then selected and shown. The sequence follows the order of articles in the article view.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Next article <keycap>N</keycap> </term> 
+<listitem> 
+<para>This command jumps to the next article; the sequence follows the order of articles in the article view. Replies in closed threads are ignored.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Previous article <keycap>B</keycap></term> 
+<listitem> 
+<para>This command jumps to the previous article in the group; the sequence follows the order of articles in the article view. Replies in closed threads are ignored.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Next group <keycap> +</keycap> </term> 
+<listitem> 
+<para>This command jumps to the next newsgroup; the sequence follows the order of newsgroups in the folder view.</para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Previous group <keycap>-</keycap> </term> 
+<listitem> 
+<para>This command jumps to the previous newsgroup; the sequence follows the order of newsgroups in the folder view.</para> 
+</listitem> 
+</varlistentry> 
+</variablelist> 
+</sect4> 
+
+<sect4> 
+<title>Sorting and Filtering of Articles</title> 
+
+<para>Some newsgroups are very crowded and contain lots of articles; perhaps only some of them are interesting to you. One possibility to keep track of the news you are interested in is to sort your articles with a certain criterion.</para>
+
+<para>Sorting your articles, and choosing sorting criteria, is done with the column titles in the article view: clicking on a column title makes it the current sorting criterion; another click on the same column title changes the order of sorting.</para>
+
+<tip> 
+<para>The current sorting criterion is indicated with an arrow next to the title; this gives you an easy sign which column is used for sorting, too. You have to make the column wide enough, though, so you can actually see the arrow; you can change the column width by moving the mouse pointer on the small area between two column titles: the pointer changes its appearance to two horizontal arrows; clicking and holding the &LMB; mouse button now allows you to change the width of the column to the left of the mouse pointer.</para>
 </tip>
 
-<para
->&knode; gives you the possibility to reduce the flood of articles: you can show only articles fitting specific criteria; &knode; uses filters for this task. In the following paragraphs we are just dealing with the predefined filters; for defining and using your own filters please refer to the <link linkend="using-filters"
->Defining and using Filters</link
-> chapter.</para>
-
-<para
->Normally you will read most articles only once, and then never again. &knode; labels the articles which are unread, but when there are more articles in a news group than can be shown by the article view you often have to search for unread articles: it would be much easier to see only the new fetched and unread articles; &knode; gives you this feature by the predefined filters.</para
-> 
-
-<para
->In the status line at the bottom border of your main window next to the word <guilabel
->Filter</guilabel
-> the actually-active filter is shown: if you do not change the filter configuration this is the filter <guilabel
->all</guilabel
->; this means all articles of a newsgroup are shown. <guilabel
->all</guilabel
-> is one of the predefined filters; there are eight of them in all, which are described in more detail here.</para
-> 
-
-<variablelist
-> 
-<varlistentry
-> 
-<term
-> 
-<guilabel
->All</guilabel
-> 
-</term
-> 
-<listitem
-> 
-<para
->This filter is the default setting; it shows all articles in a newsgroup. You can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->All</guimenuitem
-></menuchoice
-></para>
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Unread</term
-> 
-<listitem
-> 
-<para
->This filter shows only unread articles; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Unread</guimenuitem
-></menuchoice
-></para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->New</term
-> 
-<listitem
-> 
-<para
->This filter shows only articles fetched during the last connection; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->New</guimenuitem
-></menuchoice
-></para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Watched</term
-> 
-<listitem
-> 
-<para
->This shows only threads chosen as watched threads by you; you may be watching a thread because, for example, you are participating in it, or because you are particularly interested in the answers. You can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Watched</guimenuitem
-></menuchoice
-></para
-> 
-
-<para
->This filter only shows something if have you selected one or more threads to watch; you can achieve this by selecting <menuchoice
-><guimenu
->Article</guimenu
-><guisubmenu
->Thread</guisubmenu
-><guimenuitem
->Watch</guimenuitem
-></menuchoice
->: next to the subject a symbol will appear, showing a pair of eyes.</para>
-
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Threads With Unread</term
-> 
-<listitem
-> 
-<para
->This filter shows only threads containing unread articles; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-> <guimenuitem
->Threads With Unread</guimenuitem
-></menuchoice
-></para>
-
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Threads With New</term
-> 
-<listitem
-> 
-<para
->This filter shows only threads with newly-fetched articles; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Threads With New</guimenuitem
-></menuchoice
-></para
-> 
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Own articles</term
-> 
-<listitem
-> 
-<para
->This filter only articles you have published; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-><guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Own Articles</guimenuitem
-></menuchoice
-></para
-> 
-
-</listitem
-> 
-</varlistentry
-> 
-<varlistentry
-> 
-<term
->Threads With Own Articles</term
-> 
-<listitem
-> 
-<para
->This filter only shows threads containing articles you have published; you can choose this filter by selecting <menuchoice
-><guimenu
->View</guimenu
-> <guisubmenu
->Filter</guisubmenu
-><guimenuitem
->Own Articles</guimenuitem
-></menuchoice
-></para>
+<para>&knode; gives you the possibility to reduce the flood of articles: you can show only articles fitting specific criteria; &knode; uses filters for this task. In the following paragraphs we are just dealing with the predefined filters; for defining and using your own filters please refer to the <link linkend="using-filters">Defining and using Filters</link> chapter.</para>
+
+<para>Normally you will read most articles only once, and then never again. &knode; labels the articles which are unread, but when there are more articles in a news group than can be shown by the article view you often have to search for unread articles: it would be much easier to see only the new fetched and unread articles; &knode; gives you this feature by the predefined filters.</para> 
+
+<para>In the status line at the bottom border of your main window next to the word <guilabel>Filter</guilabel> the actually-active filter is shown: if you do not change the filter configuration this is the filter <guilabel>all</guilabel>; this means all articles of a newsgroup are shown. <guilabel>all</guilabel> is one of the predefined filters; there are eight of them in all, which are described in more detail here.</para> 
+
+<variablelist> 
+<varlistentry> 
+<term> 
+<guilabel>All</guilabel> 
+</term> 
+<listitem> 
+<para>This filter is the default setting; it shows all articles in a newsgroup. You can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>All</guimenuitem></menuchoice></para>
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Unread</term> 
+<listitem> 
+<para>This filter shows only unread articles; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>Unread</guimenuitem></menuchoice></para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>New</term> 
+<listitem> 
+<para>This filter shows only articles fetched during the last connection; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>New</guimenuitem></menuchoice></para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Watched</term> 
+<listitem> 
+<para>This shows only threads chosen as watched threads by you; you may be watching a thread because, for example, you are participating in it, or because you are particularly interested in the answers. You can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>Watched</guimenuitem></menuchoice></para> 
+
+<para>This filter only shows something if have you selected one or more threads to watch; you can achieve this by selecting <menuchoice><guimenu>Article</guimenu><guisubmenu>Thread</guisubmenu><guimenuitem>Watch</guimenuitem></menuchoice>: next to the subject a symbol will appear, showing a pair of eyes.</para>
+
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Threads With Unread</term> 
+<listitem> 
+<para>This filter shows only threads containing unread articles; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu> <guimenuitem>Threads With Unread</guimenuitem></menuchoice></para>
+
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Threads With New</term> 
+<listitem> 
+<para>This filter shows only threads with newly-fetched articles; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>Threads With New</guimenuitem></menuchoice></para> 
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Own articles</term> 
+<listitem> 
+<para>This filter only articles you have published; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu><guisubmenu>Filter</guisubmenu><guimenuitem>Own Articles</guimenuitem></menuchoice></para> 
+
+</listitem> 
+</varlistentry> 
+<varlistentry> 
+<term>Threads With Own Articles</term> 
+<listitem> 
+<para>This filter only shows threads containing articles you have published; you can choose this filter by selecting <menuchoice><guimenu>View</guimenu> <guisubmenu>Filter</guisubmenu><guimenuitem>Own Articles</guimenuitem></menuchoice></para>
 </listitem>
  
-</varlistentry
-> 
-</variablelist
-> 
-
-<tip
-> 
-<para
->For everyday use the <guilabel
->unread</guilabel
-> filter is propably the most useful: it shows all unread articles, including the old ones. The other filters are very task-specific and are seldom used; in the end it is a matter of taste which filter to select.</para
-> 
-</tip
-> 
-</sect4
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->The Article Window</title
-> 
-
-<para
->The article window shows the currently-selected article. You can scroll in it like in a normal text editor window; the difference is that you cannot change the article &mdash; it is for reading only.</para
-> 
-
-<para
->By pressing the &RMB; in the article viewer you can access the important functions in the context menu very quickly.</para
-> 
-
-<para
->The window itself is divided in three areas; they are explained in more detail now.</para
-> 
-
-<sect4
-> 
-<title
->The Header</title
-> 
-
-<para
->This part shows the header lines or a part of the header. You will recognize some information here from the article view; for example, the subject and the address or name where the article originated. When you click on the <guilabel
->From:</guilabel
-> address, &knode; opens an editor window where the email address of the author and the subject of the referring article are already filled in for you; this enables you to reply to the author directly from their article.</para
-> 
-
-<para
->The appearance and content of the header shown by default can be configured by choosing <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configuring KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Headers</guilabel
-></menuchoice
->; you can find a more-detailed view on this in <link linkend="anc-knode-headers"
->Configuring the Shown Headers</link
->.</para
-> 
-
-<para
->By selecting <menuchoice
-><guimenu
->View</guimenu
-><guimenuitem
->Show all headers</guimenuitem
-></menuchoice
-> you force &knode; to show the whole header as is produced by the newsreader and newsservers; normally you do not need this view: it needs a lot of space in the article window.</para>
-
-<para
->The last lines of the header contain, if necessary, some references to other articles, shown as numbers in the range from 1 to n. These References are the articles to which the current article refers: the article labeled with 1 is the oldest article to which this article refers; the article with the highest number is the most-recent article to which the current article refers.</para>
-
-<para
->When you click on a reference the corresponding article is loaded and shown in the article view; if the article is no longer available you will be informed by &knode;. This will happen if the article has been deleted by the article management of &knode; due to its age, or your news server decided to delete it from the newsgroup; for details on how to get such an article, please refer to the <link linkend="faq"
->Frequently Asked Questions</link
->.</para
-> 
-
-<tip
-> 
-<para
->The first lines in an article, with the subject and author information and so on, are called <glossterm
->headers</glossterm
->.</para
-> 
-</tip
-> 
-</sect4
-> 
-
-<sect4
-> 
-<title
->The Body of the Article</title
-> 
-
-<para
->The body of the article follows straight after the header; it is the actual message the author published in the newsgroup. Be aware that some articles may contain quotes from other articles which are not recognisable as quotes; this depends on the news editor the author used and their article-formatting habits.</para
-> 
-
-<para
->&knode; provides some formatting which can be used by articles; at the moment the available options are:</para>
+</varlistentry> 
+</variablelist> 
+
+<tip> 
+<para>For everyday use the <guilabel>unread</guilabel> filter is propably the most useful: it shows all unread articles, including the old ones. The other filters are very task-specific and are seldom used; in the end it is a matter of taste which filter to select.</para> 
+</tip> 
+</sect4> 
+</sect3> 
+
+<sect3> 
+<title>The Article Window</title> 
+
+<para>The article window shows the currently-selected article. You can scroll in it like in a normal text editor window; the difference is that you cannot change the article &mdash; it is for reading only.</para> 
+
+<para>By pressing the &RMB; in the article viewer you can access the important functions in the context menu very quickly.</para> 
+
+<para>The window itself is divided in three areas; they are explained in more detail now.</para> 
+
+<sect4> 
+<title>The Header</title> 
+
+<para>This part shows the header lines or a part of the header. You will recognize some information here from the article view; for example, the subject and the address or name where the article originated. When you click on the <guilabel>From:</guilabel> address, &knode; opens an editor window where the email address of the author and the subject of the referring article are already filled in for you; this enables you to reply to the author directly from their article.</para> 
+
+<para>The appearance and content of the header shown by default can be configured by choosing <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configuring KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Headers</guilabel></menuchoice>; you can find a more-detailed view on this in <link linkend="anc-knode-headers">Configuring the Shown Headers</link>.</para> 
+
+<para>By selecting <menuchoice><guimenu>View</guimenu><guimenuitem>Show all headers</guimenuitem></menuchoice> you force &knode; to show the whole header as is produced by the newsreader and newsservers; normally you do not need this view: it needs a lot of space in the article window.</para>
+
+<para>The last lines of the header contain, if necessary, some references to other articles, shown as numbers in the range from 1 to n. These References are the articles to which the current article refers: the article labeled with 1 is the oldest article to which this article refers; the article with the highest number is the most-recent article to which the current article refers.</para>
+
+<para>When you click on a reference the corresponding article is loaded and shown in the article view; if the article is no longer available you will be informed by &knode;. This will happen if the article has been deleted by the article management of &knode; due to its age, or your news server decided to delete it from the newsgroup; for details on how to get such an article, please refer to the <link linkend="faq">Frequently Asked Questions</link>.</para> 
+
+<tip> 
+<para>The first lines in an article, with the subject and author information and so on, are called <glossterm>headers</glossterm>.</para> 
+</tip> 
+</sect4> 
+
+<sect4> 
+<title>The Body of the Article</title> 
+
+<para>The body of the article follows straight after the header; it is the actual message the author published in the newsgroup. Be aware that some articles may contain quotes from other articles which are not recognisable as quotes; this depends on the news editor the author used and their article-formatting habits.</para> 
+
+<para>&knode; provides some formatting which can be used by articles; at the moment the available options are:</para>
 
 <simplelist>
-<member
->/italic/</member
-> 
-<member
->*bold*</member
-> 
-<member
->_underlined_</member
-> 
-</simplelist
-> 
-
-<para
->Do not use the highlighting too often; the impact decreases the more it is used.</para
-> 
-
-<tip
-> 
-<para
->The main part of the message (the contents) is called the <glossterm
->body</glossterm
->.</para
-> 
-</tip
-> 
-
-<para
->Most of the time a quote is indicated by a prefixed &gt; on every line; however, there are other possible signs. If you can not directly recognize a quote the author did not obey the rules of proper quoting.</para
-> 
-
-<para
->Also, it is usual to start an answer with a introductionary line, something like:</para>
-
-<informalexample
-> 
-<para
->On 12/25/2000 Santa Claus wrote:</para
-> 
-</informalexample
-> 
-
-<tip
-> 
-<para
->Normally you do not have to concern yourself with these introductionary lines: &knode; does this automatically when you reply to an article; to find out how to customize this line see <link linkend="knode-composer-settings"
->The Composer Settings</link
-> documentation. </para
-> 
-</tip
-> 
-
-<para
->In <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Appearance</guilabel
-></menuchoice
-> you can choose how the articles are shown. In particular, &knode; provides the smart coloring of different reply levels; you can read more about this in the chapter <link linkend="knode-appearance"
->Configuring the appearance</link
->.</para
-> 
-
-<caution
-> 
-<para
->&knode; only supports the colouring of quotes if the quoting lines starts with special characters; you can configure these characters at <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Viewer</guilabel
-></menuchoice
->.</para>
-</caution
-> 
-
-<para
->When the body of an article contains links to internet addresses you can invoke an internet browser to display the web page it links to by clicking on the link; details about configuring this feature can be found in <link linkend="setting-news-general"
->General news settings</link
->.</para>
-
-</sect4
-> 
-
-<sect4
-> 
-<title
->The Signature</title
-> 
-
-<para
->Below the main text of an article you can find the signature of the author, provided you did not disable signatures in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->General</guilabel
-></menuchoice
->. The signature is divided from the text by thin horizontal line.</para
-> 
-</sect4
-> 
+<member>/italic/</member> 
+<member>*bold*</member> 
+<member>_underlined_</member> 
+</simplelist> 
+
+<para>Do not use the highlighting too often; the impact decreases the more it is used.</para> 
+
+<tip> 
+<para>The main part of the message (the contents) is called the <glossterm>body</glossterm>.</para> 
+</tip> 
+
+<para>Most of the time a quote is indicated by a prefixed &gt; on every line; however, there are other possible signs. If you can not directly recognize a quote the author did not obey the rules of proper quoting.</para> 
+
+<para>Also, it is usual to start an answer with a introductionary line, something like:</para>
+
+<informalexample> 
+<para>On 12/25/2000 Santa Claus wrote:</para> 
+</informalexample> 
+
+<tip> 
+<para>Normally you do not have to concern yourself with these introductionary lines: &knode; does this automatically when you reply to an article; to find out how to customize this line see <link linkend="knode-composer-settings">The Composer Settings</link> documentation. </para> 
+</tip> 
+
+<para>In <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Appearance</guilabel></menuchoice> you can choose how the articles are shown. In particular, &knode; provides the smart coloring of different reply levels; you can read more about this in the chapter <link linkend="knode-appearance">Configuring the appearance</link>.</para> 
+
+<caution> 
+<para>&knode; only supports the colouring of quotes if the quoting lines starts with special characters; you can configure these characters at <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Viewer</guilabel></menuchoice>.</para>
+</caution> 
+
+<para>When the body of an article contains links to internet addresses you can invoke an internet browser to display the web page it links to by clicking on the link; details about configuring this feature can be found in <link linkend="setting-news-general">General news settings</link>.</para>
+
+</sect4> 
+
+<sect4> 
+<title>The Signature</title> 
+
+<para>Below the main text of an article you can find the signature of the author, provided you did not disable signatures in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>General</guilabel></menuchoice>. The signature is divided from the text by thin horizontal line.</para> 
+</sect4> 
 
 
 <sect4>
-<title
->Attachments and Multipart <acronym
->MIME</acronym
-> messages</title
-> 
-
-<para
->If an article contains attachments they are shown below the signature in a table.</para
-> 
-
-<para
->The multipart <acronym
->MIME</acronym
-> format allows the body of an article to be sent in more than one format; for example, in plain-text and in <acronym
->HTML</acronym
->. It depends on the newsreader which format is used for reading the article.</para
-> 
-
-<para
->&knode; allows the different formats to be shown by selecting <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Reading News</guilabel
-><guilabel
->Viewer</guilabel
-><guilabel
->Show alternative contents as attachments</guilabel
-></menuchoice
->; when this option is checked all alternative formats are shown as attachments and can be opened and viewed.</para
-> 
-
-<para
->If this option is unchecked you will not be shown the different text formats and &knode; decides which one should be shown.</para>
-
-</sect4
-> 
-</sect3
-> 
-</sect2
-> 
-
-<sect2 id="post-and-mail-news"
-> 
-<title
->Writing and Replying to Articles</title
-> 
-
-<para
->Before you start writing articles or replying to other Usenet users be sure you understand the habits of the current newsgroup; again, reading <link linkend="knode-journey"
->A Journey Through Usenet</link
-> would be a good idea.</para>
-
-<para
->For testing the settings of &knode; please resist sending an article to a random newsgroup; it is not very friendly to bother people with test articles: what if you are subscribed to a newsgroup and half of its articles only contain the word <quote
->test</quote
->? It is like somebody calling you just to testing their phone.</para
-> 
-
-<para
->This is the reason for the special groups having <quote
->test</quote
-> in their name; for example, <emphasis
->alt.test</emphasis
->. In these groups you can test everything you want without bothering anybody; some groups even send you error messages back.</para
-> 
-
-<para
->Here you can easily identify obvious mistakes, like a missing or a wrong e-mail address or a wrongly-configured charset which doesn't show all special characters.</para
-> 
-
-<para
->You can find a selection of test groups in <link linkend="infos-testgroups"
->Test Groups</link
->.</para
-> 
-
-<para
->Subscribe to one of the test groups now; some news servers have their own test groups, which are probably less crowded.</para>
+<title>Attachments and Multipart <acronym>MIME</acronym> messages</title> 
+
+<para>If an article contains attachments they are shown below the signature in a table.</para> 
+
+<para>The multipart <acronym>MIME</acronym> format allows the body of an article to be sent in more than one format; for example, in plain-text and in <acronym>HTML</acronym>. It depends on the newsreader which format is used for reading the article.</para> 
+
+<para>&knode; allows the different formats to be shown by selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Reading News</guilabel><guilabel>Viewer</guilabel><guilabel>Show alternative contents as attachments</guilabel></menuchoice>; when this option is checked all alternative formats are shown as attachments and can be opened and viewed.</para> 
+
+<para>If this option is unchecked you will not be shown the different text formats and &knode; decides which one should be shown.</para>
+
+</sect4> 
+</sect3> 
+</sect2> 
+
+<sect2 id="post-and-mail-news"> 
+<title>Writing and Replying to Articles</title> 
+
+<para>Before you start writing articles or replying to other Usenet users be sure you understand the habits of the current newsgroup; again, reading <link linkend="knode-journey">A Journey Through Usenet</link> would be a good idea.</para>
+
+<para>For testing the settings of &knode; please resist sending an article to a random newsgroup; it is not very friendly to bother people with test articles: what if you are subscribed to a newsgroup and half of its articles only contain the word <quote>test</quote>? It is like somebody calling you just to testing their phone.</para> 
+
+<para>This is the reason for the special groups having <quote>test</quote> in their name; for example, <emphasis>alt.test</emphasis>. In these groups you can test everything you want without bothering anybody; some groups even send you error messages back.</para> 
+
+<para>Here you can easily identify obvious mistakes, like a missing or a wrong e-mail address or a wrongly-configured charset which doesn't show all special characters.</para> 
+
+<para>You can find a selection of test groups in <link linkend="infos-testgroups">Test Groups</link>.</para> 
+
+<para>Subscribe to one of the test groups now; some news servers have their own test groups, which are probably less crowded.</para>
  
-<tip
-> 
-<para
->Remember, you have to download the articles of the new subscribed group; this may take some time if there are many articles in the group. The only important articles are yours and the answers by the check handler; if you want to reduce the number of articles fetched during the test you can configure this in <menuchoice
-><guimenu
->Settings</guimenu
-><guilabel
->Configure KNode...</guilabel
-><guilabel
->Reading News</guilabel
-><guilabel
->General</guilabel
-><guilabel
->Maximal number of articles to fetch</guilabel
-></menuchoice
->: if you reduce this dramatically, you should not wait too long to fetch the new articles after sending your test article; however, if it set too low your article might not be fetched. A tolerably-fast news server should provide your article right after you sent it; you might, however, have to wait a while, at worst 1 or 2 days. Feel free to send another article if cannot see your initial one; this is what the test groups are for.</para
-> 
-</tip
-> 
+<tip> 
+<para>Remember, you have to download the articles of the new subscribed group; this may take some time if there are many articles in the group. The only important articles are yours and the answers by the check handler; if you want to reduce the number of articles fetched during the test you can configure this in <menuchoice><guimenu>Settings</guimenu><guilabel>Configure KNode...</guilabel><guilabel>Reading News</guilabel><guilabel>General</guilabel><guilabel>Maximal number of articles to fetch</guilabel></menuchoice>: if you reduce this dramatically, you should not wait too long to fetch the new articles after sending your test article; however, if it set too low your article might not be fetched. A tolerably-fast news server should provide your article right after you sent it; you might, however, have to wait a while, at worst 1 or 2 days. Feel free to send another article if cannot see your initial one; this is what the test groups are for.</para> 
+</tip> 
 
 <caution>
-<para
->When you are using a local news server the configuration of <guilabel
->Maximal number of articles to fetch</guilabel
-> in &knode; is probably unnecessary; you should consult the documentation of your news server instead.</para
-> 
+<para>When you are using a local news server the configuration of <guilabel>Maximal number of articles to fetch</guilabel> in &knode; is probably unnecessary; you should consult the documentation of your news server instead.</para> 
 </caution>
 
-<para
->If you did not encounter any errors unsubscribe from the test groups and set <guilabel
->Maximum number of articles to fetch</guilabel
-> back to normal (1000).</para
-> 
-
-<sect3
-> 
-<title
->Publishing Articles</title
-> 
-
-<para
->You have seen most of &knode; now, but have only used it passively so far, so let's publish a test article now. Select the new subscribed test group in the folder view; then, with <menuchoice
-><guimenu
->Article</guimenu
-><guimenuitem
->Post to newsgroup...</guimenuitem
-></menuchoice
->or the key <keycap
->P</keycap
->, the Editor will be opened.</para
-> 
-
-<para
->You can use the &knode; Editor like a normal Texteditor; there are some additional features for writing news articles though.</para
-> 
-
-<para
->In the editor window there are two input lines: one for the subject, which is empty at the moment; and another for the newsgroups this article is going to be posted to.</para
-> 
-
-<para
->Enter the text <userinput
->This is a test</userinput
-> in the subject field.</para
-> 
-
-<tip
-> 
-<para
->Normally, when you post an article, use a descriptive subject. Articles without a descriptive subject are often ignored. Avoid subjects like <quote
->Help, it doesn't work !!!!!</quote
-> This subject gives no information about the content of your article.</para
-> 
-</tip
-> 
-
-<para
->The <guilabel
->Groups:</guilabel
-> field already contains the test newsgroup you selected before; do not change this.</para
-> 
-
-<para
->Below the input field for the <glossterm
->newsgroup</glossterm
-> there is another inactive option field: this function is explained later in the chapter <link linkend="knode-editor-advanced"
->The editor</link
->; for now it is irrelevant.</para
-> 
-
-<para
->For simplicity reasons we will only use a simple sentence; type:</para>
+<para>If you did not encounter any errors unsubscribe from the test groups and set <guilabel>Maximum number of articles to fetch</guilabel> back to normal (1000).</para> 
+
+<sect3> 
+<title>Publishing Articles</title> 
+
+<para>You have seen most of &knode; now, but have only used it passively so far, so let's publish a test article now. Select the new subscribed test group in the folder view; then, with <menuchoice><guimenu>Article</guimenu><guimenuitem>Post to newsgroup...</guimenuitem></menuchoice>or the key <keycap>P</keycap>, the Editor will be opened.</para> 
+
+<para>You can use the &knode; Editor like a normal Texteditor; there are some additional features for writing news articles though.</para> 
+
+<para>In the editor window there are two input lines: one for the subject, which is empty at the moment; and another for the newsgroups this article is going to be posted to.</para> 
+
+<para>Enter the text <userinput>This is a test</userinput> in the subject field.</para> 
+
+<tip> 
+<para>Normally, when you post an article, use a descriptive subject. Articles without a descriptive subject are often ignored. Avoid subjects like <quote>Help, it doesn't work !!!!!</quote> This subject gives no information about the content of your article.</para> 
+</tip> 
+
+<para>The <guilabel>Groups:</guilabel> field already contains the test newsgroup you selected before; do not change this.</para> 
+
+<para>Below the input field for the <glossterm>newsgroup</glossterm> there is another inactive option field: this function is explained later in the chapter <link linkend="knode-editor-advanced">The editor</link>; for now it is irrelevant.</para> 
+
+<para>For simplicity reasons we will only use a simple sentence; type:</para>
  
-<screen
-><userinput
->This is the body of my test article. @ $ %</userinput
-> 
-</screen
-> 
-
-<para
->Then, enter an empty line, followed by:</para>
+<screen><userinput>This is the body of my test article. @ $ %</userinput> 
+</screen> 
+
+<para>Then, enter an empty line, followed by:</para>
  
-<screen
-><userinput
->Did it work?</userinput
-> 
-</screen
-> 
-
-<para
->This may look funny to you, but it does what it is supposed to do &mdash; test your configuration..</para
-> 
-
-<para
->Your article should now look like the screenshot below:</para
-> 
-
-<screenshot
-> 
-<screeninfo
->Your first article</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-new-article.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Your first article</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Your first article</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<para
->If you are using &knode; with a local newsserver choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Now</guimenuitem
-></menuchoice
-> in the Editor; if you do not have a connection to a newsserver at this point, you may want to send the article later &mdash; you can achieve this by using <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send Later</guimenuitem
-></menuchoice
-> &mdash; &knode; then stores this article in the folder <guilabel
->Outbox</guilabel
->. You can start sending the articles in the <guilabel
->Outbox</guilabel
-> manually by selecting <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send pending messages</guimenuitem
-></menuchoice
->.</para
-> 
-
-<para
->After sending the article you will notice &knode; stores a copy in the <guilabel
->Sent</guilabel
-> folder.</para
-> 
-
-<para
->Depending on how fast your article is published in the according newsgroup you can check the result after some time: mostly it is sufficient to check for new messages immediately after sending the article; be patient, though, it <emphasis
->may</emphasis
-> take the article some hours before reaching the newsgroup. If the article does not arrive after a number of hours it is likely that something went wrong: try again; then, if it is still not working, have a look at the <link linkend="faq"
->Frequently Asked Questions</link
->.</para
-> 
-
-<important
-> 
-<para
->Even when you are using a local news server, you have to check for new articles: the local news server just sends the article, it does not store it in the local newsgroup, so you have to synchronize with an external news server if you want to see if your test article has arrived.</para
-> 
-</important
-> 
-
-<para
->If the <glossterm
->article</glossterm
-> appears in the newsgroup you are successful; now you should check if there is the correct sender and if the article is readable. Have a look on your language-specific characters like the German umlauts; if they are not readable you have to change the coding at <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Posting News</guilabel
-><guilabel
->Technical</guilabel
-></menuchoice
->to <guilabel
->Allow 8-bit</guilabel
->. Change this and repeat your test.</para
-> 
-
-<para
->If everything is right you have successfully published your first article in usenet with &knode;.</para
-> 
-
-</sect3
-> 
-
-<sect3
-> 
-<title
->Post Reply</title
-> 
-
-<para
->After successfully publishing an article we will now answer to your own article. You want to answer the question you asked, don't you?</para
-> 
-
-<para
->Select your article in the article view and press the &RMB;: a context menu will appear; choose <guimenuitem
->Followup to newsgroup</guimenuitem
->.</para
-> 
-
-<para
->&knode; opens the Editor again, but this time there is already a subject filled in for you. The subject line reads:</para>
+<screen><userinput>Did it work?</userinput> 
+</screen> 
+
+<para>This may look funny to you, but it does what it is supposed to do &mdash; test your configuration..</para> 
+
+<para>Your article should now look like the screenshot below:</para> 
+
+<screenshot> 
+<screeninfo>Your first article</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-new-article.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Your first article</phrase> 
+</textobject> 
+<caption> 
+<para>Your first article</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<para>If you are using &knode; with a local newsserver choose <menuchoice><guimenu>File</guimenu><guimenuitem>Send Now</guimenuitem></menuchoice> in the Editor; if you do not have a connection to a newsserver at this point, you may want to send the article later &mdash; you can achieve this by using <menuchoice><guimenu>File</guimenu><guimenuitem>Send Later</guimenuitem></menuchoice> &mdash; &knode; then stores this article in the folder <guilabel>Outbox</guilabel>. You can start sending the articles in the <guilabel>Outbox</guilabel> manually by selecting <menuchoice><guimenu>File</guimenu><guimenuitem>Send pending messages</guimenuitem></menuchoice>.</para> 
+
+<para>After sending the article you will notice &knode; stores a copy in the <guilabel>Sent</guilabel> folder.</para> 
+
+<para>Depending on how fast your article is published in the according newsgroup you can check the result after some time: mostly it is sufficient to check for new messages immediately after sending the article; be patient, though, it <emphasis>may</emphasis> take the article some hours before reaching the newsgroup. If the article does not arrive after a number of hours it is likely that something went wrong: try again; then, if it is still not working, have a look at the <link linkend="faq">Frequently Asked Questions</link>.</para> 
+
+<important> 
+<para>Even when you are using a local news server, you have to check for new articles: the local news server just sends the article, it does not store it in the local newsgroup, so you have to synchronize with an external news server if you want to see if your test article has arrived.</para> 
+</important> 
+
+<para>If the <glossterm>article</glossterm> appears in the newsgroup you are successful; now you should check if there is the correct sender and if the article is readable. Have a look on your language-specific characters like the German umlauts; if they are not readable you have to change the coding at <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Posting News</guilabel><guilabel>Technical</guilabel></menuchoice>to <guilabel>Allow 8-bit</guilabel>. Change this and repeat your test.</para> 
+
+<para>If everything is right you have successfully published your first article in usenet with &knode;.</para> 
+
+</sect3> 
+
+<sect3> 
+<title>Post Reply</title> 
+
+<para>After successfully publishing an article we will now answer to your own article. You want to answer the question you asked, don't you?</para> 
+
+<para>Select your article in the article view and press the &RMB;: a context menu will appear; choose <guimenuitem>Followup to newsgroup</guimenuitem>.</para> 
+
+<para>&knode; opens the Editor again, but this time there is already a subject filled in for you. The subject line reads:</para>
  
-<screen
-><computeroutput
->Re: This is a test</computeroutput
-> 
-</screen
-> 
-
-<para
-><emphasis
->Re:</emphasis
-> is a shortcut for the Latin <quote
->In re</quote
->, which translates to something along the lines of <quote
->relating to</quote
->. You should not change the subject and, above all, the <emphasis
->Re:</emphasis
->: most newsreaders sort threads by the subject.</para
-> 
-
-<tip
-> 
-<para
->If you want to change the subject for some reason put the new subject in front of the old and replace the Re: with a bracketed (Was: ... ); in our example this would look like </para>
-
-<informalexample
-> 
-<para
->A new subject! (Was: This is a test)</para
-> 
-</informalexample
-> 
-
-<para
->With this kind of subject you show the other readers there is a branch in the original discussion; this happens, for example, when a new topic occurs in the original discussion or the original subject has changed for some reason.</para
-> 
-
-<para
->If you answer to an article with such a subject, delete the bracketed part of the subject; the first part with a prefixed <emphasis
->Re:</emphasis
-> remains.</para>
+<screen><computeroutput>Re: This is a test</computeroutput> 
+</screen> 
+
+<para><emphasis>Re:</emphasis> is a shortcut for the Latin <quote>In re</quote>, which translates to something along the lines of <quote>relating to</quote>. You should not change the subject and, above all, the <emphasis>Re:</emphasis>: most newsreaders sort threads by the subject.</para> 
+
+<tip> 
+<para>If you want to change the subject for some reason put the new subject in front of the old and replace the Re: with a bracketed (Was: ... ); in our example this would look like </para>
+
+<informalexample> 
+<para>A new subject! (Was: This is a test)</para> 
+</informalexample> 
+
+<para>With this kind of subject you show the other readers there is a branch in the original discussion; this happens, for example, when a new topic occurs in the original discussion or the original subject has changed for some reason.</para> 
+
+<para>If you answer to an article with such a subject, delete the bracketed part of the subject; the first part with a prefixed <emphasis>Re:</emphasis> remains.</para>
 
 <informalexample>
-<para
->Re: A new subject!</para>
-</informalexample
-> 
-</tip
-> 
-
-<para
->Let us have look at the Editor now. The contents of the article to which we want to reply has already been copied to the Editor by &knode;; to indicate the text is a quote every line is prefixed with a <emphasis
->&gt;</emphasis
->.</para
-> 
-
-<para
->In front of the quoted text &knode; has put an introduction line: the content of this line refers to the original author; you can change the standard text of this line in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Posting News</guilabel
-><guilabel
->Composer</guilabel
-><guilabel
->Introduction Phrase:</guilabel
-></menuchoice
->.</para
-> 
-
-<para
->The original article contains the question: <emphasis
->Did it work?</emphasis
-> We want to answer this question now.</para>
-
-<para
->Place the cursor below the quoted question and write in the next line:</para>
+<para>Re: A new subject!</para>
+</informalexample> 
+</tip> 
+
+<para>Let us have look at the Editor now. The contents of the article to which we want to reply has already been copied to the Editor by &knode;; to indicate the text is a quote every line is prefixed with a <emphasis>&gt;</emphasis>.</para> 
+
+<para>In front of the quoted text &knode; has put an introduction line: the content of this line refers to the original author; you can change the standard text of this line in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Posting News</guilabel><guilabel>Composer</guilabel><guilabel>Introduction Phrase:</guilabel></menuchoice>.</para> 
+
+<para>The original article contains the question: <emphasis>Did it work?</emphasis> We want to answer this question now.</para>
+
+<para>Place the cursor below the quoted question and write in the next line:</para>
  
-<screen
-><userinput
->Yes it worked, congratulations!</userinput
-> 
-</screen
-> 
-
-<para
->We are not finished yet: it is considered polite to begin with a greeting like <quote
->Hello</quote
-> in the first line; whether you call the author by their name or not depends on your habits, watch the newsgroup to get used to the habits there.</para
-> 
-
-<para
->Next we delete all non-mandatory parts of the quoted article; in our case, we delete all parts except the question.</para
-> 
-
-<para
->With such a short text this is unnecessary, but this just an example: if you have to read a message 100 lines long again just to find an <citation
->I agree</citation
-> at the end you will understand.... Aside from this, it makes articles smaller so they use less space on the server.</para
-> 
-
-<para
->At the end we say good bye.</para
-> 
-
-<para
->This screenshot shows our answer before sending it.</para>
-
-<screenshot
-> 
-<screeninfo
->Your answer to your article</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-followup.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->Your answer to your article</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->Your answer to your article</para
-> 
-</caption
-> 
-</mediaobject
-> 
-</screenshot
-> 
-
-<tip
-> 
-<para
->You can find a good guide for correct quoting at <ulink url="http://www.afaik.de/usenet/faq/zitieren"
->http://www.afaik.de/usenet/faq/zitieren</ulink
-> (German).</para
-> 
-</tip
-> 
-
-<para
->Now we still need to post our reply; like posting the original message choose <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send now</guimenuitem
-></menuchoice
-> or the alternative <menuchoice
-><guimenu
->File</guimenu
-><guimenuitem
->Send later</guimenuitem
-></menuchoice
->, if you're not online at the moment and you're not using a local newsserver. If everything works you will see your article in the newsgroup after a while; easy, isn't it?</para>
+<screen><userinput>Yes it worked, congratulations!</userinput> 
+</screen> 
+
+<para>We are not finished yet: it is considered polite to begin with a greeting like <quote>Hello</quote> in the first line; whether you call the author by their name or not depends on your habits, watch the newsgroup to get used to the habits there.</para> 
+
+<para>Next we delete all non-mandatory parts of the quoted article; in our case, we delete all parts except the question.</para> 
+
+<para>With such a short text this is unnecessary, but this just an example: if you have to read a message 100 lines long again just to find an <citation>I agree</citation> at the end you will understand.... Aside from this, it makes articles smaller so they use less space on the server.</para> 
+
+<para>At the end we say good bye.</para> 
+
+<para>This screenshot shows our answer before sending it.</para>
+
+<screenshot> 
+<screeninfo>Your answer to your article</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-followup.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>Your answer to your article</phrase> 
+</textobject> 
+<caption> 
+<para>Your answer to your article</para> 
+</caption> 
+</mediaobject> 
+</screenshot> 
+
+<tip> 
+<para>You can find a good guide for correct quoting at <ulink url="http://www.afaik.de/usenet/faq/zitieren">http://www.afaik.de/usenet/faq/zitieren</ulink> (German).</para> 
+</tip> 
+
+<para>Now we still need to post our reply; like posting the original message choose <menuchoice><guimenu>File</guimenu><guimenuitem>Send now</guimenuitem></menuchoice> or the alternative <menuchoice><guimenu>File</guimenu><guimenuitem>Send later</guimenuitem></menuchoice>, if you're not online at the moment and you're not using a local newsserver. If everything works you will see your article in the newsgroup after a while; easy, isn't it?</para>
  
-<tip
-> 
-<para
->Using the <guimenu
->Options</guimenu
-> menu you can configure whether you want to send an email, a news article or both.</para>
-</tip
-> 
-</sect3
-> 
-
-<sect3
-> 
-<title
->Mail Reply</title
-> 
-
-<para
->The Mail Reply follows the same lines as posting a reply in a newsgroup; the only difference is that a mail reply is sent directly to the author and does not appear in any newsgroup.</para
-> 
-
-<para
->Sometimes it is better to use an emailed reply instead of posting a reply to newsgroup; they are used primarily for when you want to correct an error or misconduct by the author, without hurting their feelings by doing so publicly on the newsgroup.</para
-> 
-
-<para
->To answer with an e-mail select your article; again, open the context menu with the right mouse button; and choose <guimenuitem
->Reply by Email</guimenuitem
->: &knode; opens the Composer with the quoted article.</para
-> 
-
-<para
->Subject and body are identical as when posting an article but the <guilabel
->Groups:</guilabel
-> field is replaced by a <guilabel
->To:</guilabel
-> field; here the author's email address appears. In our example this should be your own email address, if &knode; is set up correctly.</para
-> 
-
-<para
->For emails the same rules for quoting and politeness apply as for posting an article in a newsgroup.</para
-> 
-
-<para
->After finishing your Reply, you can send it.</para
-> 
-
-<para
->The screenshot below shows the reply we distributed by email.</para
-> 
-
-<screenshot
-> 
-<screeninfo
->A Mail Reply</screeninfo
-> 
-<mediaobject
-> 
-<imageobject
-> 
-<imagedata fileref="knode-reply.png" format="PNG"/> </imageobject
-> 
-<textobject
-> 
-<phrase
->A Mail Reply</phrase
-> 
-</textobject
-> 
-<caption
-> 
-<para
->A Mail Reply</para
-> 
+<tip> 
+<para>Using the <guimenu>Options</guimenu> menu you can configure whether you want to send an email, a news article or both.</para>
+</tip> 
+</sect3> 
+
+<sect3> 
+<title>Mail Reply</title> 
+
+<para>The Mail Reply follows the same lines as posting a reply in a newsgroup; the only difference is that a mail reply is sent directly to the author and does not appear in any newsgroup.</para> 
+
+<para>Sometimes it is better to use an emailed reply instead of posting a reply to newsgroup; they are used primarily for when you want to correct an error or misconduct by the author, without hurting their feelings by doing so publicly on the newsgroup.</para> 
+
+<para>To answer with an e-mail select your article; again, open the context menu with the right mouse button; and choose <guimenuitem>Reply by Email</guimenuitem>: &knode; opens the Composer with the quoted article.</para> 
+
+<para>Subject and body are identical as when posting an article but the <guilabel>Groups:</guilabel> field is replaced by a <guilabel>To:</guilabel> field; here the author's email address appears. In our example this should be your own email address, if &knode; is set up correctly.</para> 
+
+<para>For emails the same rules for quoting and politeness apply as for posting an article in a newsgroup.</para> 
+
+<para>After finishing your Reply, you can send it.</para> 
+
+<para>The screenshot below shows the reply we distributed by email.</para> 
+
+<screenshot> 
+<screeninfo>A Mail Reply</screeninfo> 
+<mediaobject> 
+<imageobject> 
+<imagedata fileref="knode-reply.png" format="PNG"/> </imageobject> 
+<textobject> 
+<phrase>A Mail Reply</phrase> 
+</textobject> 
+<caption> 
+<para>A Mail Reply</para> 
 </caption>
 </mediaobject>
 </screenshot>
 
 <important>
-<para
->The Mail Reply only works if you have used the correct settings in <menuchoice
-><guimenu
->Settings</guimenu
-><guimenuitem
->Configure KNode...</guimenuitem
-><guilabel
->Accounts</guilabel
-><guilabel
->Mail</guilabel
-></menuchoice
->.</para>
+<para>The Mail Reply only works if you have used the correct settings in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure KNode...</guimenuitem><guilabel>Accounts</guilabel><guilabel>Mail</guilabel></menuchoice>.</para>
  
-<para
->Depending on the configuration of your computer, you will find the reply in your mailbox; you might have to connect to your <acronym
->ISP</acronym
-> and fetch your new mail first though.</para>
-</important
-> 
-
-<tip
-> 
-<para
->On the <guimenu
->Options</guimenu
-> menu you can configure whether you want to send an email, a news article or both.</para
-> 
-</tip
-> 
-</sect3
-> 
+<para>Depending on the configuration of your computer, you will find the reply in your mailbox; you might have to connect to your <acronym>ISP</acronym> and fetch your new mail first though.</para>
+</important> 
+
+<tip> 
+<para>On the <guimenu>Options</guimenu> menu you can configure whether you want to send an email, a news article or both.</para> 
+</tip> 
+</sect3> 
 </sect2>
-</sect1
-> 
+</sect1> 
 
diff --git a/tde-i18n-en_GB/docs/tdepim/knotes/index.docbook b/tde-i18n-en_GB/docs/tdepim/knotes/index.docbook
index f880fa26202..f0491e4ec0e 100644
--- a/tde-i18n-en_GB/docs/tdepim/knotes/index.docbook
+++ b/tde-i18n-en_GB/docs/tdepim/knotes/index.docbook
@@ -3,337 +3,164 @@
   <!ENTITY kappname "&knotes;">
   <!ENTITY package "tdepim">
   <!ENTITY % addindex "IGNORE">
-  <!ENTITY % British-English "INCLUDE"
-> <!-- change language only here -->
+  <!ENTITY % British-English "INCLUDE"> <!-- change language only here -->
 ]>
 
 <book lang="&language;">
 
 <bookinfo>
-<title
->The &knotes; Handbook</title>
+<title>The &knotes; Handbook</title>
 
 <authorgroup>
-<author
-><firstname
->Fabian</firstname
-> <surname
->Dal Santo</surname
-> <affiliation
-> <address
-><email
->linuxgnu@yahoo.com.au</email
-></address>
+<author><firstname>Fabian</firstname> <surname>Dal Santo</surname> <affiliation> <address><email>linuxgnu@yahoo.com.au</email></address>
 </affiliation>
 </author>
 
-<author
-><firstname
->Greg</firstname
-> <othername
->M.</othername
-> <surname
->Holmes</surname
-> </author>
-
-<othercredit role="reviewer"
-><firstname
->Lauri</firstname
-> <surname
->Watts</surname
-> <contrib
->Reviewer</contrib>
+<author><firstname>Greg</firstname> <othername>M.</othername> <surname>Holmes</surname> </author>
+
+<othercredit role="reviewer"><firstname>Lauri</firstname> <surname>Watts</surname> <contrib>Reviewer</contrib>
 </othercredit>
-<othercredit role="translator"
-><firstname
->Andrew</firstname
-><surname
->Coles</surname
-><affiliation
-><address
-><email
->andrew_coles@yahoo.co.uk</email
-></address
-></affiliation
-><contrib
->Conversion to British English</contrib
-></othercredit
-> 
+<othercredit role="translator"><firstname>Andrew</firstname><surname>Coles</surname><affiliation><address><email>andrew_coles@yahoo.co.uk</email></address></affiliation><contrib>Conversion to British English</contrib></othercredit> 
 
 </authorgroup>
 
 <copyright>
-<year
->2000</year>
-<holder
->Greg M. Holmes</holder>
+<year>2000</year>
+<holder>Greg M. Holmes</holder>
 </copyright>
 <copyright>
-<year
->2001</year>
-<holder
->Fabian Del Santo</holder>
+<year>2001</year>
+<holder>Fabian Del Santo</holder>
 </copyright>
 
-<legalnotice
->&FDLNotice;</legalnotice>
+<legalnotice>&FDLNotice;</legalnotice>
 
-<date
->2003-09-18</date>
-<releaseinfo
->3.0</releaseinfo>
+<date>2003-09-18</date>
+<releaseinfo>3.0</releaseinfo>
 
-<abstract
-><para
->&knotes; is a sticky notes application for the desktop.</para
-></abstract>
+<abstract><para>&knotes; is a sticky notes application for the desktop.</para></abstract>
 
 <keywordset>
-<keyword
->KDE</keyword>
-<keyword
->Knotes</keyword>
-<keyword
->tdeutils</keyword>
-<keyword
->notes</keyword>
-<keyword
->popup</keyword>
-<keyword
->pop-up</keyword>
-<keyword
->knotes</keyword>
+<keyword>KDE</keyword>
+<keyword>Knotes</keyword>
+<keyword>tdeutils</keyword>
+<keyword>notes</keyword>
+<keyword>popup</keyword>
+<keyword>pop-up</keyword>
+<keyword>knotes</keyword>
 
 </keywordset>
 
 </bookinfo>
 
 <chapter id="introduction">
-<title
->Introduction</title>
+<title>Introduction</title>
 
-<para
->&knotes; is a program that lets you write the computer equivalent of sticky notes. The notes are saved automatically when you exit the program and they display when you open the program. </para>
+<para>&knotes; is a program that lets you write the computer equivalent of sticky notes. The notes are saved automatically when you exit the program and they display when you open the program. </para>
 
-<para
->You may print and mail your notes if you configure &knotes; to use helper applications. </para>
+<para>You may print and mail your notes if you configure &knotes; to use helper applications. </para>
 
-<para
->Display features of notes such as colour and font may be customised for each note. You may also customise the defaults. </para>
+<para>Display features of notes such as colour and font may be customised for each note. You may also customise the defaults. </para>
 
 </chapter>
 
 <chapter id="using-knotes">
-<title
->Using &knotes;</title>
+<title>Using &knotes;</title>
 
 <variablelist>
 <varlistentry>
-<term
->Creating a new note:</term>
+<term>Creating a new note:</term>
 <listitem>
-<para
->To create a new note &RMB; click on the &knotes; panel icon and select <guimenuitem
->New Note</guimenuitem
-> or using the shortcut <keycombo action="simul"
->&Alt;&Shift;<keycap
->N</keycap
-></keycombo
->.</para>
-<para
->You can create a new note containing the contents of the clipboard by selecting <guimenuitem
->New Note From Clipboard</guimenuitem
-> or using the shortcut <keycombo action="simul"
->&Alt;&Shift;<keycap
->C</keycap
-></keycombo
->.</para>
+<para>To create a new note &RMB; click on the &knotes; panel icon and select <guimenuitem>New Note</guimenuitem> or using the shortcut <keycombo action="simul">&Alt;&Shift;<keycap>N</keycap></keycombo>.</para>
+<para>You can create a new note containing the contents of the clipboard by selecting <guimenuitem>New Note From Clipboard</guimenuitem> or using the shortcut <keycombo action="simul">&Alt;&Shift;<keycap>C</keycap></keycombo>.</para>
 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Writing your note:</term>
+<term>Writing your note:</term>
 <listitem>
-<para
->To write your note, simply type the note in the space provided. Normal keyboard and mouse editing functions are supported. <mousebutton
->Right</mousebutton
-> clicking in the editing space provides the following menu options:</para>
+<para>To write your note, simply type the note in the space provided. Normal keyboard and mouse editing functions are supported. <mousebutton>Right</mousebutton> clicking in the editing space provides the following menu options:</para>
 
 <itemizedlist>
-<listitem
-><para
-><guimenuitem
->Undo</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Redo</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Cut</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Copy</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Paste</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Clear</guimenuitem
-></para
-></listitem>
-<listitem
-><para
-><guimenuitem
->Select All</guimenuitem
-></para
-></listitem>
+<listitem><para><guimenuitem>Undo</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Redo</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Cut</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Copy</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Paste</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Clear</guimenuitem></para></listitem>
+<listitem><para><guimenuitem>Select All</guimenuitem></para></listitem>
 </itemizedlist>
-<para
->Text may be selected by holding down the &LMB; and moving the mouse, or by holding down the &Shift; key and using the <keycap
->arrow</keycap
-> keys.</para>
+<para>Text may be selected by holding down the &LMB; and moving the mouse, or by holding down the &Shift; key and using the <keycap>arrow</keycap> keys.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Inserting the date:</term>
+<term>Inserting the date:</term>
 <listitem>
-<para
->To insert the current date in the Note &RMB; click on the title bar of the note and select <guimenuitem
->Insert Date</guimenuitem
->.</para>
-<para
->The current date and time will be inserted at the cursor position in the text of the note.</para>
+<para>To insert the current date in the Note &RMB; click on the title bar of the note and select <guimenuitem>Insert Date</guimenuitem>.</para>
+<para>The current date and time will be inserted at the cursor position in the text of the note.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Renaming a note:</term>
+<term>Renaming a note:</term>
 <listitem>
-<para
->To rename a note &RMB; click on the note title bar and select <guimenuitem
->Rename...</guimenuitem
->.</para>
-<para
->Type the new name of the note in the dialogue that appears. To accept the new name, press the <guibutton
->OK</guibutton
-> button. To exit the dialogue without renaming the note, press the <guibutton
->Cancel</guibutton
-> button. To clear what you have typed and start over, click the <guibutton
->Clear</guibutton
-> button.</para>
+<para>To rename a note &RMB; click on the note title bar and select <guimenuitem>Rename...</guimenuitem>.</para>
+<para>Type the new name of the note in the dialogue that appears. To accept the new name, press the <guibutton>OK</guibutton> button. To exit the dialogue without renaming the note, press the <guibutton>Cancel</guibutton> button. To clear what you have typed and start over, click the <guibutton>Clear</guibutton> button.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Mailing a note:</term>
+<term>Mailing a note:</term>
 <listitem>
-<para
->To mail a note &RMB; click on the note title bar and select <guimenuitem
->Mail...</guimenuitem
->.</para
-> 
-<para
->What happens next depends on how you configured the Mail action in the <guilabel
->Preferences...</guilabel
-> dialogue.</para>
+<para>To mail a note &RMB; click on the note title bar and select <guimenuitem>Mail...</guimenuitem>.</para> 
+<para>What happens next depends on how you configured the Mail action in the <guilabel>Preferences...</guilabel> dialogue.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Printing a note:</term>
+<term>Printing a note:</term>
 <listitem>
-<para
->To print a note &RMB; click on the note title bar and select <guimenuitem
->Print</guimenuitem
->.</para>
-<para
->A standard &kde; print dialogue will open.</para>
+<para>To print a note &RMB; click on the note title bar and select <guimenuitem>Print</guimenuitem>.</para>
+<para>A standard &kde; print dialogue will open.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Deleting a note:</term>
+<term>Deleting a note:</term>
 <listitem>
-<para
->To delete a note &RMB; click on the note title bar and select <guimenuitem
->Delete</guimenuitem
->.</para>
+<para>To delete a note &RMB; click on the note title bar and select <guimenuitem>Delete</guimenuitem>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Hiding a note:</term>
+<term>Hiding a note:</term>
 <listitem>
-<para
->To hide a note, click the <guiicon
->X</guiicon
-> in the upper right corner of the title bar of the note. The note will no longer be displayed on the screen. The note itself will not be deleted.</para>
+<para>To hide a note, click the <guiicon>X</guiicon> in the upper right corner of the title bar of the note. The note will no longer be displayed on the screen. The note itself will not be deleted.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Displaying notes:</term>
+<term>Displaying notes:</term>
 <listitem>
-<para
->When you start &knotes;, all notes will display on the screen. If you hide a note and later want to display it, &LMB; on the &knotes; panel icon and select the note you wish to display.</para>
+<para>When you start &knotes;, all notes will display on the screen. If you hide a note and later want to display it, &LMB; on the &knotes; panel icon and select the note you wish to display.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Desktop functions:</term>
+<term>Desktop functions:</term>
 <listitem>
-<para
->To send a note to a specific desktop, &RMB; click on the title bar of the note and select <guisubmenu
->To Desktop</guisubmenu
->. Choose the desktop desired, or alternatively, <guimenuitem
->All desktops</guimenuitem
-></para
-> 
-<para
->To make the note remain on top of other windows &RMB; click on the title bar of the note and select <guimenuitem
->Always On Top</guimenuitem
->.</para
-> 
-<para
->To return the note to more normal window behaviour, simply repeat this process.</para
-> 
+<para>To send a note to a specific desktop, &RMB; click on the title bar of the note and select <guisubmenu>To Desktop</guisubmenu>. Choose the desktop desired, or alternatively, <guimenuitem>All desktops</guimenuitem></para> 
+<para>To make the note remain on top of other windows &RMB; click on the title bar of the note and select <guimenuitem>Always On Top</guimenuitem>.</para> 
+<para>To return the note to more normal window behaviour, simply repeat this process.</para> 
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
->Quitting &knotes;</term>
+<term>Quitting &knotes;</term>
 <listitem>
-<para
->To quit &knotes; &RMB; click on the panel icon and select <guimenuitem
->Quit</guimenuitem
->.</para>
+<para>To quit &knotes; &RMB; click on the panel icon and select <guimenuitem>Quit</guimenuitem>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -341,165 +168,82 @@
 </chapter>
 
 <chapter id="configuration">
-<title
->Configuration</title>
+<title>Configuration</title>
 
 <sect1 id="defaults">
-<title
->Configuring &knotes; Default Settings</title>
+<title>Configuring &knotes; Default Settings</title>
 
-<para
->To configure &knotes; &RMB; click on the panel icon. Select <guimenuitem
->Configure KNotes...</guimenuitem
-> The &knotes; <guilabel
->KNotes Defaults</guilabel
-> dialogue will open.</para>
+<para>To configure &knotes; &RMB; click on the panel icon. Select <guimenuitem>Configure KNotes...</guimenuitem> The &knotes; <guilabel>KNotes Defaults</guilabel> dialogue will open.</para>
 
 <variablelist>
-<title
->The <guilabel
->Display</guilabel
-> Section</title>
+<title>The <guilabel>Display</guilabel> Section</title>
 <varlistentry>
-<term
-><guilabel
->Text colour:</guilabel
-></term>
-<listitem
-><para
->The colour square shows the current text colour. By clicking this colour square you open the standard &kde; colour selection dialogue.</para
-></listitem
-> 
+<term><guilabel>Text colour:</guilabel></term>
+<listitem><para>The colour square shows the current text colour. By clicking this colour square you open the standard &kde; colour selection dialogue.</para></listitem> 
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Background colour:</guilabel
-></term>
-<listitem
-><para
->The colour square shows the current background colour. By clicking this colour square you open the standard &kde; colour selection dialogue.</para
-></listitem>
+<term><guilabel>Background colour:</guilabel></term>
+<listitem><para>The colour square shows the current background colour. By clicking this colour square you open the standard &kde; colour selection dialogue.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Default width:</guilabel
-></term>
-<listitem
-><para
->The width of the note in pixels. Edit this number as desired.</para
-></listitem
-> 
+<term><guilabel>Default width:</guilabel></term>
+<listitem><para>The width of the note in pixels. Edit this number as desired.</para></listitem> 
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Default height:</guilabel
-></term>
-<listitem
-><para
->The height of the note in pixels. Edit this number as desired.</para
-></listitem>
+<term><guilabel>Default height:</guilabel></term>
+<listitem><para>The height of the note in pixels. Edit this number as desired.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Show note in taskbar</guilabel
-></term>
-<listitem
-><para
->By default, &knotes; notes do not show an entry in the taskbar for each note. If you prefer they do so, enable this option.</para>
+<term><guilabel>Show note in taskbar</guilabel></term>
+<listitem><para>By default, &knotes; notes do not show an entry in the taskbar for each note. If you prefer they do so, enable this option.</para>
 </listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
-<title
->The <guilabel
->Editor</guilabel
-> Section</title>
+<title>The <guilabel>Editor</guilabel> Section</title>
 <varlistentry>
-<term
-><guilabel
->Tab Size</guilabel
-></term>
-<listitem
-><para
->This is the size of the indent produced by the &Tab; key in spaces. Edit this number as desired.</para
-></listitem>
+<term><guilabel>Tab Size</guilabel></term>
+<listitem><para>This is the size of the indent produced by the &Tab; key in spaces. Edit this number as desired.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term
-><guilabel
->Auto Indent</guilabel
-></term>
-<listitem
-><para
->This is a check box. If selected, auto-indenting is on.</para
-></listitem>
+<term><guilabel>Auto Indent</guilabel></term>
+<listitem><para>This is a check box. If selected, auto-indenting is on.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Rich Text</guilabel
-></term>
+<term><guilabel>Rich Text</guilabel></term>
 <listitem>
-<para
->Not yet implemented</para>
+<para>Not yet implemented</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Title Font: Click to Change</guilabel
-></term>
-<listitem
-><para
->You can change the font used for the title of your notes.</para>
-
-<para
->Click this button to open the standard &kde; font selection dialogue.</para>
+<term><guilabel>Title Font: Click to Change</guilabel></term>
+<listitem><para>You can change the font used for the title of your notes.</para>
+
+<para>Click this button to open the standard &kde; font selection dialogue.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term
-><guilabel
->Text Font: Click to Change</guilabel
-></term>
+<term><guilabel>Text Font: Click to Change</guilabel></term>
 <listitem>
-<para
->You can change the font used for the text of your notes.</para>
+<para>You can change the font used for the text of your notes.</para>
 
-<para
->Click this button to open the standard &kde; font selection dialogue.</para
-></listitem>
+<para>Click this button to open the standard &kde; font selection dialogue.</para></listitem>
 </varlistentry>
 </variablelist>
 
 <variablelist>
-<title
->The <guilabel
->Actions</guilabel
-> Section</title>
+<title>The <guilabel>Actions</guilabel> Section</title>
 <varlistentry>
-<term
-><guilabel
->Mail Action</guilabel
-></term>
-<listitem
-><para
->Type a mail command and any required command line switches in this box.</para>
-<para
->By using <token
->%f</token
-> in the command line you can pass the filename of the note body to the mail command.</para>
+<term><guilabel>Mail Action</guilabel></term>
+<listitem><para>Type a mail command and any required command line switches in this box.</para>
+<para>By using <token>%f</token> in the command line you can pass the filename of the note body to the mail command.</para>
 </listitem>
 </varlistentry>
 
@@ -508,66 +252,36 @@
 </sect1>
 
 <sect1 id="customizing-display">
-<title
->Customising a Single Note Display</title>
-
-<para
->You can customise each note independently of the global settings. The settings you can customise are identical to those described in the <link linkend="configuration"
->Configuration</link
-> section, but they will apply only to the note you are changing. Any other open notes, and any new notes you create, will use the default settings.</para>
-
-<para
->To customise a single note display &RMB; click on the note title bar and select <guimenuitem
->Preferences...</guimenuitem
->.</para>
-<para
->The <guilabel
->Local Settings</guilabel
-> dialogue will open, allowing you to configure the note.</para>
+<title>Customising a Single Note Display</title>
+
+<para>You can customise each note independently of the global settings. The settings you can customise are identical to those described in the <link linkend="configuration">Configuration</link> section, but they will apply only to the note you are changing. Any other open notes, and any new notes you create, will use the default settings.</para>
+
+<para>To customise a single note display &RMB; click on the note title bar and select <guimenuitem>Preferences...</guimenuitem>.</para>
+<para>The <guilabel>Local Settings</guilabel> dialogue will open, allowing you to configure the note.</para>
 </sect1>
 
 </chapter>
 
 <chapter id="credits">
 
-<title
->Credits and License</title>
+<title>Credits and License</title>
 
-<para
->&knotes;</para>
+<para>&knotes;</para>
 
-<para
->Program copyright 1997 Bernd Wuebben <email
->wuebben@kde.org</email
-></para>
+<para>Program copyright 1997 Bernd Wuebben <email>wuebben@kde.org</email></para>
 
-<para
->Contributors:</para>
+<para>Contributors:</para>
 <itemizedlist>
-<listitem
-><para
->Wynn Wilkes<email
->wynnw@calderasystems.com</email
-></para>
+<listitem><para>Wynn Wilkes<email>wynnw@calderasystems.com</email></para>
 </listitem>
 </itemizedlist>
 
-<para
->Documentation copyright 2000 Greg M. Holmes <email
->holmegm@earthlink.net</email
-></para>
+<para>Documentation copyright 2000 Greg M. Holmes <email>holmegm@earthlink.net</email></para>
 
-<para
->Documentation updated 2001 by Fabian Del Santo <email
->linuxgnu@yahoo.com.au</email
-> and 2003 by &Lauri.Watts; &Lauri.Watts.mail;.</para>
+<para>Documentation updated 2001 by Fabian Del Santo <email>linuxgnu@yahoo.com.au</email> and 2003 by &Lauri.Watts; &Lauri.Watts.mail;.</para>
 
 
-<para
->Andrew Coles<email
->andrew_coles@yahoo.co.uk</email
-></para
-> 
+<para>Andrew Coles<email>andrew_coles@yahoo.co.uk</email></para> 
 &underFDL; &underGPL; </chapter>
 
 &documentation.index;