[balsa/gtk3] New Mallard help files



commit e2c3d6f9206d0f8a6cf593570ea37cf98a6ef5ae
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed May 1 19:41:58 2013 -0400

    New Mallard help files

 doc/C/ab-conf.page                                 |  103 +++
 doc/C/authors.page                                 |  123 +++
 doc/C/balsa.entities                               |   32 +
 doc/C/common-tasks.page                            |  168 ++++
 doc/C/folder-config.page                           |  173 ++++
 doc/C/getting-started.page                         |   31 +
 doc/C/glossary.page                                |  113 +++
 doc/C/identities.page                              |  243 ++++++
 doc/C/index.page                                   |   53 ++
 doc/C/introduction.page                            |   33 +
 doc/C/its-not-working.page                         |   88 ++
 doc/C/mbox-formats.page                            |   52 ++
 doc/C/preferences-address-books.page               |   90 ++
 doc/C/preferences-display-options.page             |  267 ++++++
 doc/C/preferences-mail-options.page                |  285 +++++++
 doc/C/preferences-miscellaneous.page               |   70 ++
 doc/C/preferences-spelling.page                    |   86 ++
 doc/C/preferences-startup.page                     |   51 ++
 doc/C/preferences.page                             |   26 +
 doc/C/toolbar-prefs.page                           |   46 +
 doc/C/win-composer.page                            |  766 +++++++++++++++++
 doc/C/win-filters.page                             |  217 +++++
 doc/C/win-main.page                                |  877 +++++++++++++++++++
 doc/C/win-message.page                             |   70 ++
 doc/C/win-run-filters.page                         |   84 ++
 doc/C/win-search.page                              |   59 ++
 doc/ChangeLog                                      |  139 +++-
 doc/Makefile.am                                    |   46 +-
 doc/de/ab-conf.page                                |  115 +++
 doc/de/authors.page                                |  143 ++++
 doc/de/common-tasks.page                           |  187 ++++
 doc/de/folder-config.page                          |  187 ++++
 doc/de/getting-started.page                        |   51 ++
 doc/de/glossary.page                               |  129 +++
 doc/de/identities.page                             |  253 ++++++
 doc/de/index.page                                  |   68 ++
 doc/de/introduction.page                           |   52 ++
 doc/de/its-not-working.page                        |  108 +++
 doc/de/mbox-formats.page                           |   72 ++
 doc/de/preferences-address-books.page              |  105 +++
 doc/de/preferences-display-options.page            |  286 +++++++
 doc/de/preferences-incoming-and-outgoing-mail.page |  191 +++++
 doc/de/preferences-mail-options.page               |  291 +++++++
 doc/de/preferences-miscellaneous.page              |   90 ++
 doc/de/preferences-spelling.page                   |  103 +++
 doc/de/preferences-startup.page                    |   69 ++
 doc/de/preferences.page                            |   46 +
 doc/de/toolbar-prefs.page                          |   66 ++
 doc/de/win-composer.page                           |  758 +++++++++++++++++
 doc/de/win-filters.page                            |  237 ++++++
 doc/de/win-main.page                               |  890 +++++++++++++++++++
 doc/de/win-message.page                            |   90 ++
 doc/de/win-run-filters.page                        |  104 +++
 doc/de/win-search.page                             |   79 ++
 doc/es/ab-conf.page                                |  121 +++
 doc/es/authors.page                                |  143 ++++
 doc/es/common-tasks.page                           |  187 ++++
 doc/es/folder-config.page                          |  193 +++++
 doc/es/getting-started.page                        |   51 ++
 doc/es/glossary.page                               |  133 +++
 doc/es/identities.page                             |  263 ++++++
 doc/es/index.page                                  |   60 ++
 doc/es/introduction.page                           |   52 ++
 doc/es/its-not-working.page                        |  108 +++
 doc/es/mbox-formats.page                           |   72 ++
 doc/es/preferences-address-books.page              |  109 +++
 doc/es/preferences-display-options.page            |  287 +++++++
 doc/es/preferences-incoming-and-outgoing-mail.page |  193 +++++
 doc/es/preferences-mail-options.page               |  305 +++++++
 doc/es/preferences-miscellaneous.page              |   90 ++
 doc/es/preferences-spelling.page                   |  107 +++
 doc/es/preferences-startup.page                    |   71 ++
 doc/es/preferences.page                            |   46 +
 doc/es/toolbar-prefs.page                          |   66 ++
 doc/es/win-composer.page                           |  782 +++++++++++++++++
 doc/es/win-filters.page                            |  237 ++++++
 doc/es/win-main.page                               |  897 ++++++++++++++++++++
 doc/es/win-message.page                            |   90 ++
 doc/es/win-run-filters.page                        |  104 +++
 doc/es/win-search.page                             |   79 ++
 doc/fr/ab-conf.page                                |  115 +++
 doc/fr/authors.page                                |  143 ++++
 doc/fr/common-tasks.page                           |  187 ++++
 doc/fr/folder-config.page                          |  176 ++++
 doc/fr/getting-started.page                        |   51 ++
 doc/fr/glossary.page                               |  119 +++
 doc/fr/identities.page                             |  242 ++++++
 doc/fr/index.page                                  |   60 ++
 doc/fr/introduction.page                           |   52 ++
 doc/fr/its-not-working.page                        |  105 +++
 doc/fr/mbox-formats.page                           |   72 ++
 doc/fr/preferences-address-books.page              |  105 +++
 doc/fr/preferences-display-options.page            |  279 ++++++
 doc/fr/preferences-incoming-and-outgoing-mail.page |  173 ++++
 doc/fr/preferences-mail-options.page               |  271 ++++++
 doc/fr/preferences-miscellaneous.page              |   90 ++
 doc/fr/preferences-spelling.page                   |   93 ++
 doc/fr/preferences-startup.page                    |   69 ++
 doc/fr/preferences.page                            |   46 +
 doc/fr/toolbar-prefs.page                          |   63 ++
 doc/fr/win-composer.page                           |  729 ++++++++++++++++
 doc/fr/win-filters.page                            |  237 ++++++
 doc/fr/win-main.page                               |  890 +++++++++++++++++++
 doc/fr/win-message.page                            |   84 ++
 doc/fr/win-run-filters.page                        |  104 +++
 doc/fr/win-search.page                             |   79 ++
 doc/sl/ab-conf.page                                |  115 +++
 doc/sl/authors.page                                |  143 ++++
 doc/sl/common-tasks.page                           |  187 ++++
 doc/sl/folder-config.page                          |  176 ++++
 doc/sl/getting-started.page                        |   51 ++
 doc/sl/glossary.page                               |  123 +++
 doc/sl/identities.page                             |  242 ++++++
 doc/sl/index.page                                  |   60 ++
 doc/sl/introduction.page                           |   52 ++
 doc/sl/its-not-working.page                        |  105 +++
 doc/sl/mbox-formats.page                           |   72 ++
 doc/sl/preferences-address-books.page              |  105 +++
 doc/sl/preferences-display-options.page            |  279 ++++++
 doc/sl/preferences-incoming-and-outgoing-mail.page |  173 ++++
 doc/sl/preferences-mail-options.page               |  271 ++++++
 doc/sl/preferences-miscellaneous.page              |   90 ++
 doc/sl/preferences-spelling.page                   |   93 ++
 doc/sl/preferences-startup.page                    |   69 ++
 doc/sl/preferences.page                            |   46 +
 doc/sl/toolbar-prefs.page                          |   63 ++
 doc/sl/win-composer.page                           |  729 ++++++++++++++++
 doc/sl/win-filters.page                            |  237 ++++++
 doc/sl/win-main.page                               |  890 +++++++++++++++++++
 doc/sl/win-message.page                            |   84 ++
 doc/sl/win-run-filters.page                        |  104 +++
 doc/sl/win-search.page                             |   79 ++
 132 files changed, 23275 insertions(+), 4 deletions(-)
---
diff --git a/doc/C/ab-conf.page b/doc/C/ab-conf.page
new file mode 100644
index 0000000..539feee
--- /dev/null
+++ b/doc/C/ab-conf.page
@@ -0,0 +1,103 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="ab-conf">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+<title>Address Book Configuration</title>
+  <p>This is to be filled in.</p>
+
+<section id="CHOICE">
+  <title>Address book type</title>
+  <p>You can choose among several address book types.</p>
+</section>
+
+<section id="EXTERN">
+<title>External address book</title>
+<!-- Balsa support for an external query addressbook -->
+<!-- By Jelmer Vernooij <jelmer nl linux org>        -->
+
+<p>The balsa addressbook supports input from programs. Thus, you
+can use (no importing needed!) for example your pine or mutt
+addressbook. The mutt mailer (<link
+href="http://www.mutt.org/";>www.mutt.org</link>) uses an identical
+system to retrieve addresses from programs.</p>
+
+  <section id="extern-existing-programs">
+   <title>Existing programs</title>
+
+<p>The following programs are compatible with the mutt mail reader
+and <em>should</em> be with balsa. Submit links to more programs.</p>
+
+<list>
+<item><p>
+<link href="http://www.spinnaker.de/lbdb/";
+       type="http">http://www.spinnaker.de/lbdb/</link> - The little
+brother database. Read emailaddresses and names from: finger,
+/etc/passwd, incoming procmail email, NIS, fido, the abook program,
+mutt addressbook, pine addressbook, palm addressbook, gnomecard
+addressbook, big brother database, ldap database.
+</p></item>
+
+<item><p>
+<link href="http://www.fiction.net/blong/programs/mutt/";>http://www.fiction.net/blong/programs/mutt/</link>
+ - palm address database, ldapsearch wrapper, ph/qi server, UIUC, ph,
+</p></item>
+</list>
+</section>
+
+<section id="extern-load-scripts">
+<title>Writing your own load scripts</title>
+
+<p>&Balsa; ignores the first line of output from your program. You
+might want to write comments or debug output on this line. The
+remaining lines should have this format:</p>
+<p><output>
+e-mail address full name       nickname
+</output></p>
+
+<p>The three fields should be separated by tabs. The third field is
+currently not used by balsa, but might be in the future. It is also
+kept to ensure compatibility with mutt. </p>
+
+<p>&Balsa; executes your script with one argument: the pattern to
+search for. A space (" ") is used as the first argument when creating
+a list of all users.</p>
+
+<p>All characters are allowed, except the tab (\t), since that
+is the field separator.
+</p>
+
+<p>An example output could be:</p>
+<p><output>
+lbdbq: 3 matches
+</output></p>
+<p><output>
+balsa-list gnome org   Balsa List      balsa-list
+</output></p><p><output>
+jelmer nl linux org    Jelmer Vernooij jelmer
+</output></p><p><output>
+balsa-maintainer theochem kth se       Pawel Salek     balsa-maintainer
+</output></p>
+
+
+<note><p>Your script/program should write its output to stdout and not
+to stderr!
+</p></note>
+</section>
+
+<section id="extern-save-scripts">
+<title>Writing your own save scripts</title>
+
+<p>Adding addresses is also possible. Your script should receive 3
+arguments. The first is an email address, the second a full name and
+the third is an alias (currently not used and replaced by 'TODO').</p>
+
+<p>Note that mutt does not have support for adding addresses and there is thus no compatibility in this 
case.</p>
+
+<p>Comments are welcome:
+<link href="mailto:jelmer nl linux org">jelmer nl linux org</link></p>
+</section>
+</section> <!-- EXTERN -->
+</page>
diff --git a/doc/C/authors.page b/doc/C/authors.page
new file mode 100644
index 0000000..81b7a42
--- /dev/null
+++ b/doc/C/authors.page
@@ -0,0 +1,123 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="authors">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>Authors</title>
+  <p>&Balsa; is currently developed by (in alphabetical
+  order):</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Carlos Morgado (
+      <link href="mailto:chbm chbm nu">chbm chbm nu</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+  </list>
+  <p>In the past, numerous people contributed to balsa, including
+  (in alphabetical order):</p>
+  <list>
+    <item>
+      <p>Hector Garcia Alvarez (
+      <link href="mailto:hector scouts-es org">
+      hector scouts-es org</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Bruno Pires Marinho (
+      <link href="mailto:bapm camoes rnl ist utl pt">
+      bapm camoes rnl ist utl pt</link> )</p>
+    </item>
+    <item>
+      <p>Jay Painter (
+      <link href="mailto:jpaint gimp org">
+      jpaint gimp org</link> )</p>
+    </item>
+    <item>
+      <p>Stuart Parmenter (
+      <link href="mailto:pavlov pavlov net">
+      pavlov pavlov net</link> )</p>
+    </item>
+    <item>
+      <p>David Pickens (
+      <link href="mailto:dpickens iaesthetic com">
+      dpickens iaesthetic com</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>To find more information about it, please visit the
+  &Balsa;
+  <link href="http://balsa.gnome.org/";>Web page</link>. Please send
+  all comments, suggestions, and bug reports to the
+  <link href="http://bugs.gnome.org/";>GNOME bug tracking
+  database</link>. Instructions for submitting bug reports can be
+  found on-line at
+  <link href="http://balsa.gnome.org/bugs.html";>
+  http://balsa.gnome.org/bugs.html</link>. If you are using GNOME
+  1.1 or later, you can also use command
+  <cmd>bug-buddy</cmd> for submitting bug reports.</p>
+  <p>The following people contributed to this manual:</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Berend De Schouwer (
+      <link href="mailto:bds jhb ucs co za">
+      bds jhb ucs co za</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Craig Routledge (
+      <link href="mailto:webstuff craigroutledge com">
+      webstuff craigroutledge com</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+    <item>
+      <p>Jelmer Vernooij (
+      <link href="mailto:jelmer nl linux org">
+      jelmer nl linux org</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>Please send all comments and suggestions regarding the manual
+  to the GNOME Documentation Project at
+  <link href="mailto:docs gnome org">docs gnome org</link> and the
+  <link href="http://mail.gnome.org/mailman/listinfo/balsa-list";>
+  &Balsa; Discussion List</link>. You can also add your
+  comments online by using
+  <link href="http://library.gnome.org/devel/gdp-handbook/stable/gettingstarted.html.en";>
+  GNOME Documentation Status Table</link>.</p>
+</page>
diff --git a/doc/C/balsa.entities b/doc/C/balsa.entities
new file mode 100644
index 0000000..9e05f7a
--- /dev/null
+++ b/doc/C/balsa.entities
@@ -0,0 +1,32 @@
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number-->
+<!ENTITY version "2.5">
+<!ENTITY Balsa
+    '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt
+    '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard
+    '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine
+    '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail
+    '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG
+    '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist
+    "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP
+    '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP
+    '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3
+    '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP
+    '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD
+    '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
diff --git a/doc/C/common-tasks.page b/doc/C/common-tasks.page
new file mode 100644
index 0000000..0163fa5
--- /dev/null
+++ b/doc/C/common-tasks.page
@@ -0,0 +1,168 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="common-tasks">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>Common Tasks with &Balsa;</title>
+  <p>This section explains many of the things you might want to do
+  with &Balsa;.</p>
+  <list>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-create-new-mb">Creating new
+        mailboxes</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-move-msg">Moving messages around</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-main-folder-imap">Making one of the main
+        folders IMAP-based</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-alias-expansion">Expanding e-mail
+        addresses automatically</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-ldap">Setting up LDAP address
+        books</link>
+      </p>
+    </item>
+  </list>
+  <section id="ct-create-new-mb">
+    <title>Creating New Mailboxes</title>
+    <p>You can create new local and &IMAP; mailboxes
+    using the <guiseq><gui>File</gui><gui>New</gui></guiseq> command, or
+    by
+    right-clicking in the mailbox list and selecting
+    <gui>New Mailbox</gui>.
+    This will start a dialog that will let you name the mailbox and
+    specify its location.</p>
+    <p>To create a new &POP3; mailbox, go to the <link
+    xref="preferences">preferences window</link>,
+    select the <gui>Mail options</gui> page, and click <gui>Add</gui>
+    in the <gui>Remote mailbox servers</gui>
+    area. A dialog will be displayed that will let you set up the
+    new mailbox.</p>
+  </section>
+  <section id="ct-move-msg">
+    <title>Moving Messages</title>
+    <p>There are several methods available for moving or copying
+    messages from one mailbox to another. The first is via the
+    <gui>Transfer</gui> context menu, and the second is using drag
+    and drop.</p>
+    <p>To transfer messages using the
+    <gui>Transfer</gui> menu, simply select the messages you desire
+    to move from one mailbox, then press
+    <keyseq><key>Shift</key><key>F10</key></keyseq> or <key>Menu</key>,
+    or click the right
+    mouse button,
+    to bring up the context menu and
+    select the
+    <gui>Move to</gui> submenu. This will display a list of
+    mailboxes similar to the mailbox list in the main window. The
+    list can be scrolled and trees expanded and collapsed, although
+    these changes will not be reflected in the main list. Selecting
+    a mailbox will start the transfer.</p>
+    <p>The other method of transferring messages is to simply drag
+    and drop the message(s) from the message index to the desired
+    destination. Select the message(s) you wish to transfer, then
+    drag them using the mouse until they are over the intended
+    mailbox. The destination can either be in the mailbox list in
+    the main window, or if open mailbox tabs are enabled the
+    messages can be dragged to them.  </p>
+  </section>
+  <section id="ct-main-folder-imap">
+    <title>I want one of the main folders to be IMAP</title>
+    <p>First, create the IMAP folder as you want it configured.
+    Then, press right mouse button on the mailbox entry and select
+    <gui>Mark as Inbox</gui>. That is all!</p>
+  </section>
+  <section id="ct-alias-expansion">
+    <title>I want Balsa to guess my friends</title>
+    <p>&Balsa; can expand the names of your contacts it finds
+    in &Balsa; addressbooks. It will do this by any part of the
+    contact's name or email address.</p>
+    <p>As you type a username in any of the To:, Cc:, or Bcc: entry
+    boxes in the
+    <link xref="win-composer">Compose window</link>, it will do
+    a case insensitive search in the addressbook for a matching
+    username, and pop up a list of matching complete addresses.
+    Press
+    <key>Cursor-Down</key> to highlight one of the addresses, and
+    <key>Enter</key> to select it.</p>
+    <!--
+  This is best demonstrated
+  with the following picture:</p>
+
+  <figure>
+    <title>Expanding Aliases</title>
+    <screenshot>
+          <mediaobject>
+            <imageobject><imagedata
+                fileref="figures/example-alias.png" format="PNG"/>
+            </imageobject>
+          </mediaobject>
+    </screenshot>
+  </figure>
+
+  <p>The example shows what it looks like if "Balsa Mailing
+  List" is in your address book, and you have typed
+  &quot;ba&quot;</p>
+-->
+    <p>To enable this feature, you must select which address books
+    you wish to be searched for aliases to expand. This can be done
+    in the
+    <link xref="preferences-address-books">
+    Preferences</link> window, on the
+    <gui>Address Books</gui> page. Also, some address books are
+    expensive to lookup. You will need then to press
+    <key>Escape</key> to explicitly expand the alias.</p>
+  </section>
+  <section id="ct-ldap">
+    <title>Setting up LDAP address books</title>
+    <p>Only steps crucial for &Balsa; are described here. Some
+    of the steps may be specific to OpenLDAP server. Whenever in
+    doubt, consult the documentation provided with your LDAP
+    server.</p>
+    <list>
+      <item>
+        <p>Install the LDAP server software.</p>
+      </item>
+      <item>
+        <p>Configure. In the case of OpenLDAP, edit
+        <file>/etc/openldap/ldap.conf</file> and
+        <file>/etc/openldap/slapd.conf</file>. Consult your LDAP
+        configuration and other sources to choose the right Domain
+        Name for your institution and authentication level
+        apriopriate to your environment.</p>
+      </item>
+      <item>
+        <p>Import data to your LDAP server. OpenLDAP comes with a
+        set of migration tools but they do not create directly
+        objects of standard
+        <code>inetOrgPerson</code> class which is an apropriate type
+        for address book entry. You may need to tune them.</p>
+      </item>
+    </list>
+    <p>&Balsa; searches for objects having
+    <sys>mail</sys> attribute. The search is done on the
+    <sys>cn</sys> attribute and the search filter has a form
+    "(&amp;(mail=*)(cn=John D))". &Balsa; uses
+    <sys>cn</sys>(common name),
+    <sys>givenName</sys>(given name),
+    <sys>sn</sys>(surname) and
+    <sys>mail</sys>(e-mail address) attributes of the found
+    objects.</p>
+  </section>
+</page>
diff --git a/doc/C/folder-config.page b/doc/C/folder-config.page
new file mode 100644
index 0000000..ec5e37f
--- /dev/null
+++ b/doc/C/folder-config.page
@@ -0,0 +1,173 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="folder-config">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>IMAP Folder Configuration</title>
+  <p>The folder configuration edit dialog allows you to configure
+  entire mailbox sets on remote IMAP servers. Entire configuration
+  is split into basic and advanced parts.</p>
+  <section>
+    <title>Basic IMAP folder configuration</title>
+    <p>The basic IMAP folder configuration tab is probably the only
+    part you need to fill in.</p>
+    <list>
+      <item>
+        <p>Descriptive name is the name of the root node that will
+        be shown in the mailbox tree on the left side.</p>
+      </item>
+      <item>
+        <p>Server is the host name or IP number of the IMAP
+        server.</p>
+      </item>
+      <item>
+        <p>User name is the name used for authorization on the IMAP
+        server.</p>
+      </item>
+      <item>
+        <p>Some servers allow anonymous access to bulletin boards
+        or mailing list archives. Check this box if you want to use
+        this mode - you will not be asked for password.</p>
+      </item>
+      <item>
+        <p>Password is the password used for authorization on the
+        IMAP server.</p>
+      </item>
+      <item>
+        <p>Check box allows you to choose all mailboxes on the
+        server, or only those you subscribed to.</p>
+      </item>
+      <item>
+        <p>Prefix is the root mailbox on the server. You may leave
+        it empty if you want to show all the folders on your server
+        but if your IMAP server stores also other kind of files you
+        may specify for instance "mail".</p>
+      </item>
+    </list>
+  </section>
+  <section>
+    <title>Advanced IMAP folder configuration</title>
+    <p>Sometimes, it is necessary to tune the folder configuration
+    in order to assure a secure connection, adjust to server limits
+    or just obtain better performance. This functionality is
+    provided by the Advanced IMAP folder configuration tab.</p>
+    <list>
+      <item>
+        <p>The
+        <gui>Use SSL</gui> check box should be active if the
+        connection is to be made to IMAPS service on port 993.
+        Connection to this port will be encrypted from the start.
+        Not all servers provide this service - many provide only
+        negotiated TLS encryption.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use TLS</gui> option list determines instruct balsa how
+        to negotiate the TLS encryption. &Balsa; can never
+        attempt to negotiate it, can start TLS encryption whenever
+        it is supported by server, or can abort the connection if
+        TLS is inavailable or fails for some reason.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Max. number of connections</gui> limits the number of
+        concurrent connections open to the IMAP server. A number
+        around 15-40 is a sane option as it avoids time-consuming
+        and load-creating reselections of imap mailboxes. Some IMAP
+        servers -- notably Courier -- limit the number of
+        connections open from single IP number to 4 by default. The
+        limit in balsa has to be in such a case adjusted
+        accordingly.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Enable persistent cache</gui> check box chooses whether
+        &Balsa; should try to store downloaded messages between
+        sessions or throw them away when it is closed. The optimal
+        choice depends on the local configuration. If the
+        connection to the IMAP server is slow and local storage in
+        the home directory fast and cheap, it is recommended to
+        enable persistent message cache. If the home directory is
+        slow (eg. NFS-mounted) and the connection to the imap
+        server - fast, persistent cache becomes just a burden and
+        should be disabled.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use IDLE command</gui> check box chooses whether
+        &Balsa; should try to use IDLE command when available.
+        With this command, some servers notify immediately when a
+        new command arrives. Also, this command may reduce the
+        amount of network traffic. There are some downsides, too:
+        some firewalls do not track IMAP connections correctly and
+        will incorrectly interrupt a session in an IDLE state. In
+        particular, home-grade network routers with NAT translation
+        have notoriously this bug. In such case, it may be safer to
+        disable this command.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Enable bug workarounds</gui> check box makes
+        &Balsa; work even with an IMAP server that cannot
+        provide selected message parts. &Balsa; in such a case
+        will try to fetch entire messages instead.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use STATUS for mailbox checking</gui> check box enables
+        a more thorough but potentially more expensive way of
+        checking mailboxes on IMAP server. This method can be
+        consume many resources on the server and should be used
+        <em>only</em> on IMAP servers that have optimized STATUS
+        command.</p>
+      </item>
+    </list>
+  </section>
+  <section id="subfolder-config">
+    <title>IMAP Subfolder Properties</title>
+    <p>The subfolder properties dialog allows you to manage folders
+    on remote IMAP servers. Specifically, you can
+    <em>create</em> a new subfolder,
+    <em>rename</em> an existing subfolder, or
+    <em>move</em> a subfolder within the folder tree.</p>
+    <list>
+      <item>
+        <p>
+        <gui>Folder name</gui> is how the folder is shown in the
+        mailbox tree on the left side.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Subfolder of</gui> indicates the immediate parent of
+        the folder.</p>
+      </item>
+    </list>
+    <p>When the dialog is opened from
+    <guiseq>
+      <gui>File</gui>
+      <gui>New</gui>
+      <gui>Remote IMAP subfolder</gui>
+    </guiseq>, you can enter the folder name and browse IMAP trees
+    to find the parent folder. If you had already selected a
+    mailbox in an IMAP tree, only that tree is shown for browsing;
+    otherwise, all IMAP trees will be shown.</p>
+    <p>When the dialog is opened from
+    <guiseq>
+      <gui>Mailbox</gui>
+      <gui>Edit</gui>
+    </guiseq> with an IMAP folder selected, or by right-clicking on
+    an IMAP mailbox and selecting
+    <gui>Properties...</gui>, the mailbox may be:</p>
+    <list>
+      <item>
+        <p>Renamed, by editing the folder name;</p>
+      </item>
+      <item>
+        <p>Moved, by browsing for a different parent folder in the
+        same tree.</p>
+      </item>
+    </list>
+  </section>
+</page>
diff --git a/doc/C/getting-started.page b/doc/C/getting-started.page
new file mode 100644
index 0000000..96569d2
--- /dev/null
+++ b/doc/C/getting-started.page
@@ -0,0 +1,31 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa;]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="getting-started">
+  <info>
+    <link type="guide" xref="index" />
+    <link type="next" xref="win-main" />
+  </info>
+  <title>Getting Started with &Balsa;</title>
+  <p>If you're starting &Balsa; for the first time, the first
+  thing you'll see is an assistant that will set up &Balsa;'s
+  basic settings. &Balsa; can guess most of what it needs to
+  know about you. It will also create five standard local
+  mailboxes: the Inbox, Outbox, Sentbox, Draftbox, and Trash.
+  (These can be changed to be &IMAP; mailboxes later.)</p>
+  <figure>
+    <media type="image" src="figures/druid-start.png" />
+    <title>&Balsa; Start Assistant</title>
+  </figure>
+  <p>Don't worry. &Balsa; cooperates with other
+  <link xref="glossary#mua">MUA</link>'s very well. They share the
+  same locking semantics for mailboxes. If &Balsa; shares the
+  same mail directory as &Pine; or &Mutt;, it will detect
+  new folders as they are created. So if you have to telnet in to
+  your mail machine, you won't be stuck.</p>
+  <p>There are many more settings in &Balsa;'s
+  <link xref="preferences">preferences window</link>, but most of
+  them do not need to be changed.</p>
+  <p>Once &Balsa; is configured, you will proceed on to the
+  <link xref="win-main">main window</link>.</p>
+</page>
diff --git a/doc/C/glossary.page b/doc/C/glossary.page
new file mode 100644
index 0000000..f7ae62f
--- /dev/null
+++ b/doc/C/glossary.page
@@ -0,0 +1,113 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="glossary">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>Glossary</title>
+    <section id="pop">
+      <title>POP</title>
+      <p>An acronym for "Post Office Protocol", a simple method of
+      retrieving mail messages from a remote mail server. Widely
+      used by mail clients from an Internet Service Provider's mail
+      server to a user's machine for viewing. Currently most people
+      use version three of the protocol, otherwise known as POP3. A
+      very simple protocol, and not very flexible, but simple to
+      implement and ubiquitous throughout the internet.</p>
+    </section>
+    <section id="imap">
+      <title>IMAP</title>
+      <p>An acronym that stands for "Internet Mail Access
+      Protocol". It is a newer method of accessing mail over the
+      internet. It is far more featureful than &POP3;, allowing
+      for remote folders on the mail server, and more control over
+      mail delivery. However it is not as widely supported.</p>
+    </section>
+    <section id="ldap">
+      <title>LDAP</title>
+      <p>An acronym for "Lightweight Directory Access Protocol". It
+      is a widely-accepted standard for accessing contact
+      information over a network. This enables organizations to
+      store address information in a central database, but have
+      many people able to access it.</p>
+    </section>
+    <section id="libmutt">
+      <title>libmutt</title>
+      <p>The library based on Mutt's code and used by previous
+      versions of &Balsa; to handle local mail and IMAP
+      servers.</p>
+    </section>
+    <section id="mailbox-list">
+      <title>mailbox list</title>
+      <p>The list of mailboxes found in &Balsa;'s left hand
+      pane.</p>
+    </section>
+    <section id="message-index">
+      <title>message index</title>
+      <p>The list of messages in &Balsa;'s upper-right hand
+      pane.</p>
+    </section>
+    <section id="message-view">
+      <title>message view</title>
+      <p>The message display in &Balsa;'s lower-right hand
+      pane.</p>
+    </section>
+    <section id="mda">
+      <title>MDA</title>
+      <p>An acronym for "Mail Delivery Agent", this type of program
+      is also known as a Local Delivery Agent (LDA). It is
+      responsible for delivering the mail recieved for someone on a
+      machine to the mail folder of that person. &procmail; is
+      an example of this type of program, although many
+      <link xref="glossary#mta">MTA</link>'s have their own
+      MDA implementations.</p>
+    </section>
+    <section id="mta">
+      <title>MTA</title>
+      <p>An acronym for "Mail Transfer Agent", this class of
+      program is responsible for moving mail around between people,
+      be they on the same computer, on on completely separate
+      networks. Examples of this type of program include
+      <app>sendmail</app>,
+      <app>qmail</app>, and
+      <app>postfix</app>.</p>
+    </section>
+    <section id="mua">
+      <title>MUA</title>
+      <p>An acronym for "Mail User Agent", this the program a user
+      would use to read existing mail and create new messages. MUAs
+      are one of three types of programs that allow internet email
+      to work. The other two types of programs are
+      <link xref="glossary#mta">MTA</link> s and
+      <link xref="glossary#mda">MDA</link> s. &Balsa; is
+      primarily an MUA, but it also functions as an MDA/MTA when
+      retrieving mail from a remote server.</p>
+    </section>
+    <section id="regular-expression">
+      <title>Regular Expression</title>
+      <p>Often abbreviated as a
+      <em>regexp</em>, this is a method of specifing a pattern to
+      match in text. Both very simple and very complex patterns can
+      be easily matched using this method. For information on how
+      to understand and construct regular expressions the best
+      source is the
+      <cmd>grep</cmd> manual or info page.</p>
+    </section>
+    <section id="smtp">
+      <title>SMTP</title>
+      <p>An acronym that stands for "Simple Mail Transfer
+      Protocol", it is exactly that. A standard that defines a
+      simple an reliable way to transfer messages between computers
+      on a network. It is used by most, if not all, mail programs
+      to transfer mail.</p>
+    </section>
+    <section id="vcard">
+      <title>VCARD</title>
+      <p>VCARD is a standard method of storing contact information
+      for easy exchange between programs. &Balsa; supports
+      VCARD addressbooks, as does GnomeCard and Evolution. Many
+      other programs are capable of exporting their contact lists
+      in VCARD format as well.</p>
+    </section>
+</page>
diff --git a/doc/C/identities.page b/doc/C/identities.page
new file mode 100644
index 0000000..ef9d67c
--- /dev/null
+++ b/doc/C/identities.page
@@ -0,0 +1,243 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="identities">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>Identities</title>
+  <p>This dialog window lets you specify how you present yourself
+  to the rest of the world through your email. The first page has
+  your general information:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Identity Name</gui>
+      </title>
+      <p>A unique title by which this identity will be named within
+      &Balsa;.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Full Name</gui>
+      </title>
+      <p>This doesn't
+      <em>have</em> to be your name, I guess. But it's the word
+      prefixing your email address in mail you send.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Mailing Address</gui>
+      </title>
+      <p>As you wish it to appear in your "From" header.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Reply-To address</gui>
+      </title>
+      <p>The address that you wish people to reply to your email
+      with (if you have a home and a work address, for
+      instance).</p>
+    </item>
+    <item>
+      <title>
+        <gui>Default Domain</gui>
+      </title>
+      <p>The domain that you wish to append to all e-mail entries
+      where you did not specify the domain. Normally you would use
+      your local domain. You need to enable
+      <link xref="preferences-address-books">Alias
+      Expansion</link> for this to work.</p>
+    </item>
+  </terms>
+  <p>The "Messages" page shows various initial settings for the new
+  message:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Bcc</gui>
+      </title>
+      <p>The default value for the blind-carbon-copy field when
+      using this identity. Useful if you want to always send a copy
+      of outgoing mail to another account.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Reply String</gui>
+      </title>
+      <p>The prefix for the subject line when replying to a
+      message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Forward String</gui>
+      </title>
+      <p>The prefix for the subject line when forwarding a
+      message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Request Message Disposition Notification</gui>
+      </title>
+      <p>Whether Message Disposition Notification should be
+      requested by default.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Face Path</gui>
+      </title>
+      <p>Whether a "Face" header should be attached to a program.
+      Specified path points out to a file containing a textual
+      representation of the face icon. Please see
+      <link href="http://quimby.gnus.org/circus/face/";>a
+      description of Face and X-Face</link> headers for more details
+      as well as the list of mail programs supporting this
+      feature.</p>
+    </item>
+    <item>
+      <title>
+        <gui>X-Face Path</gui>
+      </title>
+      <p>Whether a "Face" header should be attached to a program.
+      Specified path points out to a file containing a textual
+      representation of the face icon.</p>
+    </item>
+    <item>
+      <title>
+        <gui>SMTP server</gui>
+      </title>
+      <p>The
+      <link xref="preferences-mail-options#smtp-server-config">
+      SMTP server</link> to be
+      used for this identity.</p>
+    </item>
+  </terms>
+  <p>You control the signature that &Balsa; appends to your
+  messages on the "Signature" page:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Signature Path</gui>
+      </title>
+      <p>The file containing the signature to append to all your
+      messages. This can be generated in one of three ways:</p>
+      <list>
+        <item>
+          <p>From a regular file. List the path to any regular
+          file, and the text from that file will be appended to
+          your messages.</p>
+        </item>
+        <item>
+          <p>A named pipe or FIFO. In this case, to &Balsa;,
+          the file looks normal, but in reality, it is a pipe to a
+          program that is generating the content. List the path to
+          the pipe.</p>
+        </item>
+        <item>
+          <p>An executable program. &Balsa; will execute the
+          program and read its output, appending that text to the
+          message. List the path to the program with a "|"
+          prepended to it. For example:</p>
+          <p>"|/home/user/dynsig.pl"</p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <title>
+        <gui>Execute Signature</gui>
+      </title>
+      <p>Execute the instructions in the signature file and use the
+      results as the signature to append to outgoing mail. Select
+      this when generating the signature from an executable program
+      as outlined above in Signature Path.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature</gui>
+      </title>
+      <p>Append the signature to the end of all outgoing mail.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature When Forwarding</gui>
+      </title>
+      <p>Add the signature when forwarding an existing mail.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature When Replying</gui>
+      </title>
+      <p>Add the signature when replying to a existing message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Add Signature Separator</gui>
+      </title>
+      <p>When checked, this has &Balsa; insert the standard
+      signature separator before your signature.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Prepend Signature</gui>
+      </title>
+      <p>Add the signature before the message text, rather than
+      after it.</p>
+    </item>
+  </terms>
+  <p>Security settings are on the fourth page:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Sign messages by default.</gui>
+      </title>
+      <p>By default enable the cryptographic signature for every
+      new message. The default protocol is determined by the
+      "Default protocol" option.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Encrypt messages by default.</gui>
+      </title>
+      <p>By default encrypt every new message. The default protocol
+      is determined by the "Default protocol" option.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Default protocol.</gui>
+      </title>
+      <p>Choose the default protocol for the cryptographic
+      signature and message encryption.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Always trust GnuPG keys when encrypting.</gui>
+      </title>
+      <p>Do not ask for confirmation when encrypting for a
+      recipient whose GnuPG key is not fully trusted.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Remind me if messages can be encrypted.</gui>
+      </title>
+      <p>Before sending a message, check if valid keys are present
+      for all recipients and show a dialog in this case.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Use secret key with this id for signing.</gui>
+      </title>
+      <p>Usually, &Balsa; automatically selects a proper secret
+      key for cryptographic signatures from the identity's mail
+      address. Therefore, most users should leave this entry empty.
+      If you want to force using a specific secret key for
+      cryptographic signatures, enter the key id here. You can get
+      the key id by running the command
+      <cmd>gpg --list-secret-keys</cmd>.</p>
+    </item>
+  </terms>
+  <note>
+    <p>These security options are available only if &Balsa; is
+    built with
+    <app>GnuPG</app> support.</p>
+  </note>
+</page>
diff --git a/doc/C/index.page b/doc/C/index.page
new file mode 100644
index 0000000..17d8f95
--- /dev/null
+++ b/doc/C/index.page
@@ -0,0 +1,53 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa;]>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide"
+id="index">
+  <title>&Balsa; User's Guide</title>
+  <info>
+    <link type="next" xref="introduction"/>
+    <credit type="maintainer">
+      <name>Pawel Salek</name>
+    </credit>
+    <credit type="copyright">
+      <name>Stuart Parmenter and others, see AUTHORS for a list of
+      people</name>
+      <years>1997-2013</years>
+    </credit>
+    <license>
+      <p>Permission is granted to make and distribute verbatim
+      copies of this manual provided the copyright notice and this
+      permission notice are preserved on all copies.</p>
+      <p>Permission is granted to copy and distribute modified
+      versions of this manual under the conditions for verbatim
+      copying, provided that the entire resulting derived work is
+      distributed under the terms of a permission notice identical
+      to this one.</p>
+      <p>Permission is granted to copy and distribute translations
+      of this manual into another language, under the above
+      conditions for modified versions, except that this permission
+      notice may be stated in a translation approved by the Free
+      Software Foundation.</p>
+      <p>UNIX is a trademark of X/Open Group.</p>
+      <p>Linux is a trademark of Linus Torvalds.</p>
+      <p>X Window System is a trademark of X Consortium, Inc.</p>
+      <p>Windows is a trademark of Microsoft Corp.</p>
+      <p>Macintosh and Apple are trademarks of Apple Computer,
+      Inc.</p>
+      <p>All other trademarks are property of their respective
+      owners.</p>
+    </license>
+  </info>
+  <p>&Balsa; is a graphical mail client. While it is in active
+  development, &Balsa; has many features such as: &IMAP;
+  and &POP3; support; sendmail or direct &SMTP; support;
+  optional multi-threaded retrieval and sending of messages;
+  support for all configurations of local mail folders; automatic
+  mail checking; mail printing; inline attachment viewing; and the
+  proverbial much, much more.</p>
+  <p>This document will introduce a person who understands mail to
+  using &Balsa;. However, it will not explain email to a
+  confused individual. If you're looking for that, try asking a
+  friend or visiting the
+  <link href="http://www.cs.queensu.ca/FAQs/email/"; type="http">
+  Email FAQ</link>.</p>
+</page>
diff --git a/doc/C/introduction.page b/doc/C/introduction.page
new file mode 100644
index 0000000..f2109db
--- /dev/null
+++ b/doc/C/introduction.page
@@ -0,0 +1,33 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa;]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="introduction">
+  <info>
+    <link type="guide" xref="index" />
+    <link type="next" xref="getting-started" />
+  </info>
+  <title>Introduction</title>
+  <media src="figures/balsa_logo.png" format="PNG"
+  srccredit="tigert" />
+  <p>&Balsa; is a graphical mail client. It supports the
+  standard features of any good reader and has new features added
+  continually. See the abstract above for a quick feature
+  rundown.</p>
+  <p>&Balsa; is written using GTK+ and GNOME. Originally based
+  on libmutt, the back end code to &Mutt;, &Balsa; now uses
+  a combination of GMime for handling Mime messages, and its own
+  drivers for local and remote mailstores.</p>
+  <p>If you want to learn more about &Balsa;, your best bet is
+  the mailing list
+  <code>balsa-list gnome org</code>, to which you can subscribe by
+  going to the website
+  <link href="http://mail.gnome.org/mailman/listinfo/balsa-list";>
+  http://mail.gnome.org/mailman/listinfo/balsa-list</link> or by
+  sending a message with a subject of
+  <em>subscribe</em> to
+  <link href="mailto:balsa-list-request gnome org?subject=Subscribe">
+  balsa-list-request gnome org</link>. Bugs can be reported via
+  <app>bug-buddy</app> or to the
+  <link href="http://bugzilla.gnome.org/enter_bug.cgi?product=balsa";>
+  Gnome bug tool</link>.</p>
+</page>
diff --git a/doc/C/its-not-working.page b/doc/C/its-not-working.page
new file mode 100644
index 0000000..abf45c6
--- /dev/null
+++ b/doc/C/its-not-working.page
@@ -0,0 +1,88 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="its-not-working">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>It's not Working!!!</title>
+  <p>This is a FAQ for when &Balsa; appears to lock up, or
+  other things that you think should be happening aren't. If you
+  can't figure out how to do something but &Balsa; lets you do
+  it, that's a bug. Report it.</p>
+  <list>
+    <item>
+      <p>
+        <link xref="its-not-working#main-to-imap">i
+        I want one of the main
+        folders to be IMAP</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#frozen">
+        &Balsa;'s frozen!</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#spooky-win">
+        What's that window that flashed
+        on the screen?</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#address-book">
+        The address book doesn't
+        import my addresses.</link>
+      </p>
+    </item>
+  </list>
+  <section id="main-to-imap">
+    <title>I want a basic mailbox to use IMAP</title>
+    <p>See
+    <link xref="common-tasks#ct-main-folder-imap">this section</link>.</p>
+  </section>
+  <section id="frozen">
+    <title>&Balsa;'s frozen!</title>
+    <p>Odds are it isn't. Watch out for:</p>
+    <list>
+      <item>
+        <p>If you don't have threading, &Balsa; will stop
+        responding when it sends and receives email. Use threading,
+        if possible.</p>
+      </item>
+      <item>
+        <p>&Balsa; is downloading a new message or closing a
+        large mailbox. This could take a while, especially when
+        this file is accessed via NFS.</p>
+      </item>
+      <item>
+        <p>A dialog box is being displayed but it is obscured by
+        another one. This seems to happen under Sawfish. Try moving
+        the windows around and see if there's a hidden dialog
+        somewhere.</p>
+      </item>
+    </list>
+  </section>
+  <section id="spooky-win">
+    <title>What's that window that flashed on the screen?</title>
+    <p>Were you checking your mail? Probably. This is the window
+    that displays progress for retrieving &POP3; mail. If you
+    don't have any &POP3; accounts, it will still appear -- but
+    it'll disappear almost instantly. You can disable displaying
+    this window in preferences.</p>
+  </section>
+  <section id="address-book">
+    <title>The address book doesn't import my addresses.</title>
+    <p>&Balsa; attempts to open the file
+    <file>~/.gnome/GnomeCard.gcrd</file>. If you're not using this
+    file, you may need to create a symlink so that &Balsa; can
+    open it.</p>
+    <p>There have been slight changes in &GnomeCard;'s file
+    format between its various versions. &Balsa; is known to
+    work with at least &GnomeCard; version 1.0.10 and probably
+    most other releases.</p>
+  </section>
+</page>
diff --git a/doc/C/mbox-formats.page b/doc/C/mbox-formats.page
new file mode 100644
index 0000000..da1fd99
--- /dev/null
+++ b/doc/C/mbox-formats.page
@@ -0,0 +1,52 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="mbox-formats">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>Available Mailbox Formats</title>
+  <p>&Balsa; handles several mailbox formats, including mbox.
+  Further information can be found in the following documents:</p>
+  <terms>
+    <item>
+      <title>Benchmarking mbox versus maildir</title>
+      <p>
+        <link href="http://www.courier-mta.org/mbox-vs-maildir/";>
+        http://www.courier-mta.org/mbox-vs-maildir/</link>
+      </p>
+    </item>
+    <item>
+      <title>Mailbox Format Characteristics</title>
+      <p>
+        <link href="http://www.washington.edu/imap/documentation/formats.txt.html";>
+        http://www.washington.edu/imap/documentation/formats.txt.html</link>
+      </p>
+    </item>
+    <item>
+      <title>Maildir format</title>
+      <p>maildir(5) manual page (from qmail):
+      <link href="http://www.qmail.org/qmail-manual-html/man5/maildir.html";>
+      http://www.qmail.org/qmail-manual-html/man5/maildir.html</link></p>
+    </item>
+    <item>
+      <title>Using Maildir format</title>
+      <p>
+        <link href="http://cr.yp.to/proto/maildir.html";>
+        http://cr.yp.to/proto/maildir.html</link>
+      </p>
+    </item>
+    <item>
+      <title>QMail</title>
+      <p>mbox(5) manual page (from qmail):
+      <link href="http://www.qmail.org/qmail-manual-html/man5/mbox.html";>
+      http://www.qmail.org/qmail-manual-html/man5/mbox.html</link></p>
+    </item>
+    <item>
+      <title>Mailbox formats</title>
+      <p>(From Mail-Administrator HOWTO):
+      <link href="http://linuxdocs.org/HOWTOs/Mail-Administrator-HOWTO-3.html#ss3.5";>
+      http://linuxdocs.org/HOWTOs/Mail-Administrator-HOWTO-3.html#ss3.5</link></p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/C/preferences-address-books.page b/doc/C/preferences-address-books.page
new file mode 100644
index 0000000..97b92f6
--- /dev/null
+++ b/doc/C/preferences-address-books.page
@@ -0,0 +1,90 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities">%balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="preferences-address-books">
+  <info>
+    <link type="topic" xref="preferences" />
+    <link type="guide" xref="preferences" />
+  </info>
+  <title>Address Book Preferences</title>
+  <p>&Balsa; supports the use of multiple address books, both
+  local
+  <link xref="glossary#vcard">VCARD</link> and remote &LDAP;
+  address books, both of which can be configured here.
+  &GnomeCard; also uses VCARD address books, so this allows
+  &Balsa; to share address books with other GNOME
+  applications.</p>
+  <p>&Balsa; also supports LDIF address books, and can be built
+  to use GPE address books, when SQLite is available, and Rubrica
+  address books. Which types are supported depends on how
+  &Balsa; was built.</p>
+  <p>The main portion of the preferences page is occupied by the
+  list of current address books for &Balsa;. The list shows the
+  type of address book, the name, and whether it is included in
+  automatic alias expansion when typing new messages. There are
+  also several buttons that manipulate the list of address
+  books:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Add</gui>
+      </title>
+      <p>Using this adds a new address book for &Balsa; to use
+      to find addresses. If you click it, a drop-down menu of the
+      supported address book types is shown. Click one to begin the
+      process. &Balsa; pops up a dialog, which, if you choose
+      VCARD, looks like this:</p>
+      <figure>
+        <title>VCARD Address Book Dialog</title>
+        <media type="image" src="figures/address-book-vcard.png" />
+      </figure>
+      <p>With &LDAP; support, the dialog looks somewhat
+      different, offering options to set the location of the
+      directory instead of a file.</p>
+      <figure>
+        <title>&LDAP; Address Book Dialog</title>
+        <media type="image" src="figures/address-book-ldap.png" />
+      </figure>
+      <p>In order to use a LDAP address book, you need to know the
+      host name of the LDAP server. Depending on the server
+      configuration, you may need also so called Base Domain Name
+      which identifies your particular department. You can always
+      try leaving Base Domain Name field empty and a default value
+      will be used (OpenLDAP stores the default Base Domain Name in
+
+      <file>/etc/openldap/ldap.conf</file>). If this does not work,
+      you may need to ask your administrator for the value of this.
+      The usual values are usually similar to:
+      "dc=theochem,dc=KTH,dc=se" or "o=Theoretical Chemistry,
+      c=SE".</p>
+    </item>
+    <item>
+      <title>
+        <gui>Modify</gui>
+      </title>
+      <p>This enables you to change the properties of the selected
+      address book.</p>
+      <figure>
+        <title>Modify an Address Book</title>
+        <media type="image"
+        src="figures/address-book-modify.png" />
+      </figure>
+      <p>It is possible to modify both the name and location for
+      any address book. Also, you can change whether the contents
+      of the address book will be used when attempting to
+      auto-complete an address when sending a message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Delete</gui>
+      </title>
+      <p>Delete the selected address book.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Set as Default</gui>
+      </title>
+      <p>Set the selected address book as default.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/C/preferences-display-options.page b/doc/C/preferences-display-options.page
new file mode 100644
index 0000000..7906136
--- /dev/null
+++ b/doc/C/preferences-display-options.page
@@ -0,0 +1,267 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities">%balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="preferences-display-options">
+  <info>
+    <link type="topic" xref="preferences" />
+    <link type="guide" xref="preferences" />
+  </info>
+  <title>Display Preferences</title>
+  <p>This page controls how &Balsa; appears to you.</p>
+  <section>
+    <title>Main Window</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Use Preview Pane</gui>
+        </title>
+        <p>Set whether to use the preview pane to display messages,
+        or rely on the separate mail viewing window.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Show Mailbox Info</gui>
+        </title>
+        <p>This will allow the number of total and unread messages
+        for each mailbox to be shown in the left pane of the
+        &Balsa; main window. You can save space by not showing
+        them; if you choose not to show them, &Balsa; will then
+        show the number of unread messages (in parentheses) after
+        the mailbox name.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Alternative Layout</gui>
+        </title>
+        <p>&Balsa;'s default layout has a full-height mailbox
+        list on the left, and the message list above the preview
+        pane on the right. You can choose an alternative layout, in
+        which the mailbox list and the message list occupy the
+        upper part of the window, and the preview pane is
+        full-width below them.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatic View</gui>
+        </title>
+        <p>Select this option if you want &Balsa; to open the
+        first unread message when you open a mailbox. If no message
+        is unread, &Balsa; opens the most recent message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Page Up and Page Down</gui>
+        </title>
+        <p>By default, the 
+        <key>Page Up</key>and 
+        <key>Page Down</key>keys scroll the message by whole pages.
+        Use this option to choose a different amount.</p>
+      </item>
+    </terms>
+  </section>
+  <section>
+    <title>Message Window</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Moving a Message</gui>
+        </title>
+        <p>If you are reading a message in its own message window
+        and you move it (to the trash, or another mailbox),
+        &Balsa; can move on the next unread message or the next
+        message in the same mailbox, or simply close the
+        window.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="sort-and-thread">
+    <title>Sort and Thread</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Default sort column</gui>
+        </title>
+        <p>Choose the column by which you would like a new mailbox
+        to be sorted.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Default threading style</gui>
+        </title>
+        <p>Choose the default threading style for a new
+        mailbox.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Expand threads</gui>
+        </title>
+        <p>If you choose a threaded view of a mailbox, you can
+        decide whether the threads should be expanded or collapsed
+        when the mailbox is opened.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="message">
+    <title>Message</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Fonts</gui>
+        </title>
+        <p>Choose the fonts that you want to be used to display a
+        message. You can choose a distinct font for the message's
+        subject line.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Quoted Text Regular Expression</gui>
+        </title>
+        <p>The entry box allows you to set a
+        <link xref="glossary#regular-expression">regular
+        expression</link>you would like to use to identify text
+        that should be considered quoted for incoming messages. The
+        regular expression should match the beginning of line of
+        quoted text a single level deep, the program will then use
+        this to calculate the depth of quoting and alter the quoted
+        text colors appropriately. A default regexp is provided
+        that should work in most situations.</p>
+        <p>This regexp affects both highlighting and spell
+        checking, and uses the extended regular expression set. For
+        more information see the
+        <cmd>grep</cmd>(1) manual or info page.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Alternative Parts</gui>
+        </title>
+        <p>You can choose whether &Balsa; should show a
+        text/plain part or a text/html part, when a message
+        contains both.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="colors">
+    <title>Colors</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Message Colors</gui>
+        </title>
+        <p>Choose the colors for quoted text.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Link Color</gui>
+        </title>
+        <p>&Balsa; uses this color to highlight a hyperlink in
+        a message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Composition Window</gui>
+        </title>
+        <p>When you are composing a message, &Balsa; uses color
+        to show when one of the address fields is incomplete.
+        Choose that color here.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="format">
+    <title>Format</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Date Encoding</gui>
+        </title>
+        <p>Set the format used to display dates in &Balsa;.
+        This uses the same format string as 
+        <code>strftime</code>, a summary which is provided
+        below:</p>
+        <list>
+          <item>
+            <p>
+            <code>%a</code>&mdash; The abbreviated weekday
+            name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%A</code>&mdash; The full weekday name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%b</code>&mdash; The abbreviated month name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%B</code>&mdash; The full month name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%d</code>&mdash; The day of the month.</p>
+          </item>
+          <item>
+            <p>
+            <code>%R</code>&mdash; The time using a 24-hour clock.
+            (HH:MM)</p>
+          </item>
+          <item>
+            <p>
+            <code>%r</code>&mdash; The time using a 12-hour clock
+            (HH:MM AM/PM).</p>
+          </item>
+          <item>
+            <p>
+            <code>%T</code>&mdash; The time using a 24-hour clock,
+            with seconds (HH:MM:SS).</p>
+          </item>
+        </list>
+        <note>
+          <p>See the 
+          <code>strftime</code>manual page for a full listing of
+          conversion specifiers.</p>
+        </note>
+      </item>
+      <item>
+        <title>
+          <gui>Selected Headers</gui>
+        </title>
+        <p>A space-separated list of the headers to display in the
+        message window.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Fallback codeset</gui>
+        </title>
+        <p>Some messages contain national characters without
+        specifying how they are encoded. You can choose whether
+        &Balsa; displays such characters as '?', or tries a
+        specific character set to display such messages.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="status-messages">
+    <title>Status Messages</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Information Messages</gui>
+        </title>
+        <p>&Balsa; gives you information in the form of five
+        different levels of messages. You can specify how you want
+        all five levels to be presented to you.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display Progress</gui>
+        </title>
+        <p>This sets the behaviour of the dialog that is shown when
+        &Balsa; retrieves messages from it's specified
+        &POP3; servers. The dialog can be shown only while the
+        messages are being retrieved, automatically closing after
+        &Balsa; is finished. Or it can be set to stay active
+        until manually closed. Finally, the dialog can not be
+        displayed at all.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/C/preferences-mail-options.page b/doc/C/preferences-mail-options.page
new file mode 100644
index 0000000..84beb9b
--- /dev/null
+++ b/doc/C/preferences-mail-options.page
@@ -0,0 +1,285 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities">%balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="preferences-mail-options">
+  <info>
+    <link type="topic" xref="preferences" />
+    <link type="guide" xref="preferences" />
+  </info>
+  <title>Mail Server Preferences</title>
+  <p>This page lets you specify how you get POP3 mail, send mail,
+  etc.</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Remote Mailbox Servers</gui>
+      </title>
+      <p>These are &IMAP; and &POP3; servers that you
+      receive email from. The three buttons let you create, modify,
+      and remove records. &POP3; mailboxes will not show up in
+      the mailbox list. You can specify multiple servers, when
+      adding a server you will be asked to give:</p>
+      <list>
+        <item>
+          <p>mailbox name that will identify the mailbox</p>
+        </item>
+        <item>
+          <p>The server you have the POP mailbox on.</p>
+        </item>
+        <item>
+          <p>The port that will be used to connect to the server.
+          The port number is usually 110 but you may change it if
+          you for example use some kind of connection
+          tunneling,</p>
+        </item>
+        <item>
+          <p>The user name on the mailbox server.</p>
+        </item>
+        <item>
+          <p>Corresponding password.</p>
+        </item>
+        <item>
+          <p>You can select the 'delete from server' button to
+          remove the downoladed messages from the server.</p>
+        </item>
+        <item>
+          <p>You can choose to have messages filtered through
+          <app>procmail</app> .</p>
+        </item>
+        <item>
+          <p>The
+          <app>procmail</app> command.</p>
+        </item>
+        <item>
+          <p>Whether to check for new mail.</p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <title>
+        <gui>Local Mail Directory</gui>
+      </title>
+      <p>This is the directory that &Balsa; will scan looking
+      for mail folders.</p>
+    </item>
+    <item>
+      <title id="smtp-server-config">
+        <gui>Outgoing Mail Servers</gui>
+      </title>
+      <p>Most users will need only one outgoing mail server, but
+      you may need to use more than one. &Balsa; allows you to
+      set up as many as you need. The server used for a particular
+      message is controlled by the
+      <link xref="identities">identity</link> you choose for the
+      message.</p>
+      <p>To view or change the details of a server, select it and
+      click
+      <gui>Modify</gui> . To create a new server, click
+      <gui>Add</gui> . A dialog will open, showing the properties of
+      the selected server. Specify the domain name and optionally
+      the port for of the SMTP server you use for submitting mail.
+      Please note that the default port number is 587. The syntax
+      is hostname[:port]. Port can be a decimal number or the name
+      of the service as specified in
+      <file>/etc/services</file> . Typically you can just set this
+      to "localhost:smtp". &Balsa; can also break up a large
+      message into fragments, which can be reassembled by
+      &Balsa; or any RFC 2046-compliant mailer. This dialog
+      allows you to set this option, and the size above which a
+      message should be split.</p>
+      <p>You will be asked to give:</p>
+      <list>
+        <item>
+          <p>A descriptive name that will identify the server</p>
+        </item>
+        <item>
+          <p>The domain name and port</p>
+        </item>
+        <item>
+          <p>The user name on the SMTP server. If the remote SMTP
+          server requires authentication, enter your user name
+          here. Note that the exact format depends on the MTA in
+          use. For example, some systems expect a user name, others
+          may require an email address.</p>
+        </item>
+        <item>
+          <p>Corresponding pass phrase. If the remote SMTP server
+          requires authentication, enter your pass phrase here.
+          Some systems refer to the pass phrase as a password.
+          Limitations on the length of the pass phrase depend on
+          the SMTP server.</p>
+        </item>
+        <item>
+          <p>When you want &Balsa; to use TLS.</p>
+        </item>
+        <item>
+          <p>The TLS certificate pass phrase.</p>
+        </item>
+        <item>
+          <p>Whether to split large messages, and the threshhold
+          size.</p>
+        </item>
+      </list>
+    </item>
+  </terms>
+  <section id="incoming">
+    <title>Incoming</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Check Mail Automatically</gui>
+        </title>
+        <p>If selected, &Balsa; will connect to your &POP3;
+        servers at the given interval and check for mail.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check IMAP mailboxes</gui>
+        </title>
+        <p>If selected, &Balsa; will include your IMAP
+        mailboxes when checking for mail. You can also specify that
+        INBOX is the only mailbox to be checked.</p>
+        <p>Checking IMAP mailboxes can take some time; these
+        options give you extra control over how long the mailbox
+        check will take.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display message if new mail has arrived</gui>
+        </title>
+        <p>If selected, &Balsa; will alert you when mail has
+        arrived.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Do background check quietly</gui>
+        </title>
+        <p>If selected, &Balsa; will give you no indication
+        that a background mail check is in progress.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Wrap Incoming Text</gui>
+        </title>
+        <p>If selected, &Balsa; will wrap text of incoming
+        messages at the specified line length.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reflow messages of type
+          `text/plain;format=flowed'</gui>
+        </title>
+        <p>The `format' parameter distinguishes two ways of
+        representing paragraphs in messages of type `text/plain'
+        (that is, simple text). The value `flowed' indicates that
+        paragraphs have been broken into lines ended with `soft'
+        line breaks: a space is left at the end of the line. A
+        `hard' line break (one that is not preceded by a space)
+        indicates the end of a paragraph.</p>
+        <p>&Balsa; can reflow the paragraphs, quoted or
+        otherwise, in a message of this type. Reflowing eliminates
+        the line fragments that are left when text is first wrapped
+        at one length and then rewrapped to a shorter length, which
+        are often misquoted.</p>
+        <p>The only other value of `format' is `fixed', which is
+        the value assumed by default when `format' is not
+        specified, as with older mailers. In this case, all line
+        breaks must be respected. If you do not select the
+        `Reflow...' option, &Balsa; will treat all messages of
+        type `text/plain' as if they were `format=fixed'. Long
+        lines will still be wrapped, if the `Wrap Incoming
+        Messages' option is selected, but this will usually leave
+        unquoted line fragments.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Message Disposition Notification request</gui>
+        </title>
+        <p>You will sometimes receive a message whose sender has
+        asked for notification that you have received or seen the
+        message. You can specify how &Balsa; responds to these
+        requests.</p>
+      </item>
+    </terms>
+  </section>
+  <!-- ################################################################# -->
+  <!--             SUBSECTION: PREFERENCES/MAIL OPTIONS/OUTGOING         -->
+  <!-- ################################################################# -->
+  <section id="outgoing">
+    <title>Outgoing</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Wrap Outgoing Text</gui>
+        </title>
+        <p>Have &Balsa; wrap all outgoing mail at the specified
+        column.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply prefix</gui>
+        </title>
+        <p>The string that &Balsa; should use as a prefix when
+        quoting a message. Note: When you send a message with 
+        <gui>format=flowed</gui>, &Balsa; is required to use
+        the one-character string "&gt;".</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatically quote original when replying</gui>
+        </title>
+        <p>Have &Balsa; include the text of a message in the
+        reply. The text will be prefixed as shown above.</p>
+        <p>You can instead include the original message using an
+        option on the `Edit' menu, or by dragging the message from
+        the message index into the text area of the reply. If you
+        prefer to include text this way, do not select the
+        `Automatically quote...' option.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Don't include HTML parts as text when replying or
+          forwarding mail</gui>
+        </title>
+        <p>Tell &Balsa; to be sensible.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Forward a mail as attachment instead of quoting
+          it</gui>
+        </title>
+        <p>If this option is selected, messages that are
+        `Automatically quoted' will actually be attached
+        unmodified, instead of included in the text of the reply,
+        prefixed by the reply string.</p>
+        <p>You can also attach any message to a new message by
+        dragging it from the message index into the attachment area
+        of the new message (or, in fact, any part of the new
+        message window except the text area or the address
+        lines).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Send button always queues outgoing mail in
+          outbox</gui>
+        </title>
+        <p>This option gives you control over when &Balsa;
+        connects to a server to send messages.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Copy outgoing messages to sentbox</gui>
+        </title>
+        <p>Have &Balsa; save a copy of each message you send in
+        the mailbox marked as the `Sentbox'.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Encoding</gui>
+        </title>
+        <p>Set the character encoding method to either 7 bit, 8
+        bit, or what the quoted message is using.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/C/preferences-miscellaneous.page b/doc/C/preferences-miscellaneous.page
new file mode 100644
index 0000000..ef19109
--- /dev/null
+++ b/doc/C/preferences-miscellaneous.page
@@ -0,0 +1,70 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities">%balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="preferences-miscellaneous">
+  <info>
+    <link type="topic" xref="preferences" />
+    <link type="guide" xref="preferences" />
+  </info>
+  <title>Miscellaneous Preferences</title>
+  <terms>
+    <item>
+      <title>
+        <gui>Debug</gui>
+      </title>
+      <p>Toggle the output of debugging information. Depending on
+      what notification priority set for it in the
+      <link xref="preferences-display-options">
+      Display</link> page, it can show up in list or dialog as the
+      program runs.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Empty Trash on Exit</gui>
+      </title>
+      <p>Set &Balsa; to delete all messages in the
+      <code>Trash</code> mailbox when &Balsa; exits.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Automatically close mailbox</gui>
+      </title>
+      <p>Set &Balsa; to close any mailbox that is unused for
+      more than the specified time. The currently displayed mailbox
+      is never automatically closed.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Hide messages marked as deleted</gui>
+      </title>
+      <p>When a message is moved to another mailbox, including the
+      <code>Trash</code> mailbox, it is actually copied to the
+      destination, and the original is marked as deleted. Deleted
+      messages may either be shown in the mailbox index, with the
+      trashcan icon indicating that they are deleted, or hidden.
+      This item controls which of those actions is taken.</p>
+      <p>A message may also be simply marked as deleted, without
+      copying it to another mailbox:
+      <guiseq>
+        <gui>Message</gui>
+        <gui>Toggle flag</gui>
+        <gui>Deleted</gui>
+      </guiseq>. Again, this item controls whether such a message
+      is hidden.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Expunge deleted messages on close</gui>
+      </title>
+      <p>"Expunging" is the act of physically removing from the
+      backing mailstore all messages marked as deleted. You can
+      expunge messages manually:
+      <guiseq>
+        <gui>Mailbox</gui>
+        <gui>Expunge deleted messages</gui>
+      </guiseq>, or you can set &Balsa; to expunge deleted
+      messages when the mailbox is closed (all mailboxes are closed
+      when you exit &Balsa;).</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/C/preferences-spelling.page b/doc/C/preferences-spelling.page
new file mode 100644
index 0000000..d77bcf7
--- /dev/null
+++ b/doc/C/preferences-spelling.page
@@ -0,0 +1,86 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities">%balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="preferences-spelling">
+  <info>
+    <link type="topic" xref="preferences" />
+    <link type="guide" xref="preferences" />
+  </info>
+  <title>Spell Check Preferences</title>
+  <p>If &Balsa; is using GtkSpell, you can choose to have your
+  spelling checked as you type. &Balsa; uses GtkSpell's default
+  settings.</p>
+  <p>If &Balsa; is not using GtkSpell, you can use this pane to
+  setup &Balsa; spell check options. &Balsa; uses the
+  Portable Spell Checking library
+  (<link href="http://pspell.sourceforge.net";>pspell</link>) to
+  provide an interface to the spell checking program of your
+  choice. Currently there are modules for ispell or aspell, both of
+  which can be found at the pspell website. For more information
+  visit the &Balsa; homepage.</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Pspell Module</gui>
+      </title>
+      <p>The Pspell library allows you to use whatever spell
+      checking engine you prefer, though the use of loadable
+      modules. Currently Pspell has support for two modules, the
+      traditional ispell, and the newer and more advanced
+      aspell.</p>
+      <p>
+      <app>Ispell</app> is most likely available on your system as
+      it is a Unix standard; however
+      <app>Aspell</app> is more advanced as it uses an advanced
+      phonetics engine and adaptive techniques to learn how you
+      tend to misspell words. More information is available at the
+      <link href="http://aspell.sourceforge.net";>Aspell
+      website</link>.</p>
+      <p>&Balsa; will attempt to use whatever module you
+      specify here, however if the module is not installed it will
+      not work and generate an error.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Suggestion Mode</gui>
+      </title>
+      <p>The suggestion mode determines how hard the computer will
+      search for suggestions for misspelled words. There are three
+      options:</p>
+      <terms>
+        <item>
+          <title>
+            <gui>Fast</gui>
+          </title>
+          <p>This mode quickly scans for replacements, which means
+          it might be used by a good speller who occasionally makes
+          typographical errors.</p>
+        </item>
+        <item>
+          <title>
+            <gui>Normal</gui>
+          </title>
+          <p>The Normal mode is probably good enough for most
+          people; it should produce the correct suggestion in the
+          majority of cases.</p>
+        </item>
+        <item>
+          <title>
+            <gui>Bad Spellers</gui>
+          </title>
+          <p>The Bad Spellers mode is the most thorough and
+          accurate mode; however, it also takes the longest to find
+          a list of suggestions.</p>
+        </item>
+      </terms>
+    </item>
+    <item>
+      <title>
+        <gui>Ignore Length</gui>
+      </title>
+      <p>This provides the ability to ignore words shorter than a
+      certain length. It may be useful to automatically skip short
+      acronyms that are normally flagged as incorrect.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/C/preferences-startup.page b/doc/C/preferences-startup.page
new file mode 100644
index 0000000..a3a2a3d
--- /dev/null
+++ b/doc/C/preferences-startup.page
@@ -0,0 +1,51 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities">%balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="preferences-startup">
+  <info>
+    <link type="topic" xref="preferences" />
+    <link type="guide" xref="preferences" />
+  </info>
+  <title>Startup Preferences</title>
+  <terms>
+    <item>
+      <title>
+        <gui>Open Inbox upon Startup</gui>
+      </title>
+      <p>If set, &Balsa; will open your system inbox upon
+      startup.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Check Mail at Startup</gui>
+      </title>
+      <p>If set, &Balsa; will automatically attempt to download
+      mail from the &POP3; mail server upon startup, and will
+      check for new mail on an &IMAP; server.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Remember Open Mailboxes Between Sessions</gui>
+      </title>
+      <p>When marked, &Balsa; will remember and reopen
+      mailboxes that were open when &Balsa; was last quit.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Folder Scanning</gui>
+      </title>
+      <p>Scanning a folder tree can be time-consuming, because of
+      the need to explore an entire tree of subfolders. You can
+      defer scanning the tree by setting the scan depth to 1.
+      &Balsa; will then descend into the tree only far enough
+      to discover whether any folders that you can see have
+      subfolders. The first time you expand any subtree,
+      &Balsa; will explore more of the tree.</p>
+      <p>If you prefer to have the whole tree available from
+      startup, choose a depth as great as that of your folder tree.
+      Intermediate settings may also be used.</p>
+      <p>You may set the depth for initial scanning separately for
+      local and &IMAP; trees.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/C/preferences.page b/doc/C/preferences.page
new file mode 100644
index 0000000..39492be
--- /dev/null
+++ b/doc/C/preferences.page
@@ -0,0 +1,26 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities">%balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="preferences">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+<title>The Preferences Window</title>
+
+<p>
+  &Balsa; has many more options than the initial assistant reveals.
+  To access the Preferences window, select
+  <guiseq>
+      <gui>Edit</gui> <gui>Preferences</gui>
+  </guiseq>.
+  In the Preferences window, options are organized into groups,
+  and related groups are shown on individual pages.
+  The pages and groups are explained below.
+</p>
+<!--
+<figure>
+  <title>Preferences Window</title>
+  <media type="image" src="figures/preferences-window.png"/>
+</figure>
+-->
+</page>
diff --git a/doc/C/toolbar-prefs.page b/doc/C/toolbar-prefs.page
new file mode 100644
index 0000000..b9ad003
--- /dev/null
+++ b/doc/C/toolbar-prefs.page
@@ -0,0 +1,46 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="toolbar-prefs">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>Customizing Toolbars</title>
+  <p>&Balsa; allows you to change the layout of the toolbars on
+  the three main types of window: the
+  <link xref="win-main">main window</link>,
+  <link xref="win-message">message windows</link>, and
+  <link xref="win-composer">compose windows</link>. You open the
+  dialog with the
+  <guiseq>
+    <gui>Settings</gui>
+    <gui>Toolbars...</gui>
+  </guiseq> menu item.</p>
+  <p>The dialog contains a notebook with a page for each type of
+  window. On each page, you'll see a Preview of the toolbar, which
+  changes as you change the layout. The list of
+  <gui>Available buttons</gui> shows buttons that may be used on the
+  toolbar, but aren't currently used, and the
+  <gui>Current toolbar</gui> list shows the current layout,
+  including both buttons and separators. You can add buttons to the
+  current toolbar, remove them, or move them up or down in the
+  list, using the controls in the central button box.</p>
+  <p>Below the notebook is a checkbox for wrapping the button
+  labels (the text that may accompany the buttons). This option
+  applies to the toolbars on all three types of window. If you
+  choose wrapping, long labels will be shown on two lines.</p>
+  <p>This is an "instant apply" dialog: the changes you make take
+  effect immediately, as shown in the Preview toolbar. Below the
+  Preview toolbar you'll find a button that restores the standard
+  layout for that toolbar.</p>
+  <note>
+    <p>Note that the standard layout is the one that you see before
+    the toolbar has been customized. If you use this option, all
+    current <em>and past</em> changes will be undone.</p>
+  </note>
+  <p>A second button below the Preview toolbar pops up a menu that
+  gives you control over what is shown in the toolbar: icons, text,
+  or both. The popup (right click) menu for any actual toolbar
+  offers the same choices, as well as the option to open up this
+  dialog ("Customize Toolbars...").</p>
+</page>
diff --git a/doc/C/win-composer.page b/doc/C/win-composer.page
new file mode 100644
index 0000000..150b1dd
--- /dev/null
+++ b/doc/C/win-composer.page
@@ -0,0 +1,766 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities">%balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="win-composer">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>The Message Composer</title>
+  <figure>
+    <title>Message Composition Window</title>
+    <media src="figures/newmsg-window.png" format="PNG" />
+  </figure>
+  <p>When the
+  <gui>New Message</gui> or
+  <gui>Reply</gui> or
+  <gui>Forward</gui> action is selected, the message to be sent is
+  brought up in the Message Composer. This window is where you can
+  type the text of the message, attach files, and specify
+  recipients. The window also provides an interface to spell check
+  the message. Signing and encryption of messages using
+  <app>GnuPG</app> or
+  <app>PGP</app> are also supported, when &Balsa; is built with
+  cryptographic support.</p>
+  <p>When the message window first opens, you will see the several
+  main sections:</p>
+  <list>
+    <item>
+      <p>The menu bar</p>
+    </item>
+    <item>
+      <p>Toolbar</p>
+    </item>
+    <item>
+      <p>Mail headers</p>
+    </item>
+    <item>
+      <p>The attachment box</p>
+    </item>
+    <item>
+      <p>The message body</p>
+    </item>
+  </list>
+  <p>These will each be covered in depth below:</p>
+  <section id="win-composer-menu">
+    <title>Menu Bar</title>
+    <p>This contains all of the available commands for acting on
+    the message, from selecting the headers to display to changing
+    the character set of the message. Some of the menu items are
+    not always available, depending on what state the message is
+    currently in.</p>
+    <terms>
+      <item>
+        <title>
+          <gui>File</gui>
+        </title>
+        <p>The file menu contains commands for manipulating the
+        message as a whole.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Include File...</gui>
+            </guiseq> &mdash; Include a text file in the body of the
+            message; only works for plain text files.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Attach File...</gui>
+            </guiseq> &mdash; Attach any kind of file to the
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Send</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Enter</key>
+            </keyseq> &mdash; Send the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Queue</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Q</key>
+            </keyseq> &mdash; Queue the message in the outbox for
+            sending later.</p>
+            <note>
+              <p>A message is considered valid (ready for sending
+              or queuing) if it contains at least one valid email
+              address, and no invalid addresses, in the
+              <gui>Recipients</gui> fields.</p>
+            </note>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Postpone</gui>
+            </guiseq> &mdash; Save the message in the
+            <code>Draftbox</code> for later revision and sending,
+            and close the compose window. You will be unable to
+            postpone a message that is not currently valid.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Save</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>S</key>
+            </keyseq> &mdash; Save the message in the
+            <code>Draftbox</code> and continue editing.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Page Setup</gui>
+            </guiseq> &mdash; Set print options such as paper size
+            and print orientation.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Print...</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>P</key>
+            </keyseq> &mdash; Print a hard-copy of the current
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Close</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>W</key>
+            </keyseq> &mdash; Close and discard the current
+            message.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Edit</gui>
+        </title>
+        <p>The Edit menu contains commands which are used to modify
+        the body of the message.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Undo</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Z</key>
+            </keyseq> &mdash; Undo the most recent editing
+            action.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Redo</gui>
+            </guiseq>
+            <keyseq>
+              <key>Shift</key>
+              <key>Ctrl</key>
+              <key>Z</key>
+            </keyseq> &mdash; Redo an undone editing action.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Cut</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>X</key>
+            </keyseq> &mdash; Cut the selected text to the
+            clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Copy</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>C</key>
+            </keyseq> &mdash; Copy the selected text to the
+            clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Paste</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>V</key>
+            </keyseq> &mdash; Paste the contents of the clipboard to
+            the current position of the cursor.</p>
+          </item>
+          <item>
+            <p>
+              <guiseq>
+                <gui>Edit</gui>
+                <gui>Select All</gui>
+              </guiseq>
+              <keyseq>
+                <key>Ctrl</key>
+                <key>A</key>
+              </keyseq>
+            </p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Wrap Body</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>B</key>
+            </keyseq> &mdash; Cause all the lines in the message to
+            be wrapped to the specified outgoing mail wrap
+            column.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Reflow Paragraph</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>R</key>
+            </keyseq> &mdash; Cause all selected lines to be wrapped
+            to the specified outgoing mail wrap column.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Check Spelling</gui>
+            </guiseq> &mdash; Start spell checking the current
+            message.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Show</gui>
+        </title>
+        <p>The Show menu is used to control which headers are
+        displayed in the composer window for editing.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Toolbar</gui>
+            </guiseq> &mdash; Show or hide the toolbar.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>From</gui>
+            </guiseq> &mdash; Display the
+            <code>From</code> header.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Recipients</gui>
+            </guiseq> &mdash; Display the
+            <code>To:</code> ,
+            <code>Cc:</code> , and
+            <code>Bcc:</code> addresses.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Reply To</gui>
+            </guiseq> &mdash; Display the
+            <code>Reply-To</code> header.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Fcc</gui>
+            </guiseq> &mdash; Display the
+            <code>Fcc</code> header; this is the folder to which
+            your copy of the sent message will be saved. The
+            default is your Sentbox.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Language</gui>
+        </title>
+        <p>The Language menu allows you to set the language to use
+        for composing and checking the spelling of the message.
+        Only languages for which you have dictionaries installed
+        are shown.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Options</gui>
+        </title>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Request Disposition Notification</gui>
+            </guiseq> &mdash; If checked &Balsa; will include
+            the
+            <code>Disposition-Notification-To</code> header line
+            with your
+            <code>From</code> address. Please note that the handling
+            of this request depends on the receiving mail program
+            and that it not guaranteed that this notification will
+            be sent back.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Format = Flowed</gui>
+            </guiseq> &mdash; The "Flowed" format (RFC 3676) breaks
+            the message text into paragraphs, which you type
+            continuously using the
+            <key>Enter</key> key only to mark the end of a
+            paragraph, and "fixed" lines which you mark
+            individually using the
+            <key>Enter</key> key. This allows other mailers that
+            recognize the format to display the text appropriately
+            for the width of the recipient's screen, and to quote
+            the text correctly when constructing a reply. The text
+            is also displayed intelligibly by a non-flowed-aware
+            mailer.</p>
+            <note>
+              <p>Using "Format=Flowed" is strongly recommended. It
+              helps to avert the "embarrassing line wrap" that you
+              see when quoted text is broken across lines and shown
+              with the wrong level of quoting.</p>
+            </note>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Send as plain text and HTML</gui>
+            </guiseq> &mdash; &Balsa; can send and receive
+            messages in right-to-left languages such as Arabic,
+            Hebrew, and Persian, but some other agents such as
+            mailing lists may mangle them when translating into
+            HTML. If the "Send as plain text and HTML" option is
+            selected, &Balsa; will generate a correct HTML
+            message part that such agents will use instead.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Sign message</gui>
+            </guiseq> &mdash; Cryptographically sign the message.
+            The recipients can check the signature to prove the
+            sender's (=your) identity or to detect any tampering
+            with the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Encrypt message</gui>
+            </guiseq> &mdash; Encrypt the message. Only the intended
+            recipient(s) can decrypt and read the contents.</p>
+          </item>
+          <item>
+            <p>The following options determine the protocol used
+            for signing and/or encrypting the message. You should
+            choose the appropriate protocol which all recipients
+            can use.</p>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>GnuPG uses MIME mode</gui>
+                </guiseq> &mdash; Sign and/or encrypt the complete
+                message, including all attachments, using the
+                PGP/MIME mode (RFC 3156). Note that the message
+                envelope (including the Subject) is not
+                protected.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>GnuPG uses old OpenPGP mode</gui>
+                </guiseq> &mdash; Sign and/or encrypt only the
+                message text, but not attachments, using the
+                OpenPGP mode (RFC 2440). If you want to add any
+                attachments, sign and/or encrypt them manually
+                before adding.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>S/MIME mode (GpgSM)</gui>
+                </guiseq> &mdash; Sign and/or encrypt the complete
+                message, including all attachments, using the
+                S/MIME mode (RFC 2633). Note that the message
+                envelope (including the Subject) is not
+                protected.</p>
+              </item>
+            </list>
+            <note>
+              <p>Cryptographic signatures and encryption are
+              available only when &Balsa; has been built with
+              &GnuPG; support. For a detailed description of
+              E-Mail cryptography, see the
+              <link href="http://www.gnupg.org/documentation/manuals/gnupg/";
+              type="http"> GnuPG Manual</link> and the
+              <link href="http://www.dewinter.com/gnupg_howto/english/GPGMiniHowto.html";
+              type="http"> GnuPG HOWTO</link> .</p>
+            </note>
+          </item>
+        </list>
+      </item>
+    </terms>
+  </section>
+  <section id="win-composer-toolbar">
+    <title>Toolbar</title>
+    <p>The toolbar contains buttons for the most commonly used
+    functions when sending messages, including Send, Attach
+    File..., and Save. As with the menu bar, some buttons are
+    disabled if the message is not correctly setup to be sent.</p>
+    <figure>
+      <title>Toolbar</title>
+      <media type="image"
+      src="figures/newmsg-window-toolbar.png" />
+    </figure>
+    <terms>
+      <item>
+        <title>
+          <gui>Send</gui>
+        </title>
+        <p>Send the current message. Only available if the message
+        is legal to be sent (i.e. proper email addresses). This
+        button may also be configured to queue the message in the
+        outbox to be sent later (see the
+        <link xref="preferences-outgoing">
+        Preferences</link> dialog).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Attach</gui>
+        </title>
+        <p>Open a dialog to attach a file to the current
+        message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Postpone</gui>
+        </title>
+        <p>Postpone the message to the Draftbox for later revision
+        and sending.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check Spelling</gui>
+        </title>
+        <p>Start a spell check on the current message. If
+        &Balsa; is built with support for
+        <app>GtkSpell</app> , your spelling is checked in place.
+        Otherwise, &Balsa; can use either
+        <app>ispell</app> or
+        <app>aspell</app> to do the spell checking. Settings for
+        this can be found in the
+        <link xref="preferences-spelling">
+        Preferences</link> dialog.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Print</gui>
+        </title>
+        <p>Print out the draft of the message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cancel</gui>
+        </title>
+        <p>Close the composition window without saving or sending
+        the message within.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="win-composer-headers">
+    <title>Headers</title>
+    <p>The headers area is where the information regarding where
+    the message is being sent to and from, as well as comments and
+    keywords can be entered. All of the available headers are not
+    shown by default, but they can be turned on and off very
+    quickly using the menu.</p>
+    <terms>
+      <item>
+        <title>
+          <gui>From</gui>
+        </title>
+        <p>
+        <code>From</code> is used to indicate the origin of the
+        message, &Balsa; automatically fills this in for you if
+        you have entered your name and email address in the
+        <link xref="identities">identities</link> window.</p>
+      </item>
+      <item>
+        <title>
+          <gui>To</gui>
+        </title>
+        <p>The
+        <code>To</code> header is used to indicate the intended
+        recipient of the message; &Balsa; automatically fills
+        this in for you if you are replying to a message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Subject</gui>
+        </title>
+        <p>The
+        <code>Subject</code> header is used to summarize the topic
+        of the message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cc</gui>
+        </title>
+        <p>The "Carbon Copy" header. A comma separated list of
+        recipients other than the main recipient should go
+        here.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Bcc</gui>
+        </title>
+        <p>The
+        <code>Bcc</code> , or "Blind Carbon Copy" header. Similar to
+        the Cc header, except that email addresses placed in this
+        header will not appear as recipients to readers of the
+        message. Also known as a "silent" carbon copy.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Fcc</gui>
+        </title>
+        <p>The
+        <code>Fcc</code> header stands for "Folder Carbon Copy", and
+        it is used to specify any folders that you want the message
+        copied to after being sent. It is presented as a drop-down
+        combo box with a list of all available mailboxes, simply
+        select the destination.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply-To</gui>
+        </title>
+        <p>The
+        <code>Reply-To</code> header is for specifying what email
+        address you want any replies to go to.</p>
+      </item>
+    </terms>
+    <section id="specify-addresses">
+    <title>Specifying Addresses</title>
+    <p>&Balsa; supports many different methods of selecting
+    email addresss. All of the headers that can contain addresses
+    have a small colored book to the left of them that will open up
+    &Balsa;'s address book.</p>
+    <p>However, &Balsa; will also attempt to guess what the
+    headers should contain depending on what context the
+    composition window is opened in, so it may not be neccessary to
+    fill them in most of the time.</p>
+    <note>
+      <p>Also, &Balsa; supports alias expansion. As you type a
+      name, &Balsa; will guess the e-mail address from all the
+      entries in the &GnomeCard; application. To enable this
+      feature, read the section on
+      <link xref="common-tasks#ct-alias-expansion">
+      Alias Expansion</link> . In
+      addtion, the composition window supports drag-and-drop of
+      addresses from the &GnomeCard; application.</p>
+    </note> &gt;</section>
+  </section>
+  <section id="win-composer-attachments">
+    <title>Attachments</title>
+    <figure>
+      <title>List of Attachments</title>
+      <media type="image"
+      src="figures/newmsg-window-attachments.png" />
+    </figure>
+    <p>Below the headers may be a large box displaying a list of
+    attachments; this view can be toggled in the
+    <gui>Show</gui> menu.</p>
+    <p>When there are attachments displayed, it is possible to
+    right-click on one of them to access an option menu.
+    <gui>Inline</gui> and
+    <gui>Attachment</gui> are mutually exclusive options that will
+    display to the recipient either the attachment inline with the
+    rest of the message, or separately as an attachment. Selecting
+    <gui>Reference</gui> will send a MIME external part reference (a
+    kind of link) in lieu of the actual file.
+    <gui>Remove</gui> , and any available
+    <gui>Open with</gui> options are also available.</p>
+  </section>
+  <section id="win-composer-body">
+    <title>Message Body</title>
+    <p>Finally, below the attachment list is the main area of the
+    window where the text of the message is displayed. The text
+    editing capabilities are very basic, but it supports cut, copy,
+    and paste so it is possible to write a message in your favorite
+    editor and simply paste it in.</p>
+    <p>If the message is a reply or forward, the referenced message
+    will be displayed in the body text widget, with the prefix
+    specified in the
+    <link xref="preferences-outgoing">Preferences</link> dialog.</p>
+  </section>
+  <section id="win-composer-spellcheck">
+    <title>Spell Checker</title>
+    <p>Once the spell check has been started, it will take a moment
+    to load the text and spell checking module, and then it will
+    automatically begin checking the message. If it finds any words
+    that are incorrect, the word will be highlighted and a panel
+    will be shown that offers a number of suggestions and available
+    courses of action.</p>
+    <figure>
+      <title>Spell Checking Panel</title>
+      <media type="image" src="figures/spell-check.png" />
+    </figure>
+    <p>As shown above, the panel consists of a list of two panes,
+    one the left containing a list of suggestions and an entry box,
+    while the right contains several buttons to choose your action.
+    The list on the left is re-generated for each incorrect word,
+    with all the suggestions the spell check program comes up with.
+    You can choose what program you want to use through loadable
+    modules, selectable in the
+    <link xref="preferences-spelling">Preferences</link> dialog. The
+    entry box above the list is what will be used to replace the
+    current word, and usually reflects the current selection in the
+    list, but can be edited by hand if you wish to make manual
+    changes.</p>
+    <p>The buttons on the left control the actions to take for each
+    incorrect word. The buttons include:</p>
+    <terms>
+      <item>
+        <title>
+          <gui>Change</gui>
+        </title>
+        <p>Change the incorrect word with the currently selected
+        suggested word or the user's edited word.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Change All</gui>
+        </title>
+        <p>Change all occurances of the current incorrect word with
+        the currently selected suggestion.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Ignore</gui>
+        </title>
+        <p>Ignore the current incorrect word and continue to the
+        next one.</p>
+      </item>
+      <item>
+        <p>Ignore all occurrances of the current word, and continue
+        to the next incorrect word.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Learn</gui>
+        </title>
+        <p>Add the current incorrect word to your personal
+        dictionary. This will cause it to be considered correct for
+        all future spell checks.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Done</gui>
+        </title>
+        <p>Stop the spell check at the current point, keeping all
+        changes so far and returning to the normal message window
+        interface.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cancel</gui>
+        </title>
+        <p>Stop the spell check at the current point, reverting all
+        changes so far, including any words added to your personal
+        dictionary.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="addr-book-buttons">
+    <title>Address Book</title>
+    <p>When composing a message, clicking on any of the colored
+    book icons next to a destination field (To, Cc, Bcc) will bring
+    up the &Balsa; address book. It helps you to select
+    recipients for your messages quickly and easily.</p>
+    <figure>
+      <title>Address Book Window</title>
+      <media type="image" src="figures/address-book.png" />
+    </figure>
+    <p>The address book provides two panes, the one on the left
+    consisting of all available addresses, while the one on the
+    right contains the intended recipients of your message.
+    Addresses are added to the recipient list by selecting them in
+    the left pane and clicking the arrow button pointing to the
+    right, or by simply double-clicking on the address. This will
+    remove the address from the left pane, so they cannot be added
+    more than once. If you decide that you no longer want to send
+    the message to a particular address, simply select it in the
+    right-hand pane and click the left-arrow button, or
+    double-click it again, to move it back.</p>
+    <p>If, while selecting people to send your message to, you
+    decide to add someone new to the address book, it is a simple
+    matter to click on the
+    <gui>Run GnomeCard</gui> button. This will bring up the
+    &GnomeCard; application, allowing you to easily manipulate
+    your contact list. After any changes have been made using the
+    address book, they can be forced to show up in the left hand
+    pane by clicking on the
+    <gui>Re-Import</gui> button.</p>
+  </section>
+</page>
diff --git a/doc/C/win-filters.page b/doc/C/win-filters.page
new file mode 100644
index 0000000..f7a532f
--- /dev/null
+++ b/doc/C/win-filters.page
@@ -0,0 +1,217 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="win-filters">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>The Filters Window</title>
+  <p>This window is divided in two parts: the left part is the list
+  of all filters. When you select one of them, the right part
+  displays its properties. The right part is a two-page notebook
+  (the
+  <link xref="win-filters#wf-match-page">match page</link>, and the
+  <link xref="win-filters#wf-action-page">action page</link>); their
+  descriptions follow.</p>
+  <p>There are two buttons under the filters list:
+  <list>
+    <item>
+      <p>The
+      <gui>New</gui> button: you click on it to create a new filter;
+      the filter is initially named "New Filter", and contains no
+      condition. Then you fill in the different fields in the
+      notebook pages (in particular remember to change the name of
+      the filter), add the conditions that will describe how this
+      filters matches a message, and to confirm the modifications
+      push the
+      <gui>Apply</gui> button on the right hand side of the Filters
+      window.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Remove</gui> button: removes the currently selected
+      filter.</p>
+    </item>
+  </list></p>
+  <section id="wf-match-page">
+    <title>The Match Page</title>
+    <p>Each filter is made of one or several conditions; each
+    condition represents a test to be applied to the messages. The
+    results of these tests is then combined following the type of
+    operation specified:
+    <list>
+      <item>
+        <p>AND: all condition tests must be true to make the
+        match.</p>
+      </item>
+      <item>
+        <p>OR: one condition test must be true to make the
+        match.</p>
+      </item>
+    </list></p>
+    <p>Then the page displays the name of the filter and the
+    conditions that describes how the filters matches a message.
+    The list displays the type of the conditions (the conditions
+    will be described later):
+    <list>
+      <item>
+        <p>
+        <gui>Simple</gui>: the match is done by a simple substring
+        test.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Regular expression</gui>: the match uses regular
+        expressions on the message headers.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Date interval</gui>: the match is done by checking if
+        the date of the message is within certain bounds.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Flag condition</gui>: the match is done by checking
+        the flags of the message: unread, replied, deleted,
+        flagged.</p>
+      </item>
+    </list>The three buttons under the list allows you to edit the
+    selected condition, add a new one, or remove one. Editing or
+    creating a condition is done in the
+    <link xref="win-condition">condition window</link>, which
+    pops up when you click on the
+    <gui>Edit</gui> or the
+    <gui>New</gui> button.</p>
+    <p>The two buttons under the notebook at the right hand side of
+    the window lets you manipulate the currently selected filter.
+    The
+    <gui>Apply</gui> button is used to confirm the modifications you
+    have made on any field. If you make changes and select another
+    filter without first clicking on the
+    <gui>Apply</gui> button, all your changes will be lost.</p>
+    <p>The
+    <gui>Revert</gui> button cancels all previous changes: the
+    current filter is reverted to its state just before the last
+    click on the
+    <gui>Apply</gui> button.</p>
+  </section>
+  <section id="wf-action-page">
+    <title>The Action Page</title>
+    <p>This page describes the actions to take in case the filter
+    matches. First you specify the notification to inform you that
+    the one or several messages has matched the filter in the
+    <gui>Notification</gui> frame. Then in the
+    <gui>Action</gui> frame you tell what to do with the matching
+    messages. You can ask &Balsa; to copy or move them to any
+    mailbox, or to send them to the trash can. The other actions
+    are not yet implemented.</p>
+  </section>
+  <section id="win-condition">
+    <title>The Condition Window</title>
+    <p>This window is used to edit an existing condition or to
+    create a new one. It displays all the information needed to
+    describe the condition, it is launched when you click on the
+    <gui>Edit</gui> or
+    <gui>New</gui> buttons under the conditions list in the match
+    page of the notebook in the right part of the
+    <link xref="win-filters">filters window</link>.</p>
+    <p>This window is made of three frames:
+    <list>
+      <item>
+        <p>The
+        <gui>Match in</gui> frame: it's a set of check boxes, one
+        per match field. For example if you want to match all
+        messages that was sent by hotmail users, you just have to
+        check the
+        <gui>From</gui> box, or if you want to match all messages
+        about &Balsa;, check the
+        <gui>Subject</gui> box.</p>
+        <warning>
+          <p>Be careful with
+          <gui>Body</gui> match, this can take time for large
+          messages.</p>
+        </warning>
+        <p>For advanced use you can also specify directly the name
+        of the header to match on. A standard example the
+        "X-Mailer" is a header added to your message by the MUAs
+        with their name and versions.</p>
+        <p>The
+        <gui>All</gui> button will check all boxes, whereas the
+        <gui>Clear</gui> button will uncheck all boxes (as you might
+        have guessed).</p>
+        <p>If you specify several headers, a message will match
+        this condition if one of the header matches. For example if
+        you want to filter all messages talking about &Balsa;,
+        you should check the
+        <gui>Body</gui> and the
+        <gui>Subject</gui> boxes, so that all mails with the word
+        <quote>Balsa</quote> in its subject or its body will match.
+        You can also, if you're fed up with &Balsa; ;-), match
+        all mails that do NOT contain the word
+        <quote>Balsa</quote> in their subject and in their body
+        neither. See the description of the search types to see how
+        to do this.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Search Type</gui> frame: it's a list of the different
+        condition types. You choose
+        <gui>Simple</gui>,
+        <gui>Regular expression</gui>,
+        <gui>Date interval</gui>, or
+        <gui>flag condition</gui>. Your choice will change the
+        third frame so that it displays the fields needed by the
+        type of match chosen.</p>
+      </item>
+      <item>
+        <p>This part depends on the search type you've chosen:
+        <list>
+          <item>
+            <p>
+            <gui>Simple</gui> type: a text entry lets you input the
+            string to look for (case does not matter, the search is
+            case-insensitive). The button lets you specify if a
+            message matches when the string is or is NOT a
+            substring of the specified headers, the sentence above
+            the text entry will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Regular expression</gui>: you can input a list of
+            regular expressions. You type your regular expression
+            in the text entry, then you click on the
+            <gui>Add</gui> button to put it into the list. Of course
+            the
+            <gui>Remove</gui> button destroys the selected regular
+            expression in the list. The last button
+            <gui>One matches/None matches</gui> lets you specify
+            when a message matches the condition: when one of the
+            regular expression matches or when none matches. The
+            sentence above te list will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Date</gui> interval: you can input the interval by
+            the mean of the two text entries. A blank entry means
+            no bound. The button tells to match when the message
+            date is within the bounds or not. The sentence above
+            the text entries will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Flag condition</gui>: the four check boxes let you
+            select which messages will match this condition. If you
+            want to match all replied OR unread messages, check the
+            corresponding boxes. The button let you specify that
+            the match will be done when none of the specified flags
+            are set, the sentence above the check boxes will be
+            updated accordingly. For example if you want to filter
+            all read and replied messages, check the
+            <gui>unread</gui> and
+            <gui>replied</gui> boxes, and click on the button.</p>
+          </item>
+        </list></p>
+      </item>
+    </list></p>
+  </section>
+</page>
diff --git a/doc/C/win-main.page b/doc/C/win-main.page
new file mode 100644
index 0000000..08c5bbf
--- /dev/null
+++ b/doc/C/win-main.page
@@ -0,0 +1,877 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="win-main">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title> The Main Window</title>
+  <figure>
+    <media type="image" src="figures/main-window.png" />
+    <title> Main Window</title>
+  </figure>
+  <p> &Balsa; 's main window has three major areas. To the left
+  is the
+  <link xref="win-main#subwin-mblist"> mailbox list</link> . This displays all
+  the mailboxes &Balsa; knows about; it will scan for ones in
+  your local mail directory. (This means &Balsa; works well
+  with &procmail; .) It will also list &IMAP; mailboxes that
+  you have configured. If the
+  <gui> Show Mailbox Info</gui> preference is set, two columns will
+  also be displayed next to the mailbox names containing the number
+  of unread and total messages in each mailbox that has unread
+  messages; otherwise, the number of unread messages is shown in
+  parentheses after the mailbox name. Also, any mailboxes that
+  contain unread messages will be shown in a bold font.</p>
+  <p> At the top-right is a view of the currently open mailbox,
+  called the
+  <link xref="win-main#subwin-msgindex"> message index</link> . You can browse
+  messages and manipulate them here.</p>
+  <p> At the bottom-right of &Balsa; 's main window is the
+  <link xref="win-main#subwin-msgview"> message view</link> . This displays
+  the message selected in the message index. You can save
+  attachments, view attachments, and read incoming email here.</p>
+  <section id="menu-toolbar">
+    <title> Menu &amp; Toolbar</title>
+    <figure>
+      <media type="image" src="figures/main-window-toolbar.png" />
+      <title> Main Window Toolbar</title>
+    </figure>
+    <p> The menu bar, located at the top of the Main Window,
+    provides the following commands:</p>
+    <terms>
+      <item>
+        <title>
+          <guiseq>
+            <gui> File</gui>
+          </guiseq>
+        </title>
+        <p> This menu contains basic commands.</p>
+        <terms>
+          <item>
+            <title>
+              <guiseq>
+                <gui> File</gui>
+                <gui> New</gui>
+              </guiseq>
+            </title>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Message...</gui>
+                </guiseq>
+                <key>M</key> &mdash; Create a new message, and
+                display a new window to type the message in.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Mailbox...</gui>
+                </guiseq> &mdash; Open a dialog box to create a new
+                mailbox. There are various items like this,
+                corresponding to the different types of mailbox
+                that &Balsa; supports. See the
+                <link xref="mbox-formats"> discussion of different
+                mailbox formats</link> and their advantages and
+                disadvantages.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Remote IMAP folder...</gui>
+                </guiseq> &mdash; Open a dialog box to create a
+                folder for an account on an IMAP server. This
+                <link xref="folder-config"> IMAP folder
+                properties</link> dialog can also be used to change
+                the details of the account.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Remote IMAP subfolder...</gui>
+                </guiseq> &mdash; Open a dialog box to create a new
+                subfolder in an existing IMAP folder tree. This
+                <link xref="subfolder-config"> IMAP subfolder
+                properties</link> dialog can also be used to rename
+                or move a subfolder.</p>
+              </item>
+            </list>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Continue</gui>
+            </guiseq>
+            <key>C</key> &mdash; Continue a postponed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Get New Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>M</key></keyseq> &mdash; 
+            This causes &Balsa; to
+            attempt to retrieve any new messages from the
+            &POP3; server.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Send Queued Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>T</key></keyseq> &mdash;
+            Send all mail waiting in the
+            Outbox mailbox to the mail server now.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Send and Receive Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>B</key></keyseq> &mdash;
+            Send all mail waiting in the
+            Outbox mailbox to the mail server now and retrieve any
+            new messages.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Page Setup</gui>
+            </guiseq> &mdash; Set print options such as paper size
+            and print orientation.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Print</gui>
+            </guiseq> &mdash; Print the currently selected message
+            (displayed in the message view pane.)</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Address Book</gui>
+            </guiseq>
+            <key>B</key> &mdash; Open &Balsa; 's address
+            book.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Quit</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>Q</key></keyseq> &mdash;
+            Exit the program.</p>
+          </item>
+        </terms>
+      </item>
+      <item>
+        <title>
+          <gui> Edit</gui>
+        </title>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Copy</gui>
+            </guiseq>
+            <keyseq><key>Ctrl></key><key>C</key></keyseq> &mdash;
+            Copy selected text to the clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Select All</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>A</key></keyseq> &mdash;
+            Select all text in the currently
+            displayed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Select Thread</gui>
+            </guiseq> &mdash; Select all messages in the same thread
+            as the currently displayed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find</gui>
+            </guiseq> 
+            <keyseq><key>Ctrl</key><key>F</key></keyseq> &mdash;
+            Find messages in the current mailbox
+            that match a given set of conditions, using the
+            <link xref="win-search"> search mailbox
+            window</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find Next</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>G</key></keyseq> &mdash;
+            Find the next matching message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find in Message</gui>
+            </guiseq> <key>/</key>&mdash;
+            Selecting this option opens a "search
+            bar" at the foot of the message preview, in which you
+            can type text for which &Balsa; will search in the
+            current message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Filters</gui>
+            </guiseq> &mdash; Open up the
+            <link xref="win-filters"> filters window</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Export filters</gui>
+            </guiseq> &mdash; Open up a window for exporting filters
+            in the Sieve format.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Preferences...</gui>
+            </guiseq> &mdash; Open the
+            <link xref="preferences"> Preferences</link> window to
+            change the settings of &Balsa; .</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> View</gui>
+        </title>
+        <p> Menu for changing how messages are viewed.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Show Mailbox Tree</gui>
+            </guiseq> <key>F9</key> &mdash;
+            Toggle the display of the mailbox tree
+            in the main window.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Show Mailbox Tabs</gui>
+            </guiseq> &mdash; Toggle the display of tabs for all
+            open mailboxes.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Wrap</gui>
+            </guiseq> &mdash; Toggle the display of messages using
+            word wrap. The column to which the message is wrapped
+            is set in the
+            <link xref="preferences"> Preferences</link> window.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> No Headers</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> Selected Headers</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> All Headers</gui>
+            </guiseq> &mdash; Select the headers to display in the
+            message pane.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Flat index</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> Simple threading</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> JWZ threading</gui>
+            </guiseq> &mdash; Select the type of threading used to
+            display the messages in the message index.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Expand All</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>E</key></keyseq> &mdash;
+            <guiseq>
+              <gui> View</gui>
+              <gui> Collapse All</gui>
+            </guiseq>
+             <keyseq><key>Ctrl</key><key>L</key></keyseq> &mdash;
+             Expand or collapse all
+             threads in the currently displayed mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Zoom In</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>+</key></keyseq>,
+            <guiseq>
+              <gui> Zoom Out</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>-</key></keyseq>,
+            <guiseq>
+              <gui> Zoom 100%</gui>
+            </guiseq> &mdash; Alter the font size of HTML messages.
+            Plain text messages will always use the font specified
+            in the
+            <link xref="preferences"> Preferences</link> window.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> Mailbox</gui>
+        </title>
+        <p> For manipulating mailboxes.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next</gui>
+            </guiseq> <key>N</key>&mdash;
+            Select the next message in the current
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Previous</gui>
+            </guiseq> <key> P</key> &mdash;
+            Select the previous message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next Unread</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>N</key></keyseq> &mdash;
+            Select the next unread message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next Flagged</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>Alt</key><key>F</key></keyseq> &mdash;
+            Select the next flagged message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Hide messages</gui>
+            </guiseq> &mdash; A submenu listing all the types of
+            messages that may be hidden and unhidden in the current
+            mailbox. Types in the submenu are toggled when
+            selected. A Checkmark indicates it is currently
+            hidden.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Reset Filter</gui>
+            </guiseq> &mdash; Resets to the mailbox filter.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Select All</gui>
+            </guiseq> &mdash; Selects all messages in the current
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Edit...</gui>
+            </guiseq> &mdash; Edit mailbox properties.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Delete...</gui>
+            </guiseq> &mdash; Delete the currently selected
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Expunge Deleted Messages</gui>
+            </guiseq> &mdash; Physically remove from the backing
+            mailstore all messages marked as deleted.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Close</gui>
+            </guiseq> &mdash; Close the currently selected
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Empty Trash</gui>
+            </guiseq> &mdash; Delete all messages from the
+            <code> Trash</code> mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Select Filters</gui>
+            </guiseq> &mdash; Pop up a dialog that allows you to
+            control which filters are applied to this mailbox, and
+            optionally to apply them.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Remove Duplicates</gui>
+            </guiseq> &mdash; Remove duplicate messages; &Balsa;
+            locates all messages in the current mailbox that have
+            the same Message-ID header, and removes all but
+            one.</p>
+          </item>
+        </list>
+      </item>
+      <item id="subwin-messagemenu">
+        <title>
+          <gui> Message</gui>
+        </title>
+        <p> This menu has commands for manipulating messages.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <key> R</key>
+              <gui> Message</gui>
+              <gui> Reply...</gui>
+            </guiseq> <key>R</key> &mdash; Reply to the currently selected
+            message(s).</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> A</key>
+              <gui> Message</gui>
+              <gui> Reply to All...</gui>
+            </guiseq> <key>A</key> &mdash; Reply to the currently selected
+            message(s), sending the reply to all senders and
+            recipients of the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> G</key>
+              <gui> Message</gui>
+              <gui> Reply to Group...</gui>
+            </guiseq> <key>G</key> &mdash; Reply to a mailing list, instead of
+            the sender to that list.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> F</key>
+              <gui> Message</gui>
+              <gui> Forward attached...</gui>
+            </guiseq> &mdash; Forward the currently selected
+            message(s) as an attachment.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Forward inline...</gui>
+            </guiseq> &mdash; Forward the currently selected
+            message(s), quoted inline.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Next Part</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>.</key></keyseq>&mdash;
+            View the next part of the message (if
+            the message is multi-part).</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <shortcut>
+                <keycombo>
+                  <sys> Ctrl</sys>
+                  <sys> ,</sys>
+                </keycombo>
+              </shortcut>
+              <gui> Message</gui>
+              <gui> Previous Part</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>,</key></keyseq> &mdash;
+            View the previous part of the
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Save Current Part...</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>S</key></keyseq>&mdash;
+            Save the currently selected part of
+            the message to a file.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <shortcut>
+                <keycombo>
+                  <sys> Ctrl</sys>
+                  <sys> U</sys>
+                </keycombo>
+              </shortcut>
+              <gui> Message</gui>
+              <gui> View Source...</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>U</key></keyseq> &mdash;
+            Opens a new window that displays the
+            raw message as received from the
+            <link xref="glossary#mta">MTA</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Copy</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>C</key></keyseq> &mdash;
+            Copies to the clipboard any text
+            selected in the message view of the current
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Select Text</gui>
+            </guiseq> &mdash; Selects the entire text of the current
+            message in the message view.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Move to Trash</gui>
+            </guiseq> <key>D</key> &mdash; Moves the currently selected
+            message(s) to the Trash.</p>
+          </item>
+          <item>
+            <p>
+              <guiseq>
+                <gui> Message</gui>
+                <gui> Toggle flag</gui>
+              </guiseq>
+            </p>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Flagged</gui>
+                </guiseq> <key>X</key> &mdash;
+                Toggle the flag on the currently
+                selected message(s). This is shown as an
+                exclamation mark next in the message index.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <shortcut>
+                    <keycombo>
+                      <sys> Ctrl</sys>
+                      <sys> D</sys>
+                    </keycombo>
+                  </shortcut>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Deleted</gui>
+                </guiseq>
+                <keyseq><key>Ctrl</key><key>D</key></keyseq> &mdash;
+                Marks the message as set for
+                deletion. The message will be actually removed from
+                the backing mailstore when it is "expunged" either
+                manually, or as specified in the
+                <link xref="preferences">Preferences</link>.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <shortcut>
+                    <keycombo>
+                      <sys> Ctrl</sys>
+                      <sys> R</sys>
+                    </keycombo>
+                  </shortcut>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> New</gui>
+                </guiseq>
+                <keyseq><key>Ctrl</key><key>R</key></keyseq> &mdash;
+                Marks a message that has been read
+                as new, and vice-versa. The message will display
+                the standard icon and font for a new message.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Answered</gui>
+                </guiseq> &mdash; Toggles the reply icon for a
+                message.</p>
+              </item>
+            </list>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> S</key>
+              <gui> Message</gui>
+              <gui> Store Address...</gui>
+            </guiseq> <key>S</key>&mdash; Add the sender of the currently
+            selected message to your address book.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> Settings</gui>
+        </title>
+        <p> Menu for changing &Balsa; 's configuration.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Settings</gui>
+              <gui> Toolbars...</gui>
+            </guiseq> &mdash; Open the
+            <link xref="toolbar-prefs"> Toolbars</link> window to
+            modify the content and arrangement of the toolbars in
+            &Balsa; .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Settings</gui>
+              <gui> Identities...</gui>
+            </guiseq> &mdash; Open the
+            <link xref="identities"> Identities</link> window to
+            customize how you present yourself to the rest of the
+            world.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Help</gui>
+        </title>
+        <p>Menu for getting this help, and information about &Balsa;.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Help</gui>
+              <gui>Contents</gui>
+            </guiseq> <key>F1</key> &mdash; Show this help file.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Help</gui>
+              <gui>About</gui>
+            </guiseq> &mdash; Show information about &Balsa;.</p>
+          </item>
+        </list>
+      </item>
+    </terms>
+  </section>
+  <section id="subwin-mblist">
+    <title> The Mailbox List</title>
+    <p> The mailbox list in the main window lists all of your
+    mailboxes. &Balsa; will automatically detect your local
+    mailboxes by searching for mailboxes under your local mail
+    directory (probably ~/mail). This lets &Balsa; coexist with
+    &Pine; and &procmail; without causing problems.</p>
+    <p> Your mailboxes will be displayed as a tree view, with
+    mailboxes in subdirectories of your local mail directory
+    initially hidden but accessible by expanding the tree.
+    &IMAP; mailboxes will also be displayed as being at the top
+    level of the tree. &POP3; mailboxes are not displayed.</p>
+  </section>
+  <section id="subwin-msgindex">
+    <title> The Message Index</title>
+    <p> The message index displays the messages in the current
+    folder, and lets you choose which messages to view. Click on
+    the notebook tabs, if shown, or click on a folder in the
+    mailbox list to bring it to the front.</p>
+    <p> From the message index you can do a lot. Clicking on a
+    message will cause it to be displayed in the message view.
+    Right-clicking on it will give a pop-up menu letting you reply
+    to the message (or forward it, etc.) and move it to another
+    folder (using the
+    <gui> Move to</gui> menu item). Double-clicking on a message, or
+    pressing either the space-bar or the
+    <sys> Enter</sys> key while the keyboard focus is in the index,
+    will open the message in a separate window. Also, it is
+    possible to drag and drop messages from the index to other
+    mailboxes in the mailbox list and open mailbox tabs.</p>
+    <p> The pop-up (context) menu contains the following items:</p>
+    <list>
+      <item>
+        <p>
+        <guiseq>
+          <gui> Reply</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Reply To All</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Reply To Group</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Forward Attached</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Forward Inline</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Store Address</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Delete</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Undelete</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Move To Trash</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Toggle Flagged</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Toggle Unread</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Move to</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> View Source</gui>
+        </guiseq> &mdash; These perform the same actions as their
+        counterparts in the
+        <link xref="win-main#subwin-messagemenu"> message menu</link> .</p>
+      </item>
+      <item>
+        <p>
+        <guiseq>
+          <gui> Move to</gui>
+        </guiseq> &mdash; Moves the currently selected message(s) to
+        another mailbox. When this menu item is selected, a list of
+        available mailboxes is displayed, from which the
+        destination may be selected.</p>
+      </item>
+    </list>
+  </section>
+  <section id="subwin-msgview">
+    <title> The Message View</title>
+    <p> This displays the email that is selected in the message
+    index. Message headers are displayed above the main text of the
+    message, unless they have been disabled. The text of the
+    message is shown below the headers.</p>
+    <p> If the message is multipart, an attachment icon will appear
+    beside the headers. Clicking this icon will display a list of
+    the parts from which you may select one. If &Balsa; is
+    unable to display it, you will be given a choice of
+    applications known to handle the part. Additionally, there is
+    always an option to save the attachment to a file.</p>
+    <note>
+      <p> &Balsa; supports viewing HTML messages only when
+      compiled with
+      <app> gtkhtml</app> or
+      <app> WebKit</app> support. Gtkhtml support will be compiled in
+      if gtkhtml-devel files are found. WebKit is currently
+      supported only on an experimental basis,</p>
+    </note>
+    <p> You are not restricted to that pane either. Double-clicking
+    on a message in the message index, or touching either the space
+    bar or the
+    <sys> Enter</sys> key, will open it in a
+    <link xref="win-message"> separate window</link> .</p>
+  </section>
+</page>
diff --git a/doc/C/win-message.page b/doc/C/win-message.page
new file mode 100644
index 0000000..e75504e
--- /dev/null
+++ b/doc/C/win-message.page
@@ -0,0 +1,70 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities">%balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="win-message">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+<title>The Message Window</title>
+
+<p>
+  In addition to the preview pane, &Balsa; can display messages in
+  separate windows.  Simply double-click on the desired message from
+  the message index in the main window, or select the message and press
+  the space bar.  Any number of windows may be
+  opened, although only one per unique message.
+</p>
+
+<p>
+  The message window has a menu and toolbar containing commands
+  pertinent to an individual message.  Commands are as described in
+  the <link xref="win-main">main window</link>.
+  Below the menu and toolbar are the message headers in a box,
+  followed by the message body.
+</p>
+
+<figure>
+  <title>Message Window</title>
+  <media type="image" src="figures/message-window.png" format="PNG"/>
+</figure>
+
+<p>
+  If your copy of &Balsa; has cryptographic support, there will be
+  an icon in the header box depicting an envelope with a lock and a
+  check mark.  Clicking the icon will check the key used to sign the
+  message.  The message body will contain an icon and some
+  descriptive text noting whether the signing key is valid, invalid,
+  or unchecked.
+</p>
+
+<p>
+  If the message contains attachments or more than one part of any
+  kind, an attachment icon will be present in the header box as
+  shown below.  Clicking this icon will show a menu of all available
+  parts.  Selecting a part will update the display of the message
+  body accordingly.
+</p>
+
+<figure>
+  <title>Selecting a Message Part</title>
+  <media tyep="image" src="figures/msg-part-select.png" format="PNG"/>
+</figure>
+
+<p>
+  The <gui>complete message</gui> selection will
+  do its best to render all
+  parts at once, but some may have to be selected individually or
+  opened in an external program.  Parts which cannot be rendered
+  within &Balsa; will instead display a list of options for opening
+  external programs or saving the data.  Right-clicking on a part
+  will also provide a menu with these options.
+</p>
+
+<p>
+  Navigation between messages is possible without returning to the
+  index in the main window.  Next unread being quite useful for
+  checking all new mail.  Deleting the current message will
+  automatically display the next unread one.  This behavior can be
+  changed in the <link xref="preferences">preferences</link>.
+</p>
+</page>
diff --git a/doc/C/win-run-filters.page b/doc/C/win-run-filters.page
new file mode 100644
index 0000000..9ac009a
--- /dev/null
+++ b/doc/C/win-run-filters.page
@@ -0,0 +1,84 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="win-run-filters">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>The Select Filters Window</title>
+  <p>This window is divided in two lists: the left one displays all
+  available filters, and the right part displays all filters to be
+  applied on the mailbox (the name of which is shown in the window
+  title). See the
+  <link xref="win-filters">filters window</link> section to see
+  how to set up filters.</p>
+  <p>The right list has three columns. The first one contains the
+  filters name. The two others tells you if the filter will be
+  automatically applied: e.g. if a dot is displayed in the second
+  column
+  (<gui>On reception</gui>), this tells you that whenever new
+  messages arrived in this mailbox, they will be filtered by the
+  corresponding filter (Note: the filter is applied only on the new
+  messages, not the entire mailbox; this is similar to the use of
+  procmail). In the same way, if a dot is displayed in the third
+  column
+  (<gui>On exit</gui>), the filter will be applied to the entire
+  mailbox when you exit &Balsa;.</p>
+  <p>Note: the
+  <gui>On exit</gui> feature is not yet implemented.</p>
+  <p>When you tell &Balsa; to apply several filters on the same
+  mailbox (i.e. when you put several filters in the right list),
+  only the first match counts: the filters are applied in the
+  specified order and the first that matches on the current message
+  will be applied but not the following ones.</p>
+  <p>There are two buttons between the filters lists:
+  <list>
+    <item>
+      <p>The
+      <gui>Add</gui> button: moves the selected filters from the
+      left list to the right one, adding more filters to be applied
+      to the mailbox.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Remove</gui> button: removes the currently selected
+      filter in the right list and puts it back in the left
+      list.</p>
+    </item>
+  </list></p>
+  <p>The
+  <gui>Up</gui> and
+  <gui>Down</gui> buttons under the right list serve to reorder the
+  filters that are to be applied. This is a sort of priority
+  between filters, because if several filters could match the
+  current message, only the first one will be applied. The
+  <gui>Apply Now</gui> button applies all filters of the right list
+  to the entire mailbox immediately (be patient, this can take a
+  quite a long time on big mailboxes or remote ones).</p>
+  <p>You can also use this dialog to apply a filter to a mailbox
+  without actually attaching it to the mailbox. Select one or more
+  filters in the left hand list, and click the
+  <gui>Apply Selected</gui> button below that list.</p>
+  <p>There are three buttons below the filters lists:
+  <list>
+    <item>
+      <p>The
+      <gui>OK</gui> button: saves the list of filters associated to
+      the mailbox. Note that this does not apply the filters to the
+      mailbox. It is useful only when you have set up automatic
+      filters, or when you have to manually apply a lot of filters
+      frequently to this mailbox: the next time &Balsa; will
+      reload the saved filters and you will only have to press the
+      <gui>Apply</gui> button.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Cancel</gui> button: this discards any changes and closes
+      the dialog box.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Help</gui> button: opens this help window.</p>
+    </item>
+  </list></p>
+</page>
diff --git a/doc/C/win-search.page b/doc/C/win-search.page
new file mode 100644
index 0000000..1aa2786
--- /dev/null
+++ b/doc/C/win-search.page
@@ -0,0 +1,59 @@
+<!DOCTYPE page
+[<!ENTITY % balsa SYSTEM "balsa.entities"> %balsa; ]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic"
+id="win-search">
+  <info>
+    <link type="guide" xref="index" />
+  </info>
+  <title>The Search Mailbox Window</title>
+  <p>You can search a mailbox to find and display messages that
+  contain a given string in the To, From, Subject, or Cc headers,
+  or in the message body. This window allows you to specify the
+  string for which you want to search and where &Balsa; should
+  look. Open the window with the
+  <guiseq>
+    <gui>Edit</gui>
+    <gui>Find</gui>
+  </guiseq>command, or
+  <keyseq>
+    <key>Ctrl</key>
+    <key>F</key>
+  </keyseq>.</p>
+  <p>You can view the matching messages in two ways:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Show only matching messages</gui>
+      </title>
+      <p>If you click the
+      <gui>Apply</gui>button, the mailbox view will be filtered to
+      show only the messages that match the conditions. If you
+      click the
+      <gui>Clear</gui>button, the filter will be cleared, and the
+      mailbox view will be restored to show all messages. You can
+      also use
+      <guiseq>
+        <gui>Mailbox</gui>
+        <gui>Reset Filter</gui>
+      </guiseq>to restore the view.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Open next matching message</gui>
+      </title>
+      <p>Alternatively, you can step through the matching messages,
+      either forward or in reverse, and optionally wrapping the
+      search when it reaches the end of the mailbox. Click the
+      <gui>OK</gui>button to view the first matching message after
+      (or before) the current message. Then you can use
+      <guiseq>
+        <gui>Edit</gui>
+        <gui>Find Next</gui>
+      </guiseq>, or
+      <keyseq>
+        <key>Ctrl</key>
+        <key>G</key>
+      </keyseq>, to step through the matching messages.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d4f617d..d8675b5 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,8 +1,141 @@
-2013-04-27  Peter Bloomfield  <peter w500 bellsouth net>
+2013-05-01  Peter Bloomfield
+
+       New Mallard help files
+
+       * C/ab-conf.page:
+       * C/authors.page:
+       * C/balsa.entities:
+       * C/common-tasks.page:
+       * C/folder-config.page:
+       * C/getting-started.page:
+       * C/glossary.page:
+       * C/identities.page:
+       * C/index.page:
+       * C/introduction.page:
+       * C/its-not-working.page:
+       * C/mbox-formats.page:
+       * C/preferences-address-books.page:
+       * C/preferences-display-options.page:
+       * C/preferences-mail-options.page:
+       * C/preferences-miscellaneous.page:
+       * C/preferences-spelling.page:
+       * C/preferences-startup.page:
+       * C/preferences.page:
+       * C/toolbar-prefs.page:
+       * C/win-composer.page:
+       * C/win-filters.page:
+       * C/win-main.page:
+       * C/win-message.page:
+       * C/win-run-filters.page:
+       * C/win-search.page:
+       * de/ab-conf.page:
+       * de/authors.page:
+       * de/common-tasks.page:
+       * de/folder-config.page:
+       * de/getting-started.page:
+       * de/glossary.page:
+       * de/identities.page:
+       * de/index.page:
+       * de/introduction.page:
+       * de/its-not-working.page:
+       * de/mbox-formats.page:
+       * de/preferences-address-books.page:
+       * de/preferences-display-options.page:
+       * de/preferences-incoming-and-outgoing-mail.page:
+       * de/preferences-mail-options.page:
+       * de/preferences-miscellaneous.page:
+       * de/preferences-spelling.page:
+       * de/preferences-startup.page:
+       * de/preferences.page:
+       * de/toolbar-prefs.page:
+       * de/win-composer.page:
+       * de/win-filters.page:
+       * de/win-main.page:
+       * de/win-message.page:
+       * de/win-run-filters.page:
+       * de/win-search.page:
+       * es/ab-conf.page:
+       * es/authors.page:
+       * es/common-tasks.page:
+       * es/folder-config.page:
+       * es/getting-started.page:
+       * es/glossary.page:
+       * es/identities.page:
+       * es/index.page:
+       * es/introduction.page:
+       * es/its-not-working.page:
+       * es/mbox-formats.page:
+       * es/preferences-address-books.page:
+       * es/preferences-display-options.page:
+       * es/preferences-incoming-and-outgoing-mail.page:
+       * es/preferences-mail-options.page:
+       * es/preferences-miscellaneous.page:
+       * es/preferences-spelling.page:
+       * es/preferences-startup.page:
+       * es/preferences.page:
+       * es/toolbar-prefs.page:
+       * es/win-composer.page:
+       * es/win-filters.page:
+       * es/win-main.page:
+       * es/win-message.page:
+       * es/win-run-filters.page:
+       * es/win-search.page:
+       * fr/ab-conf.page:
+       * fr/authors.page:
+       * fr/common-tasks.page:
+       * fr/folder-config.page:
+       * fr/getting-started.page:
+       * fr/glossary.page:
+       * fr/identities.page:
+       * fr/index.page:
+       * fr/introduction.page:
+       * fr/its-not-working.page:
+       * fr/mbox-formats.page:
+       * fr/preferences-address-books.page:
+       * fr/preferences-display-options.page:
+       * fr/preferences-incoming-and-outgoing-mail.page:
+       * fr/preferences-mail-options.page:
+       * fr/preferences-miscellaneous.page:
+       * fr/preferences-spelling.page:
+       * fr/preferences-startup.page:
+       * fr/preferences.page:
+       * fr/toolbar-prefs.page:
+       * fr/win-composer.page:
+       * fr/win-filters.page:
+       * fr/win-main.page:
+       * fr/win-message.page:
+       * fr/win-run-filters.page:
+       * fr/win-search.page:
+       * sl/ab-conf.page:
+       * sl/authors.page:
+       * sl/common-tasks.page:
+       * sl/folder-config.page:
+       * sl/getting-started.page:
+       * sl/glossary.page:
+       * sl/identities.page:
+       * sl/index.page:
+       * sl/introduction.page:
+       * sl/its-not-working.page:
+       * sl/mbox-formats.page:
+       * sl/preferences-address-books.page:
+       * sl/preferences-display-options.page:
+       * sl/preferences-incoming-and-outgoing-mail.page:
+       * sl/preferences-mail-options.page:
+       * sl/preferences-miscellaneous.page:
+       * sl/preferences-spelling.page:
+       * sl/preferences-startup.page:
+       * sl/preferences.page:
+       * sl/toolbar-prefs.page:
+       * sl/win-composer.page:
+       * sl/win-filters.page:
+       * sl/win-main.page:
+       * sl/win-message.page:
+       * sl/win-run-filters.page:
+       * sl/win-search.page:
 
-       reviewed by: <delete if not using a buddy>
+2013-04-27  Peter Bloomfield  <peter w500 bellsouth net>
 
-       * Makefile.am:
+       * Makefile.am: list the Mallard help files.
 
 2013-04-23  Peter Bloomfield
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 35f97a9..e4925f3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,50 @@
 if HAVE_YELPTOOL
+
 @YELP_HELP_RULES@
+
 HELP_ID      = balsa
-HELP_MEDIA   = figures/address-book-ldap.png                   \
+
+balsa_help_files =                                             \
+               ab-conf.page                                    \
+               authors.page                                    \
+               common-tasks.page                               \
+               folder-config.page                              \
+               getting-started.page                            \
+               glossary.page                                   \
+               identities.page                                 \
+               index.page                                      \
+               introduction.page                               \
+               its-not-working.page                            \
+               mbox-formats.page                               \
+               preferences-address-books.page                  \
+               preferences-display-options.page                        \
+               preferences-mail-options.page                   \
+               preferences-miscellaneous.page                  \
+               preferences.page                                        \
+               preferences-startup.page                                \
+               toolbar-prefs.page                              \
+               win-composer.page                               \
+               win-filters.page                                        \
+               win-main.page                                   \
+               win-message.page                                        \
+               win-run-filters.page                            \
+               win-search.page
+
+if BUILD_WITH_GTKSPELL
+balsa_gtkspell_extra =
+balsa_gtkspell_extra_dist = preferences-spelling.page
+else
+balsa_gtkspell_extra_dist =
+balsa_gtkspell_extra = preferences-spelling.page
+endif
+
+HELP_FILES   = $(balsa_help_files) $(balsa_gtkspell_extra)
+EXTRA_DIST   = balsa.xml $(balsa_gtkspell_extra_dist)
+
+HELP_EXTRA   = balsa.entities
+
+HELP_MEDIA   =                                                 \
+             figures/address-book-ldap.png                     \
              figures/address-book-modify.png                   \
              figures/address-book.png                          \
              figures/address-book-vcard.png                    \
@@ -18,6 +61,7 @@ HELP_MEDIA   = figures/address-book-ldap.png                  \
              figures/newmsg-window-toolbar.png                 \
              figures/preferences-window.png                    \
              figures/spell-check.png
+
 HELP_LINGUAS = de es fr sl
 
 doc-dist-hook:
diff --git a/doc/de/ab-conf.page b/doc/de/ab-conf.page
new file mode 100644
index 0000000..b26b88b
--- /dev/null
+++ b/doc/de/ab-conf.page
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="ab-conf" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>Address Book Configuration</title>
+  <p>Dies ist auszufüllen.</p>
+
+<section id="CHOICE">
+  <title>Adressbuch-Typ</title>
+  <p>Sie können zwischen verschiedenen Adressbuchtypen wählen.</p>
+</section>
+
+<section id="EXTERN">
+<title>Externes Adressbuch</title>
+<!-- Balsa support for an external query addressbook -->
+<!-- By Jelmer Vernooij <jelmer nl linux org>        -->
+
+<p>The balsa addressbook supports input from programs. Thus, you
+can use (no importing needed!) for example your pine or mutt
+addressbook. The mutt mailer (<link href="http://www.mutt.org/";>www.mutt.org</link>) uses an identical
+system to retrieve addresses from programs.</p>
+
+  <section id="extern-existing-programs">
+   <title>Vorhandene Programme</title>
+
+<p>The following programs are compatible with the mutt mail reader
+and <em>should</em> be with balsa. Submit links to more programs.</p>
+
+<list>
+<item><p>
+<link href="http://www.spinnaker.de/lbdb/"; type="http">http://www.spinnaker.de/lbdb/</link> - The little
+brother database. Read emailaddresses and names from: finger,
+/etc/passwd, incoming procmail email, NIS, fido, the abook program,
+mutt addressbook, pine addressbook, palm addressbook, gnomecard
+addressbook, big brother database, ldap database.
+</p></item>
+
+<item><p>
+<link href="http://www.fiction.net/blong/programs/mutt/";>http://www.fiction.net/blong/programs/mutt/</link>
+ - palm address database, ldapsearch wrapper, ph/qi server, UIUC, ph,
+</p></item>
+</list>
+</section>
+
+<section id="extern-load-scripts">
+<title>Schreiben eigener Ladeskripte</title>
+
+<p><app>Balsa</app> ignores the first line of output from your program. You
+might want to write comments or debug output on this line. The
+remaining lines should have this format:</p>
+<p><output>
+e-mail address full name       nickname
+</output></p>
+
+<p>Die drei Felder sollten mittels Tabulatoren voneinander getrennt werden. Das dritte Feld wird gegenwärtig 
von Balsa nicht benutzt, jedoch möglicherweise in Zukunft. Es stellt allerdings die Kompatibilität zu Mutt 
sicher.</p>
+
+<p><app>Balsa</app> executes your script with one argument: the pattern to
+search for. A space (" ") is used as the first argument when creating
+a list of all users.</p>
+
+<p>Alle Zeichen sind erlaubt, mit Ausnahme des Tabulators (\t), weil dieses Zeichen die Felder voneinander 
trennt.</p>
+
+<p>Eine Ausgabe könnte zum Beispiel lauten:</p>
+<p><output>
+lbdbq: 3 matches
+</output></p>
+<p><output>
+balsa-list gnome org   Balsa List      balsa-list
+</output></p><p><output>
+jelmer nl linux org    Jelmer Vernooij jelmer
+</output></p><p><output>
+balsa-maintainer theochem kth se       Pawel Salek     balsa-maintainer
+</output></p>
+
+
+<note><p>Your script/program should write its output to stdout and not
+to stderr!
+</p></note>
+</section>
+
+<section id="extern-save-scripts">
+<title>Schreiben eigener Speicherskripte</title>
+
+<p>Das Hinzufügen von Adressen ist ebenfalls möglich. Ihr Skript sollte drei Argumente empfangen: Das erste 
ist die E-Mail-Adresse, das zweite der volle Name und das dritte ist ein Alias. Der Alias wird gegenwärtig 
nicht benutzt und durch »TODO« ersetzt.</p>
+
+<p>Beachten Sie, dass Mutt das Hinzufügen von Adressen nicht unterstützt und daher in diesem Fall keine 
Kompatibilität besteht.</p>
+
+<p>Comments are welcome:
+<link href="mailto:jelmer nl linux org">jelmer nl linux org</link></p>
+</section>
+</section> <!-- EXTERN -->
+</page>
diff --git a/doc/de/authors.page b/doc/de/authors.page
new file mode 100644
index 0000000..1467d0a
--- /dev/null
+++ b/doc/de/authors.page
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="authors" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Autoren</title>
+  <p><app>Balsa</app> is currently developed by (in alphabetical
+  order):</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Carlos Morgado (
+      <link href="mailto:chbm chbm nu">chbm chbm nu</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+  </list>
+  <p>In the past, numerous people contributed to balsa, including
+  (in alphabetical order):</p>
+  <list>
+    <item>
+      <p>Hector Garcia Alvarez (
+      <link href="mailto:hector scouts-es org">
+      hector scouts-es org</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Bruno Pires Marinho (
+      <link href="mailto:bapm camoes rnl ist utl pt">
+      bapm camoes rnl ist utl pt</link> )</p>
+    </item>
+    <item>
+      <p>Jay Painter (
+      <link href="mailto:jpaint gimp org">
+      jpaint gimp org</link> )</p>
+    </item>
+    <item>
+      <p>Stuart Parmenter (
+      <link href="mailto:pavlov pavlov net">
+      pavlov pavlov net</link> )</p>
+    </item>
+    <item>
+      <p>David Pickens (
+      <link href="mailto:dpickens iaesthetic com">
+      dpickens iaesthetic com</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>To find more information about it, please visit the
+  <app>Balsa</app>
+  <link href="http://balsa.gnome.org/";>Web page</link>. Please send
+  all comments, suggestions, and bug reports to the
+  <link href="http://bugs.gnome.org/";>GNOME bug tracking
+  database</link>. Instructions for submitting bug reports can be
+  found on-line at
+  <link href="http://balsa.gnome.org/bugs.html";>
+  http://balsa.gnome.org/bugs.html</link>. If you are using GNOME
+  1.1 or later, you can also use command
+  <cmd>bug-buddy</cmd> for submitting bug reports.</p>
+  <p>The following people contributed to this manual:</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Berend De Schouwer (
+      <link href="mailto:bds jhb ucs co za">
+      bds jhb ucs co za</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Craig Routledge (
+      <link href="mailto:webstuff craigroutledge com">
+      webstuff craigroutledge com</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+    <item>
+      <p>Jelmer Vernooij (
+      <link href="mailto:jelmer nl linux org">
+      jelmer nl linux org</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>Please send all comments and suggestions regarding the manual
+  to the GNOME Documentation Project at
+  <link href="mailto:docs gnome org">docs gnome org</link> and the
+  <link href="http://mail.gnome.org/mailman/listinfo/balsa-list";>
+  <app>Balsa</app> Discussion List</link>. You can also add your
+  comments online by using
+  <link href="http://library.gnome.org/devel/gdp-handbook/stable/gettingstarted.html.en";>
+  GNOME Documentation Status Table</link>.</p>
+</page>
diff --git a/doc/de/common-tasks.page b/doc/de/common-tasks.page
new file mode 100644
index 0000000..cff2108
--- /dev/null
+++ b/doc/de/common-tasks.page
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="common-tasks" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Common Tasks with <app>Balsa</app></title>
+  <p>This section explains many of the things you might want to do
+  with <app>Balsa</app>.</p>
+  <list>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-create-new-mb">Creating new
+        mailboxes</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-move-msg">Moving messages around</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-main-folder-imap">Making one of the main
+        folders IMAP-based</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-alias-expansion">Expanding e-mail
+        addresses automatically</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-ldap">Setting up LDAP address
+        books</link>
+      </p>
+    </item>
+  </list>
+  <section id="ct-create-new-mb">
+    <title>Erstellen neuer Postfächer</title>
+    <p>You can create new local and <link xref="glossary#imap">IMAP</link> mailboxes
+    using the <guiseq><gui>File</gui><gui>New</gui></guiseq> command, or
+    by
+    right-clicking in the mailbox list and selecting
+    <gui>New Mailbox</gui>.
+    This will start a dialog that will let you name the mailbox and
+    specify its location.</p>
+    <p>To create a new <link xref="glossary#pop">POP3</link> mailbox, go to the <link 
xref="preferences">preferences window</link>,
+    select the <gui>Mail options</gui> page, and click <gui>Add</gui>
+    in the <gui>Remote mailbox servers</gui>
+    area. A dialog will be displayed that will let you set up the
+    new mailbox.</p>
+  </section>
+  <section id="ct-move-msg">
+    <title>Verschieben von Nachrichten</title>
+    <p>There are several methods available for moving or copying
+    messages from one mailbox to another. The first is via the
+    <gui>Transfer</gui> context menu, and the second is using drag
+    and drop.</p>
+    <p>To transfer messages using the
+    <gui>Transfer</gui> menu, simply select the messages you desire
+    to move from one mailbox, then press
+    <keyseq><key>Shift</key><key>F10</key></keyseq> or <key>Menu</key>,
+    or click the right
+    mouse button,
+    to bring up the context menu and
+    select the
+    <gui>Move to</gui> submenu. This will display a list of
+    mailboxes similar to the mailbox list in the main window. The
+    list can be scrolled and trees expanded and collapsed, although
+    these changes will not be reflected in the main list. Selecting
+    a mailbox will start the transfer.</p>
+    <p>The other method of transferring messages is to simply drag
+    and drop the message(s) from the message index to the desired
+    destination. Select the message(s) you wish to transfer, then
+    drag them using the mouse until they are over the intended
+    mailbox. The destination can either be in the mailbox list in
+    the main window, or if open mailbox tabs are enabled the
+    messages can be dragged to them.  </p>
+  </section>
+  <section id="ct-main-folder-imap">
+    <title>I want one of the main folders to be IMAP</title>
+    <p>First, create the IMAP folder as you want it configured.
+    Then, press right mouse button on the mailbox entry and select
+    <gui>Mark as Inbox</gui>. That is all!</p>
+  </section>
+  <section id="ct-alias-expansion">
+    <title>I want Balsa to guess my friends</title>
+    <p><app>Balsa</app> can expand the names of your contacts it finds
+    in <app>Balsa</app> addressbooks. It will do this by any part of the
+    contact's name or email address.</p>
+    <p>As you type a username in any of the To:, Cc:, or Bcc: entry
+    boxes in the
+    <link xref="win-composer">Compose window</link>, it will do
+    a case insensitive search in the addressbook for a matching
+    username, and pop up a list of matching complete addresses.
+    Press
+    <key>Cursor-Down</key> to highlight one of the addresses, and
+    <key>Enter</key> to select it.</p>
+    <!--
+  This is best demonstrated
+  with the following picture:</p>
+
+  <figure>
+    <title>Expanding Aliases</title>
+    <screenshot>
+          <mediaobject>
+            <imageobject><imagedata
+                fileref="figures/example-alias.png" format="PNG"/>
+            </imageobject>
+          </mediaobject>
+    </screenshot>
+  </figure>
+
+  <p>The example shows what it looks like if "Balsa Mailing
+  List" is in your address book, and you have typed
+  &quot;ba&quot;</p>
+-->
+    <p>To enable this feature, you must select which address books
+    you wish to be searched for aliases to expand. This can be done
+    in the
+    <link xref="preferences-address-books">
+    Preferences</link> window, on the
+    <gui>Address Books</gui> page. Also, some address books are
+    expensive to lookup. You will need then to press
+    <key>Escape</key> to explicitly expand the alias.</p>
+  </section>
+  <section id="ct-ldap">
+    <title>Konfigurieren von LDAP-Adressbüchern</title>
+    <p>Only steps crucial for <app>Balsa</app> are described here. Some
+    of the steps may be specific to OpenLDAP server. Whenever in
+    doubt, consult the documentation provided with your LDAP
+    server.</p>
+    <list>
+      <item>
+        <p>Installieren Sie die LDAP-Serversoftware.</p>
+      </item>
+      <item>
+        <p>Configure. In the case of OpenLDAP, edit
+        <file>/etc/openldap/ldap.conf</file> and
+        <file>/etc/openldap/slapd.conf</file>. Consult your LDAP
+        configuration and other sources to choose the right Domain
+        Name for your institution and authentication level
+        apriopriate to your environment.</p>
+      </item>
+      <item>
+        <p>Import data to your LDAP server. OpenLDAP comes with a
+        set of migration tools but they do not create directly
+        objects of standard
+        <code>inetOrgPerson</code> class which is an apropriate type
+        for address book entry. You may need to tune them.</p>
+      </item>
+    </list>
+    <p><app>Balsa</app> searches for objects having
+    <sys>mail</sys> attribute. The search is done on the
+    <sys>cn</sys> attribute and the search filter has a form
+    "(&amp;(mail=*)(cn=John D))". <app>Balsa</app> uses
+    <sys>cn</sys>(common name),
+    <sys>givenName</sys>(given name),
+    <sys>sn</sys>(surname) and
+    <sys>mail</sys>(e-mail address) attributes of the found
+    objects.</p>
+  </section>
+</page>
diff --git a/doc/de/folder-config.page b/doc/de/folder-config.page
new file mode 100644
index 0000000..9964f4c
--- /dev/null
+++ b/doc/de/folder-config.page
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="folder-config" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>IMAP Folder Configuration</title>
+  <p>The folder configuration edit dialog allows you to configure
+  entire mailbox sets on remote IMAP servers. Entire configuration
+  is split into basic and advanced parts.</p>
+  <section>
+    <title>Grundlegende Konfiguration von IMAP-Ordnern</title>
+    <p>Die grundlegende Konfiguration des IMAP-Ordners ist möglicherweise der einzige Teil, den Sie 
ausfüllen müssen.</p>
+    <list>
+      <item>
+        <p>Descriptive name is the name of the root node that will
+        be shown in the mailbox tree on the left side.</p>
+      </item>
+      <item>
+        <p><guilabel>Server</guilabel> ist der Rechnername oder die IP-Adresse des IMAP-Servers.</p>
+      </item>
+      <item>
+        <p><guilabel>Benutzername</guilabel> ist der für die Legitimierung am IMAP-Server verwendete 
Name.</p>
+      </item>
+      <item>
+        <p>Einige Server ermöglichen den anonymen Zugang zu »Schwarzen Brettern« oder 
Mailinglisten-Archiven. Aktivieren Sie dieses Kontrollkästchen - Sie werden nicht nach einem Passwort 
gefragt.</p>
+      </item>
+      <item>
+        <p><guilabel>Passwort</guilabel> ist das für die Legitimierung am IMAP-Server verwendete 
Passwort.</p>
+      </item>
+      <item>
+        <p>Check box allows you to choose all mailboxes on the
+        server, or only those you subscribed to.</p>
+      </item>
+      <item>
+        <p>Prefix is the root mailbox on the server. You may leave
+        it empty if you want to show all the folders on your server
+        but if your IMAP server stores also other kind of files you
+        may specify for instance "mail".</p>
+      </item>
+    </list>
+  </section>
+  <section>
+    <title>Erweiterte IMAP-Ordnerkonfiguration</title>
+    <p>Sometimes, it is necessary to tune the folder configuration
+    in order to assure a secure connection, adjust to server limits
+    or just obtain better performance. This functionality is
+    provided by the Advanced IMAP folder configuration tab.</p>
+    <list>
+      <item>
+        <p>The
+        <gui>Use SSL</gui> check box should be active if the
+        connection is to be made to IMAPS service on port 993.
+        Connection to this port will be encrypted from the start.
+        Not all servers provide this service - many provide only
+        negotiated TLS encryption.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use TLS</gui> option list determines instruct balsa how
+        to negotiate the TLS encryption. <app>Balsa</app> can never
+        attempt to negotiate it, can start TLS encryption whenever
+        it is supported by server, or can abort the connection if
+        TLS is inavailable or fails for some reason.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Max. number of connections</gui> limits the number of
+        concurrent connections open to the IMAP server. A number
+        around 15-40 is a sane option as it avoids time-consuming
+        and load-creating reselections of imap mailboxes. Some IMAP
+        servers -- notably Courier -- limit the number of
+        connections open from single IP number to 4 by default. The
+        limit in balsa has to be in such a case adjusted
+        accordingly.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Enable persistent cache</gui> check box chooses whether
+        <app>Balsa</app> should try to store downloaded messages between
+        sessions or throw them away when it is closed. The optimal
+        choice depends on the local configuration. If the
+        connection to the IMAP server is slow and local storage in
+        the home directory fast and cheap, it is recommended to
+        enable persistent message cache. If the home directory is
+        slow (eg. NFS-mounted) and the connection to the imap
+        server - fast, persistent cache becomes just a burden and
+        should be disabled.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use IDLE command</gui> check box chooses whether
+        <app>Balsa</app> should try to use IDLE command when available.
+        With this command, some servers notify immediately when a
+        new command arrives. Also, this command may reduce the
+        amount of network traffic. There are some downsides, too:
+        some firewalls do not track IMAP connections correctly and
+        will incorrectly interrupt a session in an IDLE state. In
+        particular, home-grade network routers with NAT translation
+        have notoriously this bug. In such case, it may be safer to
+        disable this command.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Enable bug workarounds</gui> check box makes
+        <app>Balsa</app> work even with an IMAP server that cannot
+        provide selected message parts. <app>Balsa</app> in such a case
+        will try to fetch entire messages instead.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use STATUS for mailbox checking</gui> check box enables
+        a more thorough but potentially more expensive way of
+        checking mailboxes on IMAP server. This method can be
+        consume many resources on the server and should be used
+        <em>only</em> on IMAP servers that have optimized STATUS
+        command.</p>
+      </item>
+    </list>
+  </section>
+  <section id="subfolder-config">
+    <title>Eigenschaften für IMAP-Unterordner</title>
+    <p>The subfolder properties dialog allows you to manage folders
+    on remote IMAP servers. Specifically, you can
+    <em>create</em> a new subfolder,
+    <em>rename</em> an existing subfolder, or
+    <em>move</em> a subfolder within the folder tree.</p>
+    <list>
+      <item>
+        <p>
+        <gui>Folder name</gui> is how the folder is shown in the
+        mailbox tree on the left side.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Subfolder of</gui> indicates the immediate parent of
+        the folder.</p>
+      </item>
+    </list>
+    <p>When the dialog is opened from
+    <guiseq>
+      <gui>File</gui>
+      <gui>New</gui>
+      <gui>Remote IMAP subfolder</gui>
+    </guiseq>, you can enter the folder name and browse IMAP trees
+    to find the parent folder. If you had already selected a
+    mailbox in an IMAP tree, only that tree is shown for browsing;
+    otherwise, all IMAP trees will be shown.</p>
+    <p>When the dialog is opened from
+    <guiseq>
+      <gui>Mailbox</gui>
+      <gui>Edit</gui>
+    </guiseq> with an IMAP folder selected, or by right-clicking on
+    an IMAP mailbox and selecting
+    <gui>Properties...</gui>, the mailbox may be:</p>
+    <list>
+      <item>
+        <p>Renamed, by editing the folder name;</p>
+      </item>
+      <item>
+        <p>Moved, by browsing for a different parent folder in the
+        same tree.</p>
+      </item>
+    </list>
+  </section>
+</page>
diff --git a/doc/de/getting-started.page b/doc/de/getting-started.page
new file mode 100644
index 0000000..ee9605e
--- /dev/null
+++ b/doc/de/getting-started.page
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="getting-started" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="next" xref="win-main"/>
+  </info>
+  <title>Getting Started with <app>Balsa</app></title>
+  <p>If you're starting <app>Balsa</app> for the first time, the first
+  thing you'll see is an assistant that will set up <app>Balsa</app>'s
+  basic settings. <app>Balsa</app> can guess most of what it needs to
+  know about you. It will also create five standard local
+  mailboxes: the Inbox, Outbox, Sentbox, Draftbox, and Trash.
+  (These can be changed to be <link xref="glossary#imap">IMAP</link> mailboxes later.)</p>
+  <figure>
+    <media type="image" src="figures/druid-start.png"/>
+    <title><app>Balsa</app> Start Assistant</title>
+  </figure>
+  <p>Don't worry. <app>Balsa</app> cooperates with other
+  <link xref="glossary#mua">MUA</link>'s very well. They share the
+  same locking semantics for mailboxes. If <app>Balsa</app> shares the
+  same mail directory as <app>pine</app> or <app>Mutt</app>, it will detect
+  new folders as they are created. So if you have to telnet in to
+  your mail machine, you won't be stuck.</p>
+  <p>There are many more settings in <app>Balsa</app>'s
+  <link xref="preferences">preferences window</link>, but most of
+  them do not need to be changed.</p>
+  <p>Once <app>Balsa</app> is configured, you will proceed on to the
+  <link xref="win-main">main window</link>.</p>
+</page>
diff --git a/doc/de/glossary.page b/doc/de/glossary.page
new file mode 100644
index 0000000..0f41611
--- /dev/null
+++ b/doc/de/glossary.page
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="glossary" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Glossar</title>
+    <section id="pop">
+      <title>POP</title>
+      <p>An acronym for "Post Office Protocol", a simple method of
+      retrieving mail messages from a remote mail server. Widely
+      used by mail clients from an Internet Service Provider's mail
+      server to a user's machine for viewing. Currently most people
+      use version three of the protocol, otherwise known as POP3. A
+      very simple protocol, and not very flexible, but simple to
+      implement and ubiquitous throughout the internet.</p>
+    </section>
+    <section id="imap">
+      <title>IMAP</title>
+      <p>An acronym that stands for "Internet Mail Access
+      Protocol". It is a newer method of accessing mail over the
+      internet. It is far more featureful than <link xref="glossary#pop">POP3</link>, allowing
+      for remote folders on the mail server, and more control over
+      mail delivery. However it is not as widely supported.</p>
+    </section>
+    <section id="ldap">
+      <title>LDAP</title>
+      <p>Eine Abkürzung für »Lightweight Directory Access Protocol«. Es ist ein weit verbreiteter Standard 
zum Zugriff auf Kontaktinformationen über ein Netzwerk. Dies ermöglicht Organisationen die Speicherung von 
Adressinformationen in einer zentralen Datenbank, auf die dann viele Benutzer zugreifen können.</p>
+    </section>
+    <section id="libmutt">
+      <title>libmutt</title>
+      <p>The library based on Mutt's code and used by previous
+      versions of <app>Balsa</app> to handle local mail and IMAP
+      servers.</p>
+    </section>
+    <section id="mailbox-list">
+      <title>Die Postfachliste</title>
+      <p>The list of mailboxes found in <app>Balsa</app>'s left hand
+      pane.</p>
+    </section>
+    <section id="message-index">
+      <title>Der Nachrichtenindex</title>
+      <p>The list of messages in <app>Balsa</app>'s upper-right hand
+      pane.</p>
+    </section>
+    <section id="message-view">
+      <title>Nachrichtenansicht</title>
+      <p>The message display in <app>Balsa</app>'s lower-right hand
+      pane.</p>
+    </section>
+    <section id="mda">
+      <title>MDA</title>
+      <p>An acronym for "Mail Delivery Agent", this type of program
+      is also known as a Local Delivery Agent (LDA). It is
+      responsible for delivering the mail recieved for someone on a
+      machine to the mail folder of that person. <app>procmail</app> is
+      an example of this type of program, although many
+      <link xref="glossary#mta">MTA</link>'s have their own
+      MDA implementations.</p>
+    </section>
+    <section id="mta">
+      <title>MTA</title>
+      <p>An acronym for "Mail Transfer Agent", this class of
+      program is responsible for moving mail around between people,
+      be they on the same computer, on on completely separate
+      networks. Examples of this type of program include
+      <app>sendmail</app>,
+      <app>qmail</app>, and
+      <app>postfix</app>.</p>
+    </section>
+    <section id="mua">
+      <title>MUA</title>
+      <p>An acronym for "Mail User Agent", this the program a user
+      would use to read existing mail and create new messages. MUAs
+      are one of three types of programs that allow internet email
+      to work. The other two types of programs are
+      <link xref="glossary#mta">MTA</link> s and
+      <link xref="glossary#mda">MDA</link> s. <app>Balsa</app> is
+      primarily an MUA, but it also functions as an MDA/MTA when
+      retrieving mail from a remote server.</p>
+    </section>
+    <section id="regular-expression">
+      <title>Regulärer Ausdruck</title>
+      <p>Often abbreviated as a
+      <em>regexp</em>, this is a method of specifing a pattern to
+      match in text. Both very simple and very complex patterns can
+      be easily matched using this method. For information on how
+      to understand and construct regular expressions the best
+      source is the
+      <cmd>grep</cmd> manual or info page.</p>
+    </section>
+    <section id="smtp">
+      <title>SMTP</title>
+      <p>An acronym that stands for "Simple Mail Transfer
+      Protocol", it is exactly that. A standard that defines a
+      simple an reliable way to transfer messages between computers
+      on a network. It is used by most, if not all, mail programs
+      to transfer mail.</p>
+    </section>
+    <section id="vcard">
+      <title>VCARD</title>
+      <p>VCARD is a standard method of storing contact information
+      for easy exchange between programs. <app>Balsa</app> supports
+      VCARD addressbooks, as does GnomeCard and Evolution. Many
+      other programs are capable of exporting their contact lists
+      in VCARD format as well.</p>
+    </section>
+</page>
diff --git a/doc/de/identities.page b/doc/de/identities.page
new file mode 100644
index 0000000..666bd51
--- /dev/null
+++ b/doc/de/identities.page
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="identities" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Identitäten</title>
+  <p>In diesem Dialogfenster können Sie angeben, wie Sie sich selbst dem Rest der Welt durch E-Mails 
präsentieren wollen. In der ersten Seite finden Sie allgemeine Informationen:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Identity Name</gui>
+      </title>
+      <p>A unique title by which this identity will be named within
+      <app>Balsa</app>.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Full Name</gui>
+      </title>
+      <p>This doesn't
+      <em>have</em> to be your name, I guess. But it's the word
+      prefixing your email address in mail you send.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Mailing Address</gui>
+      </title>
+      <p>As you wish it to appear in your "From" header.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Reply-To address</gui>
+      </title>
+      <p>The address that you wish people to reply to your email
+      with (if you have a home and a work address, for
+      instance).</p>
+    </item>
+    <item>
+      <title>
+        <gui>Default Domain</gui>
+      </title>
+      <p>The domain that you wish to append to all e-mail entries
+      where you did not specify the domain. Normally you would use
+      your local domain. You need to enable
+      <link xref="preferences-address-books">Alias
+      Expansion</link> for this to work.</p>
+    </item>
+  </terms>
+  <p>The "Messages" page shows various initial settings for the new
+  message:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Bcc</gui>
+      </title>
+      <p>Der Standardwert für das Blindkopie-Feld, wenn diese Identität verwendet wird. Das ist nützlich, 
wenn Sie stets eine Kopie ausgehender Nachrichten an ein anderes Konto senden wollen.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Reply String</gui>
+      </title>
+      <p>Das Präfix für die Betreffzeile beim Antworten auf eine Nachricht.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Forward String</gui>
+      </title>
+      <p>Das Präfix für die Betreffzeile beim Weiterleiten einer Nachricht.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Request Message Disposition Notification</gui>
+      </title>
+      <p>Whether Message Disposition Notification should be
+      requested by default.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Face Path</gui>
+      </title>
+      <p>Whether a "Face" header should be attached to a program.
+      Specified path points out to a file containing a textual
+      representation of the face icon. Please see
+      <link href="http://quimby.gnus.org/circus/face/";>a
+      description of Face and X-Face</link> headers for more details
+      as well as the list of mail programs supporting this
+      feature.</p>
+    </item>
+    <item>
+      <title>
+        <gui>X-Face Path</gui>
+      </title>
+      <p>Whether a "Face" header should be attached to a program.
+      Specified path points out to a file containing a textual
+      representation of the face icon.</p>
+    </item>
+    <item>
+      <title>
+        <gui>SMTP server</gui>
+      </title>
+      <p>The
+      <link xref="preferences-mail-options#smtp-server-config">
+      SMTP server</link> to be
+      used for this identity.</p>
+    </item>
+  </terms>
+  <p>You control the signature that <app>Balsa</app> appends to your
+  messages on the "Signature" page:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Signature Path</gui>
+      </title>
+      <p>Die Datei mit der Signatur, welche an alle Ihre Nachrichten angehängt wird. Diese kann auf eine 
dieser drei Arten erstellt werden:</p>
+      <list>
+        <item>
+          <p>Aus einer gewöhnlichen Datei. Geben Sie den Pfad zu einer Datei ein, und der Text dieser Datei 
wird an Ihre Nachrichten angehängt.</p>
+        </item>
+        <item>
+          <p>A named pipe or FIFO. In this case, to <app>Balsa</app>,
+          the file looks normal, but in reality, it is a pipe to a
+          program that is generating the content. List the path to
+          the pipe.</p>
+        </item>
+        <item>
+          <p>An executable program. <app>Balsa</app> will execute the
+          program and read its output, appending that text to the
+          message. List the path to the program with a "|"
+          prepended to it. For example:</p>
+          <p>"|/home/user/dynsig.pl"</p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <title>
+        <gui>Execute Signature</gui>
+      </title>
+      <p>Execute the instructions in the signature file and use the
+      results as the signature to append to outgoing mail. Select
+      this when generating the signature from an executable program
+      as outlined above in Signature Path.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature</gui>
+      </title>
+      <p>Fügt die Signatur am Ende jeder ausgehenden Nachricht hinzu.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature When Forwarding</gui>
+      </title>
+      <p>Fügt die Signatur hinzu, wenn Sie eine bestehende Nachricht weiterleiten.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature When Replying</gui>
+      </title>
+      <p>Fügt die Signatur hinzu, wenn Sie auf eine bestehende Nachricht antworten.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Add Signature Separator</gui>
+      </title>
+      <p>When checked, this has <app>Balsa</app> insert the standard
+      signature separator before your signature.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Prepend Signature</gui>
+      </title>
+      <p>Add the signature before the message text, rather than
+      after it.</p>
+    </item>
+  </terms>
+  <p>Die Sicherheitseinstellungen befinden sich im vierten Reiter:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Sign messages by default.</gui>
+      </title>
+      <p>By default enable the cryptographic signature for every
+      new message. The default protocol is determined by the
+      "Default protocol" option.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Encrypt messages by default.</gui>
+      </title>
+      <p>By default encrypt every new message. The default protocol
+      is determined by the "Default protocol" option.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Default protocol.</gui>
+      </title>
+      <p>Choose the default protocol for the cryptographic
+      signature and message encryption.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Always trust GnuPG keys when encrypting.</gui>
+      </title>
+      <p>Do not ask for confirmation when encrypting for a
+      recipient whose GnuPG key is not fully trusted.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Remind me if messages can be encrypted.</gui>
+      </title>
+      <p>Vor dem Absenden einer Nachricht wird nach gültigen Schlüsseln für alle Empfänger gesucht und in 
diesem Fall ein Dialog angezeigt.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Use secret key with this id for signing.</gui>
+      </title>
+      <p>Usually, <app>Balsa</app> automatically selects a proper secret
+      key for cryptographic signatures from the identity's mail
+      address. Therefore, most users should leave this entry empty.
+      If you want to force using a specific secret key for
+      cryptographic signatures, enter the key id here. You can get
+      the key id by running the command
+      <cmd>gpg --list-secret-keys</cmd>.</p>
+    </item>
+  </terms>
+  <note>
+    <p>These security options are available only if <app>Balsa</app> is
+    built with
+    <app>GnuPG</app> support.</p>
+  </note>
+</page>
diff --git a/doc/de/index.page b/doc/de/index.page
new file mode 100644
index 0000000..9ecf3bf
--- /dev/null
+++ b/doc/de/index.page
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="index" xml:lang="de">
+  <title><app>Balsa</app> User's Guide</title>
+  <info>
+    <link type="next" xref="introduction"/>
+    <credit type="maintainer">
+      <name>Pawel Salek</name>
+    </credit>
+    <credit type="copyright">
+      <name>Stuart Parmenter und weitere, eine vollständige Liste finden Sie in AUTOREN</name>
+      <years>1997-2013</years>
+    </credit>
+    <license>
+      <p>Es ist Ihnen gestattet, wortwörtliche Kopien dieses Handbuchs zu erstellen und zu verteilen, welche 
den Urheberrechtshinweis sowie einen Hinweis auf diese Erlaubnis in allen Kopien enthalten.</p>
+      <p>Permission is granted to copy and distribute modified
+      versions of this manual under the conditions for verbatim
+      copying, provided that the entire resulting derived work is
+      distributed under the terms of a permission notice identical
+      to this one.</p>
+      <p>Permission is granted to copy and distribute translations
+      of this manual into another language, under the above
+      conditions for modified versions, except that this permission
+      notice may be stated in a translation approved by the Free
+      Software Foundation.</p>
+      <p>UNIX ist ein eingetragenes Warenzeichen von X/Open Group.</p>
+      <p>Linux ist ein eingetragenes Warenzeichen von Linus Torvalds.</p>
+      <p>X Window System ist ein eingetragenes Warenzeichen von X Consortium, Inc.</p>
+      <p>Windows ist ein eingetragenes Warenzeichen der Microsoft Corp.</p>
+      <p>Macintosh und Apple sind eingetragene Warenzeichen von Apple Computer, Inc.</p>
+      <p>Alle weiteren Warenzeichen gehören den jeweiligen Eigentümern.</p>
+    </license>
+  </info>
+  <p><app>Balsa</app> is a graphical mail client. While it is in active
+  development, <app>Balsa</app> has many features such as: <link xref="glossary#imap">IMAP</link>
+  and <link xref="glossary#pop">POP3</link> support; sendmail or direct <link 
xref="glossary#smtp">SMTP</link> support;
+  optional multi-threaded retrieval and sending of messages;
+  support for all configurations of local mail folders; automatic
+  mail checking; mail printing; inline attachment viewing; and the
+  proverbial much, much more.</p>
+  <p>This document will introduce a person who understands mail to
+  using <app>Balsa</app>. However, it will not explain email to a
+  confused individual. If you're looking for that, try asking a
+  friend or visiting the
+  <link href="http://www.cs.queensu.ca/FAQs/email/"; type="http">
+  Email FAQ</link>.</p>
+</page>
diff --git a/doc/de/introduction.page b/doc/de/introduction.page
new file mode 100644
index 0000000..aed8819
--- /dev/null
+++ b/doc/de/introduction.page
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="introduction" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="next" xref="getting-started"/>
+  </info>
+  <title>Einführung</title>
+  <media src="figures/balsa_logo.png" format="PNG" srccredit="tigert"/>
+  <p><app>Balsa</app> is a graphical mail client. It supports the
+  standard features of any good reader and has new features added
+  continually. See the abstract above for a quick feature
+  rundown.</p>
+  <p><app>Balsa</app> is written using GTK+ and GNOME. Originally based
+  on libmutt, the back end code to <app>Mutt</app>, <app>Balsa</app> now uses
+  a combination of GMime for handling Mime messages, and its own
+  drivers for local and remote mailstores.</p>
+  <p>If you want to learn more about <app>Balsa</app>, your best bet is
+  the mailing list
+  <code>balsa-list gnome org</code>, to which you can subscribe by
+  going to the website
+  <link href="http://mail.gnome.org/mailman/listinfo/balsa-list";>
+  http://mail.gnome.org/mailman/listinfo/balsa-list</link> or by
+  sending a message with a subject of
+  <em>subscribe</em> to
+  <link href="mailto:balsa-list-request gnome org?subject=Subscribe">
+  balsa-list-request gnome org</link>. Bugs can be reported via
+  <app>bug-buddy</app> or to the
+  <link href="http://bugzilla.gnome.org/enter_bug.cgi?product=balsa";>
+  Gnome bug tool</link>.</p>
+</page>
diff --git a/doc/de/its-not-working.page b/doc/de/its-not-working.page
new file mode 100644
index 0000000..2a74926
--- /dev/null
+++ b/doc/de/its-not-working.page
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="its-not-working" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Es funktioniert nicht!!!</title>
+  <p>This is a FAQ for when <app>Balsa</app> appears to lock up, or
+  other things that you think should be happening aren't. If you
+  can't figure out how to do something but <app>Balsa</app> lets you do
+  it, that's a bug. Report it.</p>
+  <list>
+    <item>
+      <p>
+        <link xref="its-not-working#main-to-imap">i
+        I want one of the main
+        folders to be IMAP</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#frozen">
+        <app>Balsa</app>'s frozen!</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#spooky-win">
+        What's that window that flashed
+        on the screen?</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#address-book">
+        The address book doesn't
+        import my addresses.</link>
+      </p>
+    </item>
+  </list>
+  <section id="main-to-imap">
+    <title>I want a basic mailbox to use IMAP</title>
+    <p>See
+    <link xref="common-tasks#ct-main-folder-imap">this section</link>.</p>
+  </section>
+  <section id="frozen">
+    <title><app>Balsa</app>'s frozen!</title>
+    <p>Odds are it isn't. Watch out for:</p>
+    <list>
+      <item>
+        <p>If you don't have threading, <app>Balsa</app> will stop
+        responding when it sends and receives email. Use threading,
+        if possible.</p>
+      </item>
+      <item>
+        <p><app>Balsa</app> is downloading a new message or closing a
+        large mailbox. This could take a while, especially when
+        this file is accessed via NFS.</p>
+      </item>
+      <item>
+        <p>A dialog box is being displayed but it is obscured by
+        another one. This seems to happen under Sawfish. Try moving
+        the windows around and see if there's a hidden dialog
+        somewhere.</p>
+      </item>
+    </list>
+  </section>
+  <section id="spooky-win">
+    <title>Was ist das für ein Fenster, das auf dem Bildschirm blinkt?</title>
+    <p>Were you checking your mail? Probably. This is the window
+    that displays progress for retrieving <link xref="glossary#pop">POP3</link> mail. If you
+    don't have any <link xref="glossary#pop">POP3</link> accounts, it will still appear -- but
+    it'll disappear almost instantly. You can disable displaying
+    this window in preferences.</p>
+  </section>
+  <section id="address-book">
+    <title>Das Adressbuch importiert meine Adressen nicht.</title>
+    <p><app>Balsa</app> attempts to open the file
+    <file>~/.gnome/GnomeCard.gcrd</file>. If you're not using this
+    file, you may need to create a symlink so that <app>Balsa</app> can
+    open it.</p>
+    <p>There have been slight changes in <app>GnomeCard</app>'s file
+    format between its various versions. <app>Balsa</app> is known to
+    work with at least <app>GnomeCard</app> version 1.0.10 and probably
+    most other releases.</p>
+  </section>
+</page>
diff --git a/doc/de/mbox-formats.page b/doc/de/mbox-formats.page
new file mode 100644
index 0000000..a6a308d
--- /dev/null
+++ b/doc/de/mbox-formats.page
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="mbox-formats" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Available Mailbox Formats</title>
+  <p><app>Balsa</app> handles several mailbox formats, including mbox.
+  Further information can be found in the following documents:</p>
+  <terms>
+    <item>
+      <title>Benchmarking mbox versus maildir</title>
+      <p>
+        <link href="http://www.courier-mta.org/mbox-vs-maildir/";>
+        http://www.courier-mta.org/mbox-vs-maildir/</link>
+      </p>
+    </item>
+    <item>
+      <title>Mailbox Format Characteristics</title>
+      <p>
+        <link href="http://www.washington.edu/imap/documentation/formats.txt.html";>
+        http://www.washington.edu/imap/documentation/formats.txt.html</link>
+      </p>
+    </item>
+    <item>
+      <title>Maildir format</title>
+      <p>maildir(5) manual page (from qmail):
+      <link href="http://www.qmail.org/qmail-manual-html/man5/maildir.html";>
+      http://www.qmail.org/qmail-manual-html/man5/maildir.html</link></p>
+    </item>
+    <item>
+      <title>Using Maildir format</title>
+      <p>
+        <link href="http://cr.yp.to/proto/maildir.html";>
+        http://cr.yp.to/proto/maildir.html</link>
+      </p>
+    </item>
+    <item>
+      <title>QMail</title>
+      <p>mbox(5) manual page (from qmail):
+      <link href="http://www.qmail.org/qmail-manual-html/man5/mbox.html";>
+      http://www.qmail.org/qmail-manual-html/man5/mbox.html</link></p>
+    </item>
+    <item>
+      <title>Mailbox formats</title>
+      <p>(From Mail-Administrator HOWTO):
+      <link href="http://linuxdocs.org/HOWTOs/Mail-Administrator-HOWTO-3.html#ss3.5";>
+      http://linuxdocs.org/HOWTOs/Mail-Administrator-HOWTO-3.html#ss3.5</link></p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/de/preferences-address-books.page b/doc/de/preferences-address-books.page
new file mode 100644
index 0000000..6f1184f
--- /dev/null
+++ b/doc/de/preferences-address-books.page
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-address-books" xml:lang="de">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Address Book Preferences</title>
+  <p><app>Balsa</app> supports the use of multiple address books, both
+  local
+  <link xref="glossary#vcard">VCARD</link> and remote <link xref="glossary#ldap">LDAP</link>
+  address books, both of which can be configured here.
+  <app>GnomeCard</app> also uses VCARD address books, so this allows
+  <app>Balsa</app> to share address books with other GNOME
+  applications.</p>
+  <p><app>Balsa</app> also supports LDIF address books, and can be built
+  to use GPE address books, when SQLite is available, and Rubrica
+  address books. Which types are supported depends on how
+  <app>Balsa</app> was built.</p>
+  <p>The main portion of the preferences page is occupied by the
+  list of current address books for <app>Balsa</app>. The list shows the
+  type of address book, the name, and whether it is included in
+  automatic alias expansion when typing new messages. There are
+  also several buttons that manipulate the list of address
+  books:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Add</gui>
+      </title>
+      <p>Using this adds a new address book for <app>Balsa</app> to use
+      to find addresses. If you click it, a drop-down menu of the
+      supported address book types is shown. Click one to begin the
+      process. <app>Balsa</app> pops up a dialog, which, if you choose
+      VCARD, looks like this:</p>
+      <figure>
+        <title>VCARD Address Book Dialog</title>
+        <media type="image" src="figures/address-book-vcard.png"/>
+      </figure>
+      <p>With <link xref="glossary#ldap">LDAP</link> support, the dialog looks somewhat
+      different, offering options to set the location of the
+      directory instead of a file.</p>
+      <figure>
+        <title><link xref="glossary#ldap">LDAP</link> Address Book Dialog</title>
+        <media type="image" src="figures/address-book-ldap.png"/>
+      </figure>
+      <p>In order to use a LDAP address book, you need to know the
+      host name of the LDAP server. Depending on the server
+      configuration, you may need also so called Base Domain Name
+      which identifies your particular department. You can always
+      try leaving Base Domain Name field empty and a default value
+      will be used (OpenLDAP stores the default Base Domain Name in
+
+      <file>/etc/openldap/ldap.conf</file>). If this does not work,
+      you may need to ask your administrator for the value of this.
+      The usual values are usually similar to:
+      "dc=theochem,dc=KTH,dc=se" or "o=Theoretical Chemistry,
+      c=SE".</p>
+    </item>
+    <item>
+      <title>
+        <gui>Modify</gui>
+      </title>
+      <p>Dies ermöglicht Ihnen die Anpassung der Eigenschaften des ausgewählten Adressbuchs.</p>
+      <figure>
+        <title>Bearbeiten eines Adressbuchs</title>
+        <media type="image" src="figures/address-book-modify.png"/>
+      </figure>
+      <p>Für jedes Adressbuch können Sie sowohl den Namen als auch den Speicherort ändern. Außerdem können 
Sie festlegen, ob der Inhalt des Adressbuchs beim Auto-Vervollständigen von Adressen verwendet werden soll, 
wenn Sie eine Nachricht senden.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Delete</gui>
+      </title>
+      <p>Entfernt das ausgewählte Adressbuch.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Set as Default</gui>
+      </title>
+      <p>Setzt das ausgewählte Adressbuch als Standard.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/de/preferences-display-options.page b/doc/de/preferences-display-options.page
new file mode 100644
index 0000000..fa55fa7
--- /dev/null
+++ b/doc/de/preferences-display-options.page
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-display-options" xml:lang="de">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Display Preferences</title>
+  <p>This page controls how <app>Balsa</app> appears to you.</p>
+  <section>
+    <title>Hauptfenster</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Use Preview Pane</gui>
+        </title>
+        <p>Set whether to use the preview pane to display messages,
+        or rely on the separate mail viewing window.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Show Mailbox Info</gui>
+        </title>
+        <p>This will allow the number of total and unread messages
+        for each mailbox to be shown in the left pane of the
+        <app>Balsa</app> main window. You can save space by not showing
+        them; if you choose not to show them, <app>Balsa</app> will then
+        show the number of unread messages (in parentheses) after
+        the mailbox name.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Alternative Layout</gui>
+        </title>
+        <p><app>Balsa</app>'s default layout has a full-height mailbox
+        list on the left, and the message list above the preview
+        pane on the right. You can choose an alternative layout, in
+        which the mailbox list and the message list occupy the
+        upper part of the window, and the preview pane is
+        full-width below them.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatic View</gui>
+        </title>
+        <p>Select this option if you want <app>Balsa</app> to open the
+        first unread message when you open a mailbox. If no message
+        is unread, <app>Balsa</app> opens the most recent message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Page Up and Page Down</gui>
+        </title>
+        <p>By default, the 
+        <key>Page Up</key>and 
+        <key>Page Down</key>keys scroll the message by whole pages.
+        Use this option to choose a different amount.</p>
+      </item>
+    </terms>
+  </section>
+  <section>
+    <title>Das Nachrichtenfenster</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Moving a Message</gui>
+        </title>
+        <p>If you are reading a message in its own message window
+        and you move it (to the trash, or another mailbox),
+        <app>Balsa</app> can move on the next unread message or the next
+        message in the same mailbox, or simply close the
+        window.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="sort-and-thread">
+    <title>Sortieren und Thematisieren</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Default sort column</gui>
+        </title>
+        <p>Choose the column by which you would like a new mailbox
+        to be sorted.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Default threading style</gui>
+        </title>
+        <p>Choose the default threading style for a new
+        mailbox.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Expand threads</gui>
+        </title>
+        <p>If you choose a threaded view of a mailbox, you can
+        decide whether the threads should be expanded or collapsed
+        when the mailbox is opened.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="message">
+    <title>Nachricht</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Fonts</gui>
+        </title>
+        <p>Choose the fonts that you want to be used to display a
+        message. You can choose a distinct font for the message's
+        subject line.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Quoted Text Regular Expression</gui>
+        </title>
+        <p>The entry box allows you to set a
+        <link xref="glossary#regular-expression">regular
+        expression</link>you would like to use to identify text
+        that should be considered quoted for incoming messages. The
+        regular expression should match the beginning of line of
+        quoted text a single level deep, the program will then use
+        this to calculate the depth of quoting and alter the quoted
+        text colors appropriately. A default regexp is provided
+        that should work in most situations.</p>
+        <p>This regexp affects both highlighting and spell
+        checking, and uses the extended regular expression set. For
+        more information see the
+        <cmd>grep</cmd>(1) manual or info page.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Alternative Parts</gui>
+        </title>
+        <p>You can choose whether <app>Balsa</app> should show a
+        text/plain part or a text/html part, when a message
+        contains both.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="colors">
+    <title>Farben</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Message Colors</gui>
+        </title>
+        <p>Wählen Sie die Farben für zitierten Text.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Link Color</gui>
+        </title>
+        <p><app>Balsa</app> uses this color to highlight a hyperlink in
+        a message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Composition Window</gui>
+        </title>
+        <p>When you are composing a message, <app>Balsa</app> uses color
+        to show when one of the address fields is incomplete.
+        Choose that color here.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="format">
+    <title>Format</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Date Encoding</gui>
+        </title>
+        <p>Set the format used to display dates in <app>Balsa</app>.
+        This uses the same format string as 
+        <code>strftime</code>, a summary which is provided
+        below:</p>
+        <list>
+          <item>
+            <p>
+            <code>%a</code>-- The abbreviated weekday
+            name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%A</code>-- The full weekday name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%b</code>-- The abbreviated month name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%B</code>-- The full month name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%d</code>-- The day of the month.</p>
+          </item>
+          <item>
+            <p>
+            <code>%R</code>-- The time using a 24-hour clock.
+            (HH:MM)</p>
+          </item>
+          <item>
+            <p>
+            <code>%r</code>-- The time using a 12-hour clock
+            (HH:MM AM/PM).</p>
+          </item>
+          <item>
+            <p>
+            <code>%T</code>-- The time using a 24-hour clock,
+            with seconds (HH:MM:SS).</p>
+          </item>
+        </list>
+        <note>
+          <p>See the 
+          <code>strftime</code>manual page for a full listing of
+          conversion specifiers.</p>
+        </note>
+      </item>
+      <item>
+        <title>
+          <gui>Selected Headers</gui>
+        </title>
+        <p>Eine durch Leerzeichen getrennte Liste der im Nachrichtenfenster anzuzeigenden Kopfzeilen.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Fallback codeset</gui>
+        </title>
+        <p>Some messages contain national characters without
+        specifying how they are encoded. You can choose whether
+        <app>Balsa</app> displays such characters as '?', or tries a
+        specific character set to display such messages.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="status-messages">
+    <title>Statusmeldungen</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Information Messages</gui>
+        </title>
+        <p><app>Balsa</app> gives you information in the form of five
+        different levels of messages. You can specify how you want
+        all five levels to be presented to you.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display Progress</gui>
+        </title>
+        <p>This sets the behaviour of the dialog that is shown when
+        <app>Balsa</app> retrieves messages from it's specified
+        <link xref="glossary#pop">POP3</link> servers. The dialog can be shown only while the
+        messages are being retrieved, automatically closing after
+        <app>Balsa</app> is finished. Or it can be set to stay active
+        until manually closed. Finally, the dialog can not be
+        displayed at all.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/de/preferences-incoming-and-outgoing-mail.page 
b/doc/de/preferences-incoming-and-outgoing-mail.page
new file mode 100644
index 0000000..9109b47
--- /dev/null
+++ b/doc/de/preferences-incoming-and-outgoing-mail.page
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.ent">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-incoming-and-outgoing-mail" 
xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Incoming and Outgoing Mail Preferences</title>
+  <p>Use this page to set the <app>Balsa</app>'s behaviour regarding
+  incoming and outgoing messages.</p>
+  <section id="incoming">
+    <title>Eingang</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Check Mail Automatically</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will connect to your <link xref="glossary#pop">POP3</link>
+        servers at the given interval and check for mail.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check IMAP mailboxes</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will include your IMAP
+        mailboxes when checking for mail. You can also specify that
+        INBOX is the only mailbox to be checked.</p>
+        <p>Die Überprüfung von IMAP-Postfächern kann eine Zeit dauern. Mit diesen Optionen erhalten Sie 
weitere Möglichkeiten, die Dauer dieses Vorgangs zu beeinflussen.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display message if new mail has arrived</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will alert you when mail has
+        arrived.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Do background check quietly</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will give you no indication
+        that a background mail check is in progress.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Wrap Incoming Text</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will wrap text of incoming
+        messages at the specified line length.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reflow messages of type
+          `text/plain;format=flowed'</gui>
+        </title>
+        <p>The `format' parameter distinguishes two ways of
+        representing paragraphs in messages of type `text/plain'
+        (that is, simple text). The value `flowed' indicates that
+        paragraphs have been broken into lines ended with `soft'
+        line breaks: a space is left at the end of the line. A
+        `hard' line break (one that is not preceded by a space)
+        indicates the end of a paragraph.</p>
+        <p><app>Balsa</app> can reflow the paragraphs, quoted or
+        otherwise, in a message of this type. Reflowing eliminates
+        the line fragments that are left when text is first wrapped
+        at one length and then rewrapped to a shorter length, which
+        are often misquoted.</p>
+        <p>The only other value of `format' is `fixed', which is
+        the value assumed by default when `format' is not
+        specified, as with older mailers. In this case, all line
+        breaks must be respected. If you do not select the
+        `Reflow...' option, <app>Balsa</app> will treat all messages of
+        type `text/plain' as if they were `format=fixed'. Long
+        lines will still be wrapped, if the `Wrap Incoming
+        Messages' option is selected, but this will usually leave
+        unquoted line fragments.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Message Disposition Notification request</gui>
+        </title>
+        <p>You will sometimes receive a message whose sender has
+        asked for notification that you have received or seen the
+        message. You can specify how <app>Balsa</app> responds to these
+        requests.</p>
+      </item>
+    </terms>
+  </section>
+  <!-- ################################################################# -->
+  <!--             SUBSECTION: PREFERENCES/MAIL OPTIONS/OUTGOING         -->
+  <!-- ################################################################# -->
+  <section id="outgoing">
+    <title>Ausgehend</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Wrap Outgoing Text</gui>
+        </title>
+        <p>Have <app>Balsa</app> wrap all outgoing mail at the specified
+        column.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply prefix</gui>
+        </title>
+        <p>The string that <app>Balsa</app> should use as a prefix when
+        quoting a message. Note: When you send a message with 
+        <gui>format=flowed</gui>, <app>Balsa</app> is required to use
+        the one-character string "&gt;".</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatically quote original when replying</gui>
+        </title>
+        <p>Have <app>Balsa</app> include the text of a message in the
+        reply. The text will be prefixed as shown above.</p>
+        <p>You can instead include the original message using an
+        option on the `Edit' menu, or by dragging the message from
+        the message index into the text area of the reply. If you
+        prefer to include text this way, do not select the
+        `Automatically quote...' option.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Don't include HTML parts as text when replying or
+          forwarding mail</gui>
+        </title>
+        <p>Tell <app>Balsa</app> to be sensible.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Forward a mail as attachment instead of quoting
+          it</gui>
+        </title>
+        <p>If this option is selected, messages that are
+        `Automatically quoted' will actually be attached
+        unmodified, instead of included in the text of the reply,
+        prefixed by the reply string.</p>
+        <p>You can also attach any message to a new message by
+        dragging it from the message index into the attachment area
+        of the new message (or, in fact, any part of the new
+        message window except the text area or the address
+        lines).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Send button always queues outgoing mail in
+          outbox</gui>
+        </title>
+        <p>This option gives you control over when <app>Balsa</app>
+        connects to a server to send messages.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Copy outgoing messages to sentbox</gui>
+        </title>
+        <p>Have <app>Balsa</app> save a copy of each message you send in
+        the mailbox marked as the `Sentbox'.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Encoding</gui>
+        </title>
+        <p>Set the character encoding method to either 7 bit, 8
+        bit, or what the quoted message is using.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/de/preferences-mail-options.page b/doc/de/preferences-mail-options.page
new file mode 100644
index 0000000..b733016
--- /dev/null
+++ b/doc/de/preferences-mail-options.page
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-mail-options" xml:lang="de">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Mail Server Preferences</title>
+  <p>In dieser Seite können sie angeben, wie Sie POP3-Nachrichten oder solche von Sendmail erhalten wollen 
usw.</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Remote Mailbox Servers</gui>
+      </title>
+      <p>These are <link xref="glossary#imap">IMAP</link> and <link xref="glossary#pop">POP3</link> servers 
that you
+      receive email from. The three buttons let you create, modify,
+      and remove records. <link xref="glossary#pop">POP3</link> mailboxes will not show up in
+      the mailbox list. You can specify multiple servers, when
+      adding a server you will be asked to give:</p>
+      <list>
+        <item>
+          <p>Postfachname, der das Postfach identifiziert</p>
+        </item>
+        <item>
+          <p>Der Server, auf dem sich Ihr POP-Postfach befindet.</p>
+        </item>
+        <item>
+          <p>Der Port, der für die Verbindung zum Server benutzt wird. Die Portnummer ist üblicherweise 110, 
aber Sie können Sie ändern, falls beispielsweise Ihre Verbindung in irgendeiner Weise getunnelt wird.</p>
+        </item>
+        <item>
+          <p>Der Benutzername auf dem Postfachserver.</p>
+        </item>
+        <item>
+          <p>Das zugehörige Passwort.</p>
+        </item>
+        <item>
+          <p>You can select the 'delete from server' button to
+          remove the downoladed messages from the server.</p>
+        </item>
+        <item>
+          <p>You can choose to have messages filtered through
+          <app>procmail</app> .</p>
+        </item>
+        <item>
+          <p>The
+          <app>procmail</app> command.</p>
+        </item>
+        <item>
+          <p>Ob nach neuen Nachrichten geschaut werden soll.</p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <title>
+        <gui>Local Mail Directory</gui>
+      </title>
+      <p>This is the directory that <app>Balsa</app> will scan looking
+      for mail folders.</p>
+    </item>
+    <item>
+      <title id="smtp-server-config">
+        <gui>Outgoing Mail Servers</gui>
+      </title>
+      <p>Most users will need only one outgoing mail server, but
+      you may need to use more than one. <app>Balsa</app> allows you to
+      set up as many as you need. The server used for a particular
+      message is controlled by the
+      <link xref="identities">identity</link> you choose for the
+      message.</p>
+      <p>To view or change the details of a server, select it and
+      click
+      <gui>Modify</gui> . To create a new server, click
+      <gui>Add</gui> . A dialog will open, showing the properties of
+      the selected server. Specify the domain name and optionally
+      the port for of the SMTP server you use for submitting mail.
+      Please note that the default port number is 587. The syntax
+      is hostname[:port]. Port can be a decimal number or the name
+      of the service as specified in
+      <file>/etc/services</file> . Typically you can just set this
+      to "localhost:smtp". <app>Balsa</app> can also break up a large
+      message into fragments, which can be reassembled by
+      <app>Balsa</app> or any RFC 2046-compliant mailer. This dialog
+      allows you to set this option, and the size above which a
+      message should be split.</p>
+      <p>You will be asked to give:</p>
+      <list>
+        <item>
+          <p>Ein aussagekräftger Name, der den Server identifiziert</p>
+        </item>
+        <item>
+          <p>Der Name und Port der Domäne</p>
+        </item>
+        <item>
+          <p>Der Benutzername auf dem SMTP-Server. Falls der entfernte SMTP-Server Legitimierung erfordert, 
geben Sie hier Ihren Benutzernamen ein. Beachten Sie, dass das genaue Format von jeweils benutzten MTA 
abhängt. Manche Systeme erwarten einen Benutzernamen, andere wiederum eine E-Mail-Adresse.</p>
+        </item>
+        <item>
+          <p>Das zugehörige Kennwort. Falls der entfernte SMTP-Server Legitimierung erfordert, geben Sie 
hier Ihr Kennwort ein. Einige Systeme beziehen sich hier bei »Kennwort« auf »Passwort«. Einschränkungen für 
die Länge sind möglich und vom jeweiligen SMTP-Server abhängig.</p>
+        </item>
+        <item>
+          <p>When you want <app>Balsa</app> to use TLS.</p>
+        </item>
+        <item>
+          <p>Das Kennwort des TLS-Zertifikats.</p>
+        </item>
+        <item>
+          <p>Whether to split large messages, and the threshhold
+          size.</p>
+        </item>
+      </list>
+    </item>
+  </terms>
+  <section id="incoming">
+    <title>Eingang</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Check Mail Automatically</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will connect to your <link xref="glossary#pop">POP3</link>
+        servers at the given interval and check for mail.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check IMAP mailboxes</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will include your IMAP
+        mailboxes when checking for mail. You can also specify that
+        INBOX is the only mailbox to be checked.</p>
+        <p>Die Überprüfung von IMAP-Postfächern kann eine Zeit dauern. Mit diesen Optionen erhalten Sie 
weitere Möglichkeiten, die Dauer dieses Vorgangs zu beeinflussen.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display message if new mail has arrived</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will alert you when mail has
+        arrived.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Do background check quietly</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will give you no indication
+        that a background mail check is in progress.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Wrap Incoming Text</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will wrap text of incoming
+        messages at the specified line length.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reflow messages of type
+          `text/plain;format=flowed'</gui>
+        </title>
+        <p>The `format' parameter distinguishes two ways of
+        representing paragraphs in messages of type `text/plain'
+        (that is, simple text). The value `flowed' indicates that
+        paragraphs have been broken into lines ended with `soft'
+        line breaks: a space is left at the end of the line. A
+        `hard' line break (one that is not preceded by a space)
+        indicates the end of a paragraph.</p>
+        <p><app>Balsa</app> can reflow the paragraphs, quoted or
+        otherwise, in a message of this type. Reflowing eliminates
+        the line fragments that are left when text is first wrapped
+        at one length and then rewrapped to a shorter length, which
+        are often misquoted.</p>
+        <p>The only other value of `format' is `fixed', which is
+        the value assumed by default when `format' is not
+        specified, as with older mailers. In this case, all line
+        breaks must be respected. If you do not select the
+        `Reflow...' option, <app>Balsa</app> will treat all messages of
+        type `text/plain' as if they were `format=fixed'. Long
+        lines will still be wrapped, if the `Wrap Incoming
+        Messages' option is selected, but this will usually leave
+        unquoted line fragments.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Message Disposition Notification request</gui>
+        </title>
+        <p>You will sometimes receive a message whose sender has
+        asked for notification that you have received or seen the
+        message. You can specify how <app>Balsa</app> responds to these
+        requests.</p>
+      </item>
+    </terms>
+  </section>
+  <!-- ################################################################# -->
+  <!--             SUBSECTION: PREFERENCES/MAIL OPTIONS/OUTGOING         -->
+  <!-- ################################################################# -->
+  <section id="outgoing">
+    <title>Ausgehend</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Wrap Outgoing Text</gui>
+        </title>
+        <p>Have <app>Balsa</app> wrap all outgoing mail at the specified
+        column.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply prefix</gui>
+        </title>
+        <p>The string that <app>Balsa</app> should use as a prefix when
+        quoting a message. Note: When you send a message with 
+        <gui>format=flowed</gui>, <app>Balsa</app> is required to use
+        the one-character string "&gt;".</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatically quote original when replying</gui>
+        </title>
+        <p>Have <app>Balsa</app> include the text of a message in the
+        reply. The text will be prefixed as shown above.</p>
+        <p>You can instead include the original message using an
+        option on the `Edit' menu, or by dragging the message from
+        the message index into the text area of the reply. If you
+        prefer to include text this way, do not select the
+        `Automatically quote...' option.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Don't include HTML parts as text when replying or
+          forwarding mail</gui>
+        </title>
+        <p>Tell <app>Balsa</app> to be sensible.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Forward a mail as attachment instead of quoting
+          it</gui>
+        </title>
+        <p>If this option is selected, messages that are
+        `Automatically quoted' will actually be attached
+        unmodified, instead of included in the text of the reply,
+        prefixed by the reply string.</p>
+        <p>You can also attach any message to a new message by
+        dragging it from the message index into the attachment area
+        of the new message (or, in fact, any part of the new
+        message window except the text area or the address
+        lines).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Send button always queues outgoing mail in
+          outbox</gui>
+        </title>
+        <p>This option gives you control over when <app>Balsa</app>
+        connects to a server to send messages.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Copy outgoing messages to sentbox</gui>
+        </title>
+        <p>Have <app>Balsa</app> save a copy of each message you send in
+        the mailbox marked as the `Sentbox'.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Encoding</gui>
+        </title>
+        <p>Set the character encoding method to either 7 bit, 8
+        bit, or what the quoted message is using.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/de/preferences-miscellaneous.page b/doc/de/preferences-miscellaneous.page
new file mode 100644
index 0000000..63d2d5d
--- /dev/null
+++ b/doc/de/preferences-miscellaneous.page
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-miscellaneous" xml:lang="de">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Miscellaneous Preferences</title>
+  <terms>
+    <item>
+      <title>
+        <gui>Debug</gui>
+      </title>
+      <p>Toggle the output of debugging information. Depending on
+      what notification priority set for it in the
+      <link xref="preferences-display-options">
+      Display</link> page, it can show up in list or dialog as the
+      program runs.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Empty Trash on Exit</gui>
+      </title>
+      <p>Set <app>Balsa</app> to delete all messages in the
+      <code>Trash</code> mailbox when <app>Balsa</app> exits.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Automatically close mailbox</gui>
+      </title>
+      <p>Set <app>Balsa</app> to close any mailbox that is unused for
+      more than the specified time. The currently displayed mailbox
+      is never automatically closed.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Hide messages marked as deleted</gui>
+      </title>
+      <p>When a message is moved to another mailbox, including the
+      <code>Trash</code> mailbox, it is actually copied to the
+      destination, and the original is marked as deleted. Deleted
+      messages may either be shown in the mailbox index, with the
+      trashcan icon indicating that they are deleted, or hidden.
+      This item controls which of those actions is taken.</p>
+      <p>A message may also be simply marked as deleted, without
+      copying it to another mailbox:
+      <guiseq>
+        <gui>Message</gui>
+        <gui>Toggle flag</gui>
+        <gui>Deleted</gui>
+      </guiseq>. Again, this item controls whether such a message
+      is hidden.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Expunge deleted messages on close</gui>
+      </title>
+      <p>"Expunging" is the act of physically removing from the
+      backing mailstore all messages marked as deleted. You can
+      expunge messages manually:
+      <guiseq>
+        <gui>Mailbox</gui>
+        <gui>Expunge deleted messages</gui>
+      </guiseq>, or you can set <app>Balsa</app> to expunge deleted
+      messages when the mailbox is closed (all mailboxes are closed
+      when you exit <app>Balsa</app>).</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/de/preferences-spelling.page b/doc/de/preferences-spelling.page
new file mode 100644
index 0000000..1e85cd3
--- /dev/null
+++ b/doc/de/preferences-spelling.page
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.ent">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-spelling" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Spell Check Preferences</title>
+  <p>If <app>Balsa</app> is using GtkSpell, you can choose to have your
+  spelling checked as you type. <app>Balsa</app> uses GtkSpell's default
+  settings.</p>
+  <p>If <app>Balsa</app> is not using GtkSpell, you can use this pane to
+  setup <app>Balsa</app> spell check options. <app>Balsa</app> uses the
+  Portable Spell Checking library
+  (<link href="http://pspell.sourceforge.net";>pspell</link>) to
+  provide an interface to the spell checking program of your
+  choice. Currently there are modules for ispell or aspell, both of
+  which can be found at the pspell website. For more information
+  visit the <app>Balsa</app> homepage.</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Pspell Module</gui>
+      </title>
+      <p>The Pspell library allows you to use whatever spell
+      checking engine you prefer, though the use of loadable
+      modules. Currently Pspell has support for two modules, the
+      traditional ispell, and the newer and more advanced
+      aspell.</p>
+      <p>
+      <app>Ispell</app> is most likely available on your system as
+      it is a Unix standard; however
+      <app>Aspell</app> is more advanced as it uses an advanced
+      phonetics engine and adaptive techniques to learn how you
+      tend to misspell words. More information is available at the
+      <link href="http://aspell.sourceforge.net";>Aspell
+      website</link>.</p>
+      <p><app>Balsa</app> will attempt to use whatever module you
+      specify here, however if the module is not installed it will
+      not work and generate an error.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Suggestion Mode</gui>
+      </title>
+      <p>The suggestion mode determines how hard the computer will
+      search for suggestions for misspelled words. There are three
+      options:</p>
+      <terms>
+        <item>
+          <title>
+            <gui>Fast</gui>
+          </title>
+          <p>This mode quickly scans for replacements, which means
+          it might be used by a good speller who occasionally makes
+          typographical errors.</p>
+        </item>
+        <item>
+          <title>
+            <gui>Normal</gui>
+          </title>
+          <p>Der Normalmodus dürfte für die meisten Benutzer ausreichen, er sollte für die allermeisten 
Fälle einen korrekten Vorschlag liefern.</p>
+        </item>
+        <item>
+          <title>
+            <gui>Bad Spellers</gui>
+          </title>
+          <p>The Bad Spellers mode is the most thorough and
+          accurate mode; however, it also takes the longest to find
+          a list of suggestions.</p>
+        </item>
+      </terms>
+    </item>
+    <item>
+      <title>
+        <gui>Ignore Length</gui>
+      </title>
+      <p>Dadurch wird es möglich, Worte zu ignorieren, die eine bestimmte Länge unterschreiten. Dies 
überspringt Abkürzungen, die normalerweise als falsch markiert werden.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/de/preferences-startup.page b/doc/de/preferences-startup.page
new file mode 100644
index 0000000..09629b1
--- /dev/null
+++ b/doc/de/preferences-startup.page
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-startup" xml:lang="de">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Startup Preferences</title>
+  <terms>
+    <item>
+      <title>
+        <gui>Open Inbox upon Startup</gui>
+      </title>
+      <p>If set, <app>Balsa</app> will open your system inbox upon
+      startup.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Check Mail at Startup</gui>
+      </title>
+      <p>If set, <app>Balsa</app> will automatically attempt to download
+      mail from the <link xref="glossary#pop">POP3</link> mail server upon startup, and will
+      check for new mail on an <link xref="glossary#imap">IMAP</link> server.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Remember Open Mailboxes Between Sessions</gui>
+      </title>
+      <p>When marked, <app>Balsa</app> will remember and reopen
+      mailboxes that were open when <app>Balsa</app> was last quit.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Folder Scanning</gui>
+      </title>
+      <p>Scanning a folder tree can be time-consuming, because of
+      the need to explore an entire tree of subfolders. You can
+      defer scanning the tree by setting the scan depth to 1.
+      <app>Balsa</app> will then descend into the tree only far enough
+      to discover whether any folders that you can see have
+      subfolders. The first time you expand any subtree,
+      <app>Balsa</app> will explore more of the tree.</p>
+      <p>Falls Sie es bevorzugen, den gesamten Baum sofort beim Start verfügbar zu haben, wählen Sie eine 
Tiefe, die der Tiefe Ihres Ordnerbaums entspricht. Die Angabe von Zwischenwerten ist hier ebenfalls 
möglich.</p>
+      <p>You may set the depth for initial scanning separately for
+      local and <link xref="glossary#imap">IMAP</link> trees.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/de/preferences.page b/doc/de/preferences.page
new file mode 100644
index 0000000..4af9ca4
--- /dev/null
+++ b/doc/de/preferences.page
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>Das Einstellungsfenster</title>
+
+<p>
+  <app>Balsa</app> has many more options than the initial assistant reveals.
+  To access the Preferences window, select
+  <guiseq>
+      <gui>Edit</gui> <gui>Preferences</gui>
+  </guiseq>.
+  In the Preferences window, options are organized into groups,
+  and related groups are shown on individual pages.
+  The pages and groups are explained below.
+</p>
+<!--
+<figure>
+  <title>Preferences Window</title>
+  <media type="image" src="figures/preferences-window.png"/>
+</figure>
+-->
+</page>
diff --git a/doc/de/toolbar-prefs.page b/doc/de/toolbar-prefs.page
new file mode 100644
index 0000000..2e76c06
--- /dev/null
+++ b/doc/de/toolbar-prefs.page
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="toolbar-prefs" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title> Anpassen der Werkzeugleisten</title>
+  <p><app>Balsa</app> allows you to change the layout of the toolbars on
+  the three main types of window: the
+  <link xref="win-main">main window</link>,
+  <link xref="win-message">message windows</link>, and
+  <link xref="win-composer">compose windows</link>. You open the
+  dialog with the
+  <guiseq>
+    <gui>Settings</gui>
+    <gui>Toolbars...</gui>
+  </guiseq> menu item.</p>
+  <p>The dialog contains a notebook with a page for each type of
+  window. On each page, you'll see a Preview of the toolbar, which
+  changes as you change the layout. The list of
+  <gui>Available buttons</gui> shows buttons that may be used on the
+  toolbar, but aren't currently used, and the
+  <gui>Current toolbar</gui> list shows the current layout,
+  including both buttons and separators. You can add buttons to the
+  current toolbar, remove them, or move them up or down in the
+  list, using the controls in the central button box.</p>
+  <p>Below the notebook is a checkbox for wrapping the button
+  labels (the text that may accompany the buttons). This option
+  applies to the toolbars on all three types of window. If you
+  choose wrapping, long labels will be shown on two lines.</p>
+  <p>This is an "instant apply" dialog: the changes you make take
+  effect immediately, as shown in the Preview toolbar. Below the
+  Preview toolbar you'll find a button that restores the standard
+  layout for that toolbar.</p>
+  <note>
+    <p>Note that the standard layout is the one that you see before
+    the toolbar has been customized. If you use this option, all
+    current <em>and past</em> changes will be undone.</p>
+  </note>
+  <p>A second button below the Preview toolbar pops up a menu that
+  gives you control over what is shown in the toolbar: icons, text,
+  or both. The popup (right click) menu for any actual toolbar
+  offers the same choices, as well as the option to open up this
+  dialog ("Customize Toolbars...").</p>
+</page>
diff --git a/doc/de/win-composer.page b/doc/de/win-composer.page
new file mode 100644
index 0000000..0660c96
--- /dev/null
+++ b/doc/de/win-composer.page
@@ -0,0 +1,758 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-composer" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Der Nachrichteneditor</title>
+  <figure>
+    <title>Fenster des Nachrichteneditors</title>
+    <media src="figures/newmsg-window.png" format="PNG"/>
+  </figure>
+  <p>When the
+  <gui>New Message</gui> or
+  <gui>Reply</gui> or
+  <gui>Forward</gui> action is selected, the message to be sent is
+  brought up in the Message Composer. This window is where you can
+  type the text of the message, attach files, and specify
+  recipients. The window also provides an interface to spell check
+  the message. Signing and encryption of messages using
+  <app>GnuPG</app> or
+  <app>PGP</app> are also supported, when <app>Balsa</app> is built with
+  cryptographic support.</p>
+  <p>Wenn das Nachrichtenfenster zum ersten Mal geöffnet wird, sehen Sie die folgenden Hauptabschnitte:</p>
+  <list>
+    <item>
+      <p>Die Menüleiste</p>
+    </item>
+    <item>
+      <p>Werkzeugleiste</p>
+    </item>
+    <item>
+      <p>Kopfzeilen</p>
+    </item>
+    <item>
+      <p>The attachment box</p>
+    </item>
+    <item>
+      <p>Der Nachrichtenrumpf</p>
+    </item>
+  </list>
+  <p>Diese werden nachstehend genauer erklärt:</p>
+  <section id="win-composer-menu">
+    <title>Menüleiste</title>
+    <p>Dies enthält alle verfügbaren Befehle für die Arbeit mit einer Nachricht, vom Auswählen der 
anzuzeigenden Kopfzeilen bis hin zum Ändern des Zeichensatzes für eine Nachricht. Einige der Menüeinträge 
könnten nicht immer sichtbar sein, abhängig von dem Status der gegenwärtigen Nachricht.</p>
+    <terms>
+      <item>
+        <title>
+          <gui>File</gui>
+        </title>
+        <p>Das Datei-Menü enthält Befehle zum Bearbeiten der Nachricht an sich.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Include File...</gui>
+            </guiseq> -- Include a text file in the body of the
+            message; only works for plain text files.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Attach File...</gui>
+            </guiseq> -- Attach any kind of file to the
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Send</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Enter</key>
+            </keyseq> -- Send the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Queue</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Q</key>
+            </keyseq> -- Queue the message in the outbox for
+            sending later.</p>
+            <note>
+              <p>A message is considered valid (ready for sending
+              or queuing) if it contains at least one valid email
+              address, and no invalid addresses, in the
+              <gui>Recipients</gui> fields.</p>
+            </note>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Postpone</gui>
+            </guiseq> -- Save the message in the
+            <code>Draftbox</code> for later revision and sending,
+            and close the compose window. You will be unable to
+            postpone a message that is not currently valid.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Save</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>S</key>
+            </keyseq> -- Save the message in the
+            <code>Draftbox</code> and continue editing.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Page Setup</gui>
+            </guiseq> -- Set print options such as paper size
+            and print orientation.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Print...</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>P</key>
+            </keyseq> -- Print a hard-copy of the current
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Close</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>W</key>
+            </keyseq> -- Close and discard the current
+            message.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Edit</gui>
+        </title>
+        <p>Das Bearbeiten-Menü enthält Befehle, die zum Bearbeiten des Nachrichtenrumpfs verwendet 
werden.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Undo</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Z</key>
+            </keyseq> -- Undo the most recent editing
+            action.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Redo</gui>
+            </guiseq>
+            <keyseq>
+              <key>Shift</key>
+              <key>Ctrl</key>
+              <key>Z</key>
+            </keyseq> -- Redo an undone editing action.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Cut</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>X</key>
+            </keyseq> -- Cut the selected text to the
+            clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Copy</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>C</key>
+            </keyseq> -- Copy the selected text to the
+            clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Paste</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>V</key>
+            </keyseq> -- Paste the contents of the clipboard to
+            the current position of the cursor.</p>
+          </item>
+          <item>
+            <p>
+              <guiseq>
+                <gui>Edit</gui>
+                <gui>Select All</gui>
+              </guiseq>
+              <keyseq>
+                <key>Ctrl</key>
+                <key>A</key>
+              </keyseq>
+            </p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Wrap Body</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>B</key>
+            </keyseq> -- Cause all the lines in the message to
+            be wrapped to the specified outgoing mail wrap
+            column.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Reflow Paragraph</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>R</key>
+            </keyseq> -- Cause all selected lines to be wrapped
+            to the specified outgoing mail wrap column.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Check Spelling</gui>
+            </guiseq> -- Start spell checking the current
+            message.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Show</gui>
+        </title>
+        <p>Das Menü <guimenu>Anzeige</guimenu> regelt die Anzeige der bearbeitbaren Kopfzeilen im 
Editorfenster.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Toolbar</gui>
+            </guiseq> -- Show or hide the toolbar.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>From</gui>
+            </guiseq> -- Display the
+            <code>From</code> header.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Recipients</gui>
+            </guiseq> -- Display the
+            <code>To:</code> ,
+            <code>Cc:</code> , and
+            <code>Bcc:</code> addresses.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Reply To</gui>
+            </guiseq> -- Display the
+            <code>Reply-To</code> header.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Fcc</gui>
+            </guiseq> -- Display the
+            <code>Fcc</code> header; this is the folder to which
+            your copy of the sent message will be saved. The
+            default is your Sentbox.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Language</gui>
+        </title>
+        <p>The Language menu allows you to set the language to use
+        for composing and checking the spelling of the message.
+        Only languages for which you have dictionaries installed
+        are shown.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Options</gui>
+        </title>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Request Disposition Notification</gui>
+            </guiseq> -- If checked <app>Balsa</app> will include
+            the
+            <code>Disposition-Notification-To</code> header line
+            with your
+            <code>From</code> address. Please note that the handling
+            of this request depends on the receiving mail program
+            and that it not guaranteed that this notification will
+            be sent back.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Format = Flowed</gui>
+            </guiseq> -- The "Flowed" format (RFC 3676) breaks
+            the message text into paragraphs, which you type
+            continuously using the
+            <key>Enter</key> key only to mark the end of a
+            paragraph, and "fixed" lines which you mark
+            individually using the
+            <key>Enter</key> key. This allows other mailers that
+            recognize the format to display the text appropriately
+            for the width of the recipient's screen, and to quote
+            the text correctly when constructing a reply. The text
+            is also displayed intelligibly by a non-flowed-aware
+            mailer.</p>
+            <note>
+              <p>Using "Format=Flowed" is strongly recommended. It
+              helps to avert the "embarrassing line wrap" that you
+              see when quoted text is broken across lines and shown
+              with the wrong level of quoting.</p>
+            </note>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Send as plain text and HTML</gui>
+            </guiseq> -- <app>Balsa</app> can send and receive
+            messages in right-to-left languages such as Arabic,
+            Hebrew, and Persian, but some other agents such as
+            mailing lists may mangle them when translating into
+            HTML. If the "Send as plain text and HTML" option is
+            selected, <app>Balsa</app> will generate a correct HTML
+            message part that such agents will use instead.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Sign message</gui>
+            </guiseq> -- Cryptographically sign the message.
+            The recipients can check the signature to prove the
+            sender's (=your) identity or to detect any tampering
+            with the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Encrypt message</gui>
+            </guiseq> -- Encrypt the message. Only the intended
+            recipient(s) can decrypt and read the contents.</p>
+          </item>
+          <item>
+            <p>Die folgenden Optionen legen das Protokoll fest, welches zum Signieren und/oder Verschlüsseln 
der Nachricht verwendet wird. Sie sollten dasjenige Protokoll auswählen, mit dem alle Empfänger umgehen 
können.</p>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>GnuPG uses MIME mode</gui>
+                </guiseq> -- Sign and/or encrypt the complete
+                message, including all attachments, using the
+                PGP/MIME mode (RFC 3156). Note that the message
+                envelope (including the Subject) is not
+                protected.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>GnuPG uses old OpenPGP mode</gui>
+                </guiseq> -- Sign and/or encrypt only the
+                message text, but not attachments, using the
+                OpenPGP mode (RFC 2440). If you want to add any
+                attachments, sign and/or encrypt them manually
+                before adding.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>S/MIME mode (GpgSM)</gui>
+                </guiseq> -- Sign and/or encrypt the complete
+                message, including all attachments, using the
+                S/MIME mode (RFC 2633). Note that the message
+                envelope (including the Subject) is not
+                protected.</p>
+              </item>
+            </list>
+            <note>
+              <p>Cryptographic signatures and encryption are
+              available only when <app>Balsa</app> has been built with
+              <app>GnuPG</app> support. For a detailed description of
+              E-Mail cryptography, see the
+              <link href="http://www.gnupg.org/documentation/manuals/gnupg/"; type="http"> GnuPG 
Manual</link> and the
+              <link href="http://www.dewinter.com/gnupg_howto/english/GPGMiniHowto.html"; type="http"> GnuPG 
HOWTO</link> .</p>
+            </note>
+          </item>
+        </list>
+      </item>
+    </terms>
+  </section>
+  <section id="win-composer-toolbar">
+    <title>Werkzeugleiste</title>
+    <p>Die Werkzeugleiste enthält Knöpfe für die meistbenutzten Funktionen zum Senden von Nachrichten, 
einschließlich Beilegen von Dateien und Speichern. Wie in der Menüleiste, sind auch hier einige Knöpfe 
deaktiviert, falls die Nachricht noch nicht korrekt sendefähig ist.</p>
+    <figure>
+      <title>Werkzeugleiste</title>
+      <media type="image" src="figures/newmsg-window-toolbar.png"/>
+    </figure>
+    <terms>
+      <item>
+        <title>
+          <gui>Send</gui>
+        </title>
+        <p>Send the current message. Only available if the message
+        is legal to be sent (i.e. proper email addresses). This
+        button may also be configured to queue the message in the
+        outbox to be sent later (see the
+        <link xref="preferences-outgoing">
+        Preferences</link> dialog).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Attach</gui>
+        </title>
+        <p>Öffnet einen Dialog zum Beilegen einer Datei zur aktuellen Nachricht.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Postpone</gui>
+        </title>
+        <p>Stellt eine Nachricht in den Entwürfe-Ordner zurück, um diese später zu bearbeiten und zu 
senden.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check Spelling</gui>
+        </title>
+        <p>Start a spell check on the current message. If
+        <app>Balsa</app> is built with support for
+        <app>GtkSpell</app> , your spelling is checked in place.
+        Otherwise, <app>Balsa</app> can use either
+        <app>ispell</app> or
+        <app>aspell</app> to do the spell checking. Settings for
+        this can be found in the
+        <link xref="preferences-spelling">
+        Preferences</link> dialog.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Print</gui>
+        </title>
+        <p>Print out the draft of the message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cancel</gui>
+        </title>
+        <p>Schließt das Editorfenster, ohne die darin befindliche Nachricht zu speichern oder zu senden.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="win-composer-headers">
+    <title>Kopfzeilen</title>
+    <p>The headers area is where the information regarding where
+    the message is being sent to and from, as well as comments and
+    keywords can be entered. All of the available headers are not
+    shown by default, but they can be turned on and off very
+    quickly using the menu.</p>
+    <terms>
+      <item>
+        <title>
+          <gui>From</gui>
+        </title>
+        <p>
+        <code>From</code> is used to indicate the origin of the
+        message, <app>Balsa</app> automatically fills this in for you if
+        you have entered your name and email address in the
+        <link xref="identities">identities</link> window.</p>
+      </item>
+      <item>
+        <title>
+          <gui>To</gui>
+        </title>
+        <p>The
+        <code>To</code> header is used to indicate the intended
+        recipient of the message; <app>Balsa</app> automatically fills
+        this in for you if you are replying to a message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Subject</gui>
+        </title>
+        <p>The
+        <code>Subject</code> header is used to summarize the topic
+        of the message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cc</gui>
+        </title>
+        <p>The "Carbon Copy" header. A comma separated list of
+        recipients other than the main recipient should go
+        here.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Bcc</gui>
+        </title>
+        <p>The
+        <code>Bcc</code> , or "Blind Carbon Copy" header. Similar to
+        the Cc header, except that email addresses placed in this
+        header will not appear as recipients to readers of the
+        message. Also known as a "silent" carbon copy.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Fcc</gui>
+        </title>
+        <p>The
+        <code>Fcc</code> header stands for "Folder Carbon Copy", and
+        it is used to specify any folders that you want the message
+        copied to after being sent. It is presented as a drop-down
+        combo box with a list of all available mailboxes, simply
+        select the destination.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply-To</gui>
+        </title>
+        <p>The
+        <code>Reply-To</code> header is for specifying what email
+        address you want any replies to go to.</p>
+      </item>
+    </terms>
+    <section id="specify-addresses">
+    <title>Specifying Addresses</title>
+    <p><app>Balsa</app> supports many different methods of selecting
+    email addresss. All of the headers that can contain addresses
+    have a small colored book to the left of them that will open up
+    <app>Balsa</app>'s address book.</p>
+    <p>However, <app>Balsa</app> will also attempt to guess what the
+    headers should contain depending on what context the
+    composition window is opened in, so it may not be neccessary to
+    fill them in most of the time.</p>
+    <note>
+      <p>Also, <app>Balsa</app> supports alias expansion. As you type a
+      name, <app>Balsa</app> will guess the e-mail address from all the
+      entries in the <app>GnomeCard</app> application. To enable this
+      feature, read the section on
+      <link xref="common-tasks#ct-alias-expansion">
+      Alias Expansion</link> . In
+      addtion, the composition window supports drag-and-drop of
+      addresses from the <app>GnomeCard</app> application.</p>
+    </note> &gt;</section>
+  </section>
+  <section id="win-composer-attachments">
+    <title>Anlagen</title>
+    <figure>
+      <title>Liste der Anlagen</title>
+      <media type="image" src="figures/newmsg-window-attachments.png"/>
+    </figure>
+    <p>Below the headers may be a large box displaying a list of
+    attachments; this view can be toggled in the
+    <gui>Show</gui> menu.</p>
+    <p>When there are attachments displayed, it is possible to
+    right-click on one of them to access an option menu.
+    <gui>Inline</gui> and
+    <gui>Attachment</gui> are mutually exclusive options that will
+    display to the recipient either the attachment inline with the
+    rest of the message, or separately as an attachment. Selecting
+    <gui>Reference</gui> will send a MIME external part reference (a
+    kind of link) in lieu of the actual file.
+    <gui>Remove</gui> , and any available
+    <gui>Open with</gui> options are also available.</p>
+  </section>
+  <section id="win-composer-body">
+    <title>Nachrichtenrumpf</title>
+    <p>Finally, below the attachment list is the main area of the
+    window where the text of the message is displayed. The text
+    editing capabilities are very basic, but it supports cut, copy,
+    and paste so it is possible to write a message in your favorite
+    editor and simply paste it in.</p>
+    <p>If the message is a reply or forward, the referenced message
+    will be displayed in the body text widget, with the prefix
+    specified in the
+    <link xref="preferences-outgoing">Preferences</link> dialog.</p>
+  </section>
+  <section id="win-composer-spellcheck">
+    <title>Rechtschreibprüfung</title>
+    <p>Once the spell check has been started, it will take a moment
+    to load the text and spell checking module, and then it will
+    automatically begin checking the message. If it finds any words
+    that are incorrect, the word will be highlighted and a panel
+    will be shown that offers a number of suggestions and available
+    courses of action.</p>
+    <figure>
+      <title>Rechtschreibprüfung-Fenster</title>
+      <media type="image" src="figures/spell-check.png"/>
+    </figure>
+    <p>As shown above, the panel consists of a list of two panes,
+    one the left containing a list of suggestions and an entry box,
+    while the right contains several buttons to choose your action.
+    The list on the left is re-generated for each incorrect word,
+    with all the suggestions the spell check program comes up with.
+    You can choose what program you want to use through loadable
+    modules, selectable in the
+    <link xref="preferences-spelling">Preferences</link> dialog. The
+    entry box above the list is what will be used to replace the
+    current word, and usually reflects the current selection in the
+    list, but can be edited by hand if you wish to make manual
+    changes.</p>
+    <p>Die Knöpfe an der linken Seite regeln die Aktionen für jedes falsch geschriebene Wort. Diese Knöpfe 
sind:</p>
+    <terms>
+      <item>
+        <title>
+          <gui>Change</gui>
+        </title>
+        <p>Ersetzt das gegenwärtig falsch geschriebene Wort durch den gegenwärtig ausgewählten Vorschlag 
oder das vom Benutzer geänderte Wort.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Change All</gui>
+        </title>
+        <p>Ersetzt alle Vorkommen des gegenwärtig falsch geschriebenen Worts durch den gegenwärtig 
ausgewählten Vorschlag.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Ignore</gui>
+        </title>
+        <p>Ignoriert das gegenwärtig falsch geschriebene Wort und springt zum nächsten.</p>
+      </item>
+      <item>
+        <p>Ignoriert alle Vorkommen des gegenwärtig falsch geschriebenen Worts und springt zum nächsten 
falsch geschriebenen Wort.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Learn</gui>
+        </title>
+        <p>Fügt das aktuell falsch geschriebene Wort zu Ihrem persönlichen Wörterbuch hinzu. Dadurch wird es 
für alle zukünftigen Rechtschreibprüfungen als korrekt geschrieben angenommen.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Done</gui>
+        </title>
+        <p>Stop the spell check at the current point, keeping all
+        changes so far and returning to the normal message window
+        interface.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cancel</gui>
+        </title>
+        <p>Stop the spell check at the current point, reverting all
+        changes so far, including any words added to your personal
+        dictionary.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="addr-book-buttons">
+    <title>Adressbuch</title>
+    <p>When composing a message, clicking on any of the colored
+    book icons next to a destination field (To, Cc, Bcc) will bring
+    up the <app>Balsa</app> address book. It helps you to select
+    recipients for your messages quickly and easily.</p>
+    <figure>
+      <title>Adressbuch-Fenster</title>
+      <media type="image" src="figures/address-book.png"/>
+    </figure>
+    <p>The address book provides two panes, the one on the left
+    consisting of all available addresses, while the one on the
+    right contains the intended recipients of your message.
+    Addresses are added to the recipient list by selecting them in
+    the left pane and clicking the arrow button pointing to the
+    right, or by simply double-clicking on the address. This will
+    remove the address from the left pane, so they cannot be added
+    more than once. If you decide that you no longer want to send
+    the message to a particular address, simply select it in the
+    right-hand pane and click the left-arrow button, or
+    double-click it again, to move it back.</p>
+    <p>If, while selecting people to send your message to, you
+    decide to add someone new to the address book, it is a simple
+    matter to click on the
+    <gui>Run GnomeCard</gui> button. This will bring up the
+    <app>GnomeCard</app> application, allowing you to easily manipulate
+    your contact list. After any changes have been made using the
+    address book, they can be forced to show up in the left hand
+    pane by clicking on the
+    <gui>Re-Import</gui> button.</p>
+  </section>
+</page>
diff --git a/doc/de/win-filters.page b/doc/de/win-filters.page
new file mode 100644
index 0000000..4d2b40b
--- /dev/null
+++ b/doc/de/win-filters.page
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-filters" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Das Filter-Fenster</title>
+  <p>This window is divided in two parts: the left part is the list
+  of all filters. When you select one of them, the right part
+  displays its properties. The right part is a two-page notebook
+  (the
+  <link xref="win-filters#wf-match-page">match page</link>, and the
+  <link xref="win-filters#wf-action-page">action page</link>); their
+  descriptions follow.</p>
+  <p>There are two buttons under the filters list:
+  <list>
+    <item>
+      <p>The
+      <gui>New</gui> button: you click on it to create a new filter;
+      the filter is initially named "New Filter", and contains no
+      condition. Then you fill in the different fields in the
+      notebook pages (in particular remember to change the name of
+      the filter), add the conditions that will describe how this
+      filters matches a message, and to confirm the modifications
+      push the
+      <gui>Apply</gui> button on the right hand side of the Filters
+      window.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Remove</gui> button: removes the currently selected
+      filter.</p>
+    </item>
+  </list></p>
+  <section id="wf-match-page">
+    <title>The Match Page</title>
+    <p>Each filter is made of one or several conditions; each
+    condition represents a test to be applied to the messages. The
+    results of these tests is then combined following the type of
+    operation specified:
+    <list>
+      <item>
+        <p>AND: all condition tests must be true to make the
+        match.</p>
+      </item>
+      <item>
+        <p>OR: one condition test must be true to make the
+        match.</p>
+      </item>
+    </list></p>
+    <p>Then the page displays the name of the filter and the
+    conditions that describes how the filters matches a message.
+    The list displays the type of the conditions (the conditions
+    will be described later):
+    <list>
+      <item>
+        <p>
+        <gui>Simple</gui>: the match is done by a simple substring
+        test.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Regular expression</gui>: the match uses regular
+        expressions on the message headers.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Date interval</gui>: the match is done by checking if
+        the date of the message is within certain bounds.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Flag condition</gui>: the match is done by checking
+        the flags of the message: unread, replied, deleted,
+        flagged.</p>
+      </item>
+    </list>The three buttons under the list allows you to edit the
+    selected condition, add a new one, or remove one. Editing or
+    creating a condition is done in the
+    <link xref="win-condition">condition window</link>, which
+    pops up when you click on the
+    <gui>Edit</gui> or the
+    <gui>New</gui> button.</p>
+    <p>The two buttons under the notebook at the right hand side of
+    the window lets you manipulate the currently selected filter.
+    The
+    <gui>Apply</gui> button is used to confirm the modifications you
+    have made on any field. If you make changes and select another
+    filter without first clicking on the
+    <gui>Apply</gui> button, all your changes will be lost.</p>
+    <p>The
+    <gui>Revert</gui> button cancels all previous changes: the
+    current filter is reverted to its state just before the last
+    click on the
+    <gui>Apply</gui> button.</p>
+  </section>
+  <section id="wf-action-page">
+    <title>The Action Page</title>
+    <p>This page describes the actions to take in case the filter
+    matches. First you specify the notification to inform you that
+    the one or several messages has matched the filter in the
+    <gui>Notification</gui> frame. Then in the
+    <gui>Action</gui> frame you tell what to do with the matching
+    messages. You can ask <app>Balsa</app> to copy or move them to any
+    mailbox, or to send them to the trash can. The other actions
+    are not yet implemented.</p>
+  </section>
+  <section id="win-condition">
+    <title>The Condition Window</title>
+    <p>This window is used to edit an existing condition or to
+    create a new one. It displays all the information needed to
+    describe the condition, it is launched when you click on the
+    <gui>Edit</gui> or
+    <gui>New</gui> buttons under the conditions list in the match
+    page of the notebook in the right part of the
+    <link xref="win-filters">filters window</link>.</p>
+    <p>This window is made of three frames:
+    <list>
+      <item>
+        <p>The
+        <gui>Match in</gui> frame: it's a set of check boxes, one
+        per match field. For example if you want to match all
+        messages that was sent by hotmail users, you just have to
+        check the
+        <gui>From</gui> box, or if you want to match all messages
+        about <app>Balsa</app>, check the
+        <gui>Subject</gui> box.</p>
+        <warning>
+          <p>Be careful with
+          <gui>Body</gui> match, this can take time for large
+          messages.</p>
+        </warning>
+        <p>For advanced use you can also specify directly the name
+        of the header to match on. A standard example the
+        "X-Mailer" is a header added to your message by the MUAs
+        with their name and versions.</p>
+        <p>The
+        <gui>All</gui> button will check all boxes, whereas the
+        <gui>Clear</gui> button will uncheck all boxes (as you might
+        have guessed).</p>
+        <p>If you specify several headers, a message will match
+        this condition if one of the header matches. For example if
+        you want to filter all messages talking about <app>Balsa</app>,
+        you should check the
+        <gui>Body</gui> and the
+        <gui>Subject</gui> boxes, so that all mails with the word
+        <quote>Balsa</quote> in its subject or its body will match.
+        You can also, if you're fed up with <app>Balsa</app> ;-), match
+        all mails that do NOT contain the word
+        <quote>Balsa</quote> in their subject and in their body
+        neither. See the description of the search types to see how
+        to do this.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Search Type</gui> frame: it's a list of the different
+        condition types. You choose
+        <gui>Simple</gui>,
+        <gui>Regular expression</gui>,
+        <gui>Date interval</gui>, or
+        <gui>flag condition</gui>. Your choice will change the
+        third frame so that it displays the fields needed by the
+        type of match chosen.</p>
+      </item>
+      <item>
+        <p>This part depends on the search type you've chosen:
+        <list>
+          <item>
+            <p>
+            <gui>Simple</gui> type: a text entry lets you input the
+            string to look for (case does not matter, the search is
+            case-insensitive). The button lets you specify if a
+            message matches when the string is or is NOT a
+            substring of the specified headers, the sentence above
+            the text entry will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Regular expression</gui>: you can input a list of
+            regular expressions. You type your regular expression
+            in the text entry, then you click on the
+            <gui>Add</gui> button to put it into the list. Of course
+            the
+            <gui>Remove</gui> button destroys the selected regular
+            expression in the list. The last button
+            <gui>One matches/None matches</gui> lets you specify
+            when a message matches the condition: when one of the
+            regular expression matches or when none matches. The
+            sentence above te list will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Date</gui> interval: you can input the interval by
+            the mean of the two text entries. A blank entry means
+            no bound. The button tells to match when the message
+            date is within the bounds or not. The sentence above
+            the text entries will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Flag condition</gui>: the four check boxes let you
+            select which messages will match this condition. If you
+            want to match all replied OR unread messages, check the
+            corresponding boxes. The button let you specify that
+            the match will be done when none of the specified flags
+            are set, the sentence above the check boxes will be
+            updated accordingly. For example if you want to filter
+            all read and replied messages, check the
+            <gui>unread</gui> and
+            <gui>replied</gui> boxes, and click on the button.</p>
+          </item>
+        </list></p>
+      </item>
+    </list></p>
+  </section>
+</page>
diff --git a/doc/de/win-main.page b/doc/de/win-main.page
new file mode 100644
index 0000000..57bab50
--- /dev/null
+++ b/doc/de/win-main.page
@@ -0,0 +1,890 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-main" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Das Hauptfenster</title>
+  <figure>
+    <media type="image" src="figures/main-window.png"/>
+    <title>Hauptfenster</title>
+  </figure>
+  <p> <app>Balsa</app> 's main window has three major areas. To the left
+  is the
+  <link xref="win-main#subwin-mblist"> mailbox list</link> . This displays all
+  the mailboxes <app>Balsa</app> knows about; it will scan for ones in
+  your local mail directory. (This means <app>Balsa</app> works well
+  with <app>procmail</app> .) It will also list <link xref="glossary#imap">IMAP</link> mailboxes that
+  you have configured. If the
+  <gui> Show Mailbox Info</gui> preference is set, two columns will
+  also be displayed next to the mailbox names containing the number
+  of unread and total messages in each mailbox that has unread
+  messages; otherwise, the number of unread messages is shown in
+  parentheses after the mailbox name. Also, any mailboxes that
+  contain unread messages will be shown in a bold font.</p>
+  <p> At the top-right is a view of the currently open mailbox,
+  called the
+  <link xref="win-main#subwin-msgindex"> message index</link> . You can browse
+  messages and manipulate them here.</p>
+  <p> At the bottom-right of <app>Balsa</app> 's main window is the
+  <link xref="win-main#subwin-msgview"> message view</link> . This displays
+  the message selected in the message index. You can save
+  attachments, view attachments, and read incoming email here.</p>
+  <section id="menu-toolbar">
+    <title>Menüs und Werkzeugleisten</title>
+    <figure>
+      <media type="image" src="figures/main-window-toolbar.png"/>
+      <title>Werkzeugleiste des Hauptfensters</title>
+    </figure>
+    <p>Die Menüleiste am oberen Rand des <interface>Hauptfensters</interface> stellt die folgenden Befehle 
bereit:</p>
+    <terms>
+      <item>
+        <title>
+          <guiseq>
+            <gui> File</gui>
+          </guiseq>
+        </title>
+        <p>Dieses Menü enthält grundlegende Befehle.</p>
+        <terms>
+          <item>
+            <title>
+              <guiseq>
+                <gui> File</gui>
+                <gui> New</gui>
+              </guiseq>
+            </title>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Message...</gui>
+                </guiseq>
+                <key>M</key> -- Create a new message, and
+                display a new window to type the message in.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Mailbox...</gui>
+                </guiseq> -- Open a dialog box to create a new
+                mailbox. There are various items like this,
+                corresponding to the different types of mailbox
+                that <app>Balsa</app> supports. See the
+                <link xref="mbox-formats"> discussion of different
+                mailbox formats</link> and their advantages and
+                disadvantages.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Remote IMAP folder...</gui>
+                </guiseq> -- Open a dialog box to create a
+                folder for an account on an IMAP server. This
+                <link xref="folder-config"> IMAP folder
+                properties</link> dialog can also be used to change
+                the details of the account.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Remote IMAP subfolder...</gui>
+                </guiseq> -- Open a dialog box to create a new
+                subfolder in an existing IMAP folder tree. This
+                <link xref="subfolder-config"> IMAP subfolder
+                properties</link> dialog can also be used to rename
+                or move a subfolder.</p>
+              </item>
+            </list>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Continue</gui>
+            </guiseq>
+            <key>C</key> -- Continue a postponed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Get New Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>M</key></keyseq> -- 
+            This causes <app>Balsa</app> to
+            attempt to retrieve any new messages from the
+            <link xref="glossary#pop">POP3</link> server.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Send Queued Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>T</key></keyseq> --
+            Send all mail waiting in the
+            Outbox mailbox to the mail server now.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Send and Receive Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>B</key></keyseq> --
+            Send all mail waiting in the
+            Outbox mailbox to the mail server now and retrieve any
+            new messages.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Page Setup</gui>
+            </guiseq> -- Set print options such as paper size
+            and print orientation.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Print</gui>
+            </guiseq> -- Print the currently selected message
+            (displayed in the message view pane.)</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Address Book</gui>
+            </guiseq>
+            <key>B</key> -- Open <app>Balsa</app> 's address
+            book.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Quit</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>Q</key></keyseq> --
+            Exit the program.</p>
+          </item>
+        </terms>
+      </item>
+      <item>
+        <title>
+          <gui> Edit</gui>
+        </title>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Copy</gui>
+            </guiseq>
+            <keyseq><key>Ctrl&gt;</key><key>C</key></keyseq> --
+            Copy selected text to the clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Select All</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>A</key></keyseq> --
+            Select all text in the currently
+            displayed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Select Thread</gui>
+            </guiseq> -- Select all messages in the same thread
+            as the currently displayed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find</gui>
+            </guiseq> 
+            <keyseq><key>Ctrl</key><key>F</key></keyseq> --
+            Find messages in the current mailbox
+            that match a given set of conditions, using the
+            <link xref="win-search"> search mailbox
+            window</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find Next</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>G</key></keyseq> --
+            Find the next matching message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find in Message</gui>
+            </guiseq> <key>/</key>--
+            Selecting this option opens a "search
+            bar" at the foot of the message preview, in which you
+            can type text for which <app>Balsa</app> will search in the
+            current message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Filters</gui>
+            </guiseq> -- Open up the
+            <link xref="win-filters"> filters window</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Export filters</gui>
+            </guiseq> -- Open up a window for exporting filters
+            in the Sieve format.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Preferences...</gui>
+            </guiseq> -- Open the
+            <link xref="preferences"> Preferences</link> window to
+            change the settings of <app>Balsa</app> .</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> View</gui>
+        </title>
+        <p>Menü zum Anpassen der Nachrichtenansicht.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Show Mailbox Tree</gui>
+            </guiseq> <key>F9</key> --
+            Toggle the display of the mailbox tree
+            in the main window.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Show Mailbox Tabs</gui>
+            </guiseq> -- Toggle the display of tabs for all
+            open mailboxes.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Wrap</gui>
+            </guiseq> -- Toggle the display of messages using
+            word wrap. The column to which the message is wrapped
+            is set in the
+            <link xref="preferences"> Preferences</link> window.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> No Headers</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> Selected Headers</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> All Headers</gui>
+            </guiseq> -- Select the headers to display in the
+            message pane.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Flat index</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> Simple threading</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> JWZ threading</gui>
+            </guiseq> -- Select the type of threading used to
+            display the messages in the message index.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Expand All</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>E</key></keyseq> --
+            <guiseq>
+              <gui> View</gui>
+              <gui> Collapse All</gui>
+            </guiseq>
+             <keyseq><key>Ctrl</key><key>L</key></keyseq> --
+             Expand or collapse all
+             threads in the currently displayed mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Zoom In</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>+</key></keyseq>,
+            <guiseq>
+              <gui> Zoom Out</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>-</key></keyseq>,
+            <guiseq>
+              <gui> Zoom 100%</gui>
+            </guiseq> -- Alter the font size of HTML messages.
+            Plain text messages will always use the font specified
+            in the
+            <link xref="preferences"> Preferences</link> window.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> Mailbox</gui>
+        </title>
+        <p>Zum Bearbeiten von Postfächern.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next</gui>
+            </guiseq> <key>N</key>--
+            Select the next message in the current
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Previous</gui>
+            </guiseq> <key> P</key> --
+            Select the previous message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next Unread</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>N</key></keyseq> --
+            Select the next unread message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next Flagged</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>Alt</key><key>F</key></keyseq> --
+            Select the next flagged message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Hide messages</gui>
+            </guiseq> -- A submenu listing all the types of
+            messages that may be hidden and unhidden in the current
+            mailbox. Types in the submenu are toggled when
+            selected. A Checkmark indicates it is currently
+            hidden.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Reset Filter</gui>
+            </guiseq> -- Resets to the mailbox filter.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Select All</gui>
+            </guiseq> -- Selects all messages in the current
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Edit...</gui>
+            </guiseq> -- Edit mailbox properties.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Delete...</gui>
+            </guiseq> -- Delete the currently selected
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Expunge Deleted Messages</gui>
+            </guiseq> -- Physically remove from the backing
+            mailstore all messages marked as deleted.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Close</gui>
+            </guiseq> -- Close the currently selected
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Empty Trash</gui>
+            </guiseq> -- Delete all messages from the
+            <code> Trash</code> mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Select Filters</gui>
+            </guiseq> -- Pop up a dialog that allows you to
+            control which filters are applied to this mailbox, and
+            optionally to apply them.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Remove Duplicates</gui>
+            </guiseq> -- Remove duplicate messages; <app>Balsa</app>
+            locates all messages in the current mailbox that have
+            the same Message-ID header, and removes all but
+            one.</p>
+          </item>
+        </list>
+      </item>
+      <item id="subwin-messagemenu">
+        <title>
+          <gui> Message</gui>
+        </title>
+        <p>Dieses Menü verfügt über Befehle zum Bearbeiten von Nachrichten.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <key> R</key>
+              <gui> Message</gui>
+              <gui> Reply...</gui>
+            </guiseq> <key>R</key> -- Reply to the currently selected
+            message(s).</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> A</key>
+              <gui> Message</gui>
+              <gui> Reply to All...</gui>
+            </guiseq> <key>A</key> -- Reply to the currently selected
+            message(s), sending the reply to all senders and
+            recipients of the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> G</key>
+              <gui> Message</gui>
+              <gui> Reply to Group...</gui>
+            </guiseq> <key>G</key> -- Reply to a mailing list, instead of
+            the sender to that list.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> F</key>
+              <gui> Message</gui>
+              <gui> Forward attached...</gui>
+            </guiseq> -- Forward the currently selected
+            message(s) as an attachment.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Forward inline...</gui>
+            </guiseq> -- Forward the currently selected
+            message(s), quoted inline.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Next Part</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>.</key></keyseq>--
+            View the next part of the message (if
+            the message is multi-part).</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <shortcut>
+                <keycombo>
+                  <sys> Ctrl</sys>
+                  <sys> ,</sys>
+                </keycombo>
+              </shortcut>
+              <gui> Message</gui>
+              <gui> Previous Part</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>,</key></keyseq> --
+            View the previous part of the
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Save Current Part...</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>S</key></keyseq>--
+            Save the currently selected part of
+            the message to a file.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <shortcut>
+                <keycombo>
+                  <sys> Ctrl</sys>
+                  <sys> U</sys>
+                </keycombo>
+              </shortcut>
+              <gui> Message</gui>
+              <gui> View Source...</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>U</key></keyseq> --
+            Opens a new window that displays the
+            raw message as received from the
+            <link xref="glossary#mta">MTA</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Copy</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>C</key></keyseq> --
+            Copies to the clipboard any text
+            selected in the message view of the current
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Select Text</gui>
+            </guiseq> -- Selects the entire text of the current
+            message in the message view.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Move to Trash</gui>
+            </guiseq> <key>D</key> -- Moves the currently selected
+            message(s) to the Trash.</p>
+          </item>
+          <item>
+            <p>
+              <guiseq>
+                <gui> Message</gui>
+                <gui> Toggle flag</gui>
+              </guiseq>
+            </p>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Flagged</gui>
+                </guiseq> <key>X</key> --
+                Toggle the flag on the currently
+                selected message(s). This is shown as an
+                exclamation mark next in the message index.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <shortcut>
+                    <keycombo>
+                      <sys> Ctrl</sys>
+                      <sys> D</sys>
+                    </keycombo>
+                  </shortcut>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Deleted</gui>
+                </guiseq>
+                <keyseq><key>Ctrl</key><key>D</key></keyseq> --
+                Marks the message as set for
+                deletion. The message will be actually removed from
+                the backing mailstore when it is "expunged" either
+                manually, or as specified in the
+                <link xref="preferences">Preferences</link>.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <shortcut>
+                    <keycombo>
+                      <sys> Ctrl</sys>
+                      <sys> R</sys>
+                    </keycombo>
+                  </shortcut>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> New</gui>
+                </guiseq>
+                <keyseq><key>Ctrl</key><key>R</key></keyseq> --
+                Marks a message that has been read
+                as new, and vice-versa. The message will display
+                the standard icon and font for a new message.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Answered</gui>
+                </guiseq> -- Toggles the reply icon for a
+                message.</p>
+              </item>
+            </list>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> S</key>
+              <gui> Message</gui>
+              <gui> Store Address...</gui>
+            </guiseq> <key>S</key>-- Add the sender of the currently
+            selected message to your address book.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> Settings</gui>
+        </title>
+        <p> Menu for changing <app>Balsa</app> 's configuration.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Settings</gui>
+              <gui> Toolbars...</gui>
+            </guiseq> -- Open the
+            <link xref="toolbar-prefs"> Toolbars</link> window to
+            modify the content and arrangement of the toolbars in
+            <app>Balsa</app> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Settings</gui>
+              <gui> Identities...</gui>
+            </guiseq> -- Open the
+            <link xref="identities"> Identities</link> window to
+            customize how you present yourself to the rest of the
+            world.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Help</gui>
+        </title>
+        <p>Menu for getting this help, and information about <app>Balsa</app>.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Help</gui>
+              <gui>Contents</gui>
+            </guiseq> <key>F1</key> -- Show this help file.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Help</gui>
+              <gui>About</gui>
+            </guiseq> -- Show information about <app>Balsa</app>.</p>
+          </item>
+        </list>
+      </item>
+    </terms>
+  </section>
+  <section id="subwin-mblist">
+    <title>Die Postfachliste</title>
+    <p> The mailbox list in the main window lists all of your
+    mailboxes. <app>Balsa</app> will automatically detect your local
+    mailboxes by searching for mailboxes under your local mail
+    directory (probably ~/mail). This lets <app>Balsa</app> coexist with
+    <app>pine</app> and <app>procmail</app> without causing problems.</p>
+    <p> Your mailboxes will be displayed as a tree view, with
+    mailboxes in subdirectories of your local mail directory
+    initially hidden but accessible by expanding the tree.
+    <link xref="glossary#imap">IMAP</link> mailboxes will also be displayed as being at the top
+    level of the tree. <link xref="glossary#pop">POP3</link> mailboxes are not displayed.</p>
+  </section>
+  <section id="subwin-msgindex">
+    <title>Der Nachrichtenindex</title>
+    <p>Der Nachrichtenindex zeigt die Nachrichten im aktuellen Ordner an. Sie können wählen, welche 
Nachricht angezeigt werden soll. Klicken Sie wie dargestellt auf die einzelnen Reiter der Reitermappe oder 
klicken Sie auf einen Ordner in der Postfachliste, um ihn in den Vordergrund zu bringen.</p>
+    <p> From the message index you can do a lot. Clicking on a
+    message will cause it to be displayed in the message view.
+    Right-clicking on it will give a pop-up menu letting you reply
+    to the message (or forward it, etc.) and move it to another
+    folder (using the
+    <gui> Move to</gui> menu item). Double-clicking on a message, or
+    pressing either the space-bar or the
+    <sys> Enter</sys> key while the keyboard focus is in the index,
+    will open the message in a separate window. Also, it is
+    possible to drag and drop messages from the index to other
+    mailboxes in the mailbox list and open mailbox tabs.</p>
+    <p>Das Kontextmenü enthält die folgenden Einträge:</p>
+    <list>
+      <item>
+        <p>
+        <guiseq>
+          <gui> Reply</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Reply To All</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Reply To Group</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Forward Attached</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Forward Inline</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Store Address</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Delete</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Undelete</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Move To Trash</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Toggle Flagged</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Toggle Unread</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Move to</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> View Source</gui>
+        </guiseq> -- These perform the same actions as their
+        counterparts in the
+        <link xref="win-main#subwin-messagemenu"> message menu</link> .</p>
+      </item>
+      <item>
+        <p>
+        <guiseq>
+          <gui> Move to</gui>
+        </guiseq> -- Moves the currently selected message(s) to
+        another mailbox. When this menu item is selected, a list of
+        available mailboxes is displayed, from which the
+        destination may be selected.</p>
+      </item>
+    </list>
+  </section>
+  <section id="subwin-msgview">
+    <title>Das Nachrichtenfenster</title>
+    <p>Dies zeigt die im Nachrichtenindex ausgewählte Nachricht angezeigt. Die Kopfzeilen werden oberhalb 
des Nachrichtentexts dargestellt, es sei denn, Sie haben dies deaktiviert. Der Nachrichtentext wird unterhalb 
der Kopfzeilen angezeigt.</p>
+    <p> If the message is multipart, an attachment icon will appear
+    beside the headers. Clicking this icon will display a list of
+    the parts from which you may select one. If <app>Balsa</app> is
+    unable to display it, you will be given a choice of
+    applications known to handle the part. Additionally, there is
+    always an option to save the attachment to a file.</p>
+    <note>
+      <p> <app>Balsa</app> supports viewing HTML messages only when
+      compiled with
+      <app> gtkhtml</app> or
+      <app> WebKit</app> support. Gtkhtml support will be compiled in
+      if gtkhtml-devel files are found. WebKit is currently
+      supported only on an experimental basis,</p>
+    </note>
+    <p> You are not restricted to that pane either. Double-clicking
+    on a message in the message index, or touching either the space
+    bar or the
+    <sys> Enter</sys> key, will open it in a
+    <link xref="win-message"> separate window</link> .</p>
+  </section>
+</page>
diff --git a/doc/de/win-message.page b/doc/de/win-message.page
new file mode 100644
index 0000000..e6bb639
--- /dev/null
+++ b/doc/de/win-message.page
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-message" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>Das Nachrichtenfenster</title>
+
+<p>
+  In addition to the preview pane, <app>Balsa</app> can display messages in
+  separate windows.  Simply double-click on the desired message from
+  the message index in the main window, or select the message and press
+  the space bar.  Any number of windows may be
+  opened, although only one per unique message.
+</p>
+
+<p>
+  The message window has a menu and toolbar containing commands
+  pertinent to an individual message.  Commands are as described in
+  the <link xref="win-main">main window</link>.
+  Below the menu and toolbar are the message headers in a box,
+  followed by the message body.
+</p>
+
+<figure>
+  <title>Das Nachrichtenfenster</title>
+  <media type="image" src="figures/message-window.png" format="PNG"/>
+</figure>
+
+<p>
+  If your copy of <app>Balsa</app> has cryptographic support, there will be
+  an icon in the header box depicting an envelope with a lock and a
+  check mark.  Clicking the icon will check the key used to sign the
+  message.  The message body will contain an icon and some
+  descriptive text noting whether the signing key is valid, invalid,
+  or unchecked.
+</p>
+
+<p>
+  If the message contains attachments or more than one part of any
+  kind, an attachment icon will be present in the header box as
+  shown below.  Clicking this icon will show a menu of all available
+  parts.  Selecting a part will update the display of the message
+  body accordingly.
+</p>
+
+<figure>
+  <title>Auswahl eines Nachrichtenteils</title>
+  <media tyep="image" src="figures/msg-part-select.png" format="PNG"/>
+</figure>
+
+<p>
+  The <gui>complete message</gui> selection will
+  do its best to render all
+  parts at once, but some may have to be selected individually or
+  opened in an external program.  Parts which cannot be rendered
+  within <app>Balsa</app> will instead display a list of options for opening
+  external programs or saving the data.  Right-clicking on a part
+  will also provide a menu with these options.
+</p>
+
+<p>
+  Navigation between messages is possible without returning to the
+  index in the main window.  Next unread being quite useful for
+  checking all new mail.  Deleting the current message will
+  automatically display the next unread one.  This behavior can be
+  changed in the <link xref="preferences">preferences</link>.
+</p>
+</page>
diff --git a/doc/de/win-run-filters.page b/doc/de/win-run-filters.page
new file mode 100644
index 0000000..8c4620f
--- /dev/null
+++ b/doc/de/win-run-filters.page
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-run-filters" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Das Filter-Fenster</title>
+  <p>This window is divided in two lists: the left one displays all
+  available filters, and the right part displays all filters to be
+  applied on the mailbox (the name of which is shown in the window
+  title). See the
+  <link xref="win-filters">filters window</link> section to see
+  how to set up filters.</p>
+  <p>The right list has three columns. The first one contains the
+  filters name. The two others tells you if the filter will be
+  automatically applied: e.g. if a dot is displayed in the second
+  column
+  (<gui>On reception</gui>), this tells you that whenever new
+  messages arrived in this mailbox, they will be filtered by the
+  corresponding filter (Note: the filter is applied only on the new
+  messages, not the entire mailbox; this is similar to the use of
+  procmail). In the same way, if a dot is displayed in the third
+  column
+  (<gui>On exit</gui>), the filter will be applied to the entire
+  mailbox when you exit <app>Balsa</app>.</p>
+  <p>Note: the
+  <gui>On exit</gui> feature is not yet implemented.</p>
+  <p>When you tell <app>Balsa</app> to apply several filters on the same
+  mailbox (i.e. when you put several filters in the right list),
+  only the first match counts: the filters are applied in the
+  specified order and the first that matches on the current message
+  will be applied but not the following ones.</p>
+  <p>There are two buttons between the filters lists:
+  <list>
+    <item>
+      <p>The
+      <gui>Add</gui> button: moves the selected filters from the
+      left list to the right one, adding more filters to be applied
+      to the mailbox.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Remove</gui> button: removes the currently selected
+      filter in the right list and puts it back in the left
+      list.</p>
+    </item>
+  </list></p>
+  <p>The
+  <gui>Up</gui> and
+  <gui>Down</gui> buttons under the right list serve to reorder the
+  filters that are to be applied. This is a sort of priority
+  between filters, because if several filters could match the
+  current message, only the first one will be applied. The
+  <gui>Apply Now</gui> button applies all filters of the right list
+  to the entire mailbox immediately (be patient, this can take a
+  quite a long time on big mailboxes or remote ones).</p>
+  <p>You can also use this dialog to apply a filter to a mailbox
+  without actually attaching it to the mailbox. Select one or more
+  filters in the left hand list, and click the
+  <gui>Apply Selected</gui> button below that list.</p>
+  <p>There are three buttons below the filters lists:
+  <list>
+    <item>
+      <p>The
+      <gui>OK</gui> button: saves the list of filters associated to
+      the mailbox. Note that this does not apply the filters to the
+      mailbox. It is useful only when you have set up automatic
+      filters, or when you have to manually apply a lot of filters
+      frequently to this mailbox: the next time <app>Balsa</app> will
+      reload the saved filters and you will only have to press the
+      <gui>Apply</gui> button.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Cancel</gui> button: this discards any changes and closes
+      the dialog box.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Help</gui> button: opens this help window.</p>
+    </item>
+  </list></p>
+</page>
diff --git a/doc/de/win-search.page b/doc/de/win-search.page
new file mode 100644
index 0000000..f14dc82
--- /dev/null
+++ b/doc/de/win-search.page
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-search" xml:lang="de">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Das Postfach-durchsuchen-Fenster</title>
+  <p>You can search a mailbox to find and display messages that
+  contain a given string in the To, From, Subject, or Cc headers,
+  or in the message body. This window allows you to specify the
+  string for which you want to search and where <app>Balsa</app> should
+  look. Open the window with the
+  <guiseq>
+    <gui>Edit</gui>
+    <gui>Find</gui>
+  </guiseq>command, or
+  <keyseq>
+    <key>Ctrl</key>
+    <key>F</key>
+  </keyseq>.</p>
+  <p>You can view the matching messages in two ways:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Show only matching messages</gui>
+      </title>
+      <p>If you click the
+      <gui>Apply</gui>button, the mailbox view will be filtered to
+      show only the messages that match the conditions. If you
+      click the
+      <gui>Clear</gui>button, the filter will be cleared, and the
+      mailbox view will be restored to show all messages. You can
+      also use
+      <guiseq>
+        <gui>Mailbox</gui>
+        <gui>Reset Filter</gui>
+      </guiseq>to restore the view.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Open next matching message</gui>
+      </title>
+      <p>Alternatively, you can step through the matching messages,
+      either forward or in reverse, and optionally wrapping the
+      search when it reaches the end of the mailbox. Click the
+      <gui>OK</gui>button to view the first matching message after
+      (or before) the current message. Then you can use
+      <guiseq>
+        <gui>Edit</gui>
+        <gui>Find Next</gui>
+      </guiseq>, or
+      <keyseq>
+        <key>Ctrl</key>
+        <key>G</key>
+      </keyseq>, to step through the matching messages.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/es/ab-conf.page b/doc/es/ab-conf.page
new file mode 100644
index 0000000..a548019
--- /dev/null
+++ b/doc/es/ab-conf.page
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="ab-conf" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>Address Book Configuration</title>
+  <p>This is to be filled in.</p>
+
+<section id="CHOICE">
+  <title>Address book type</title>
+  <p>You can choose among several address book types.</p>
+</section>
+
+<section id="EXTERN">
+<title>External address book</title>
+<!-- Balsa support for an external query addressbook -->
+<!-- By Jelmer Vernooij <jelmer nl linux org>        -->
+
+<p>The balsa addressbook supports input from programs. Thus, you
+can use (no importing needed!) for example your pine or mutt
+addressbook. The mutt mailer (<link href="http://www.mutt.org/";>www.mutt.org</link>) uses an identical
+system to retrieve addresses from programs.</p>
+
+  <section id="extern-existing-programs">
+   <title>Existing programs</title>
+
+<p>The following programs are compatible with the mutt mail reader
+and <em>should</em> be with balsa. Submit links to more programs.</p>
+
+<list>
+<item><p>
+<link href="http://www.spinnaker.de/lbdb/"; type="http">http://www.spinnaker.de/lbdb/</link> - The little
+brother database. Read emailaddresses and names from: finger,
+/etc/passwd, incoming procmail email, NIS, fido, the abook program,
+mutt addressbook, pine addressbook, palm addressbook, gnomecard
+addressbook, big brother database, ldap database.
+</p></item>
+
+<item><p>
+<link href="http://www.fiction.net/blong/programs/mutt/";>http://www.fiction.net/blong/programs/mutt/</link>
+ - palm address database, ldapsearch wrapper, ph/qi server, UIUC, ph,
+</p></item>
+</list>
+</section>
+
+<section id="extern-load-scripts">
+<title>Writing your own load scripts</title>
+
+<p><app>Balsa</app> ignores the first line of output from your program. You
+might want to write comments or debug output on this line. The
+remaining lines should have this format:</p>
+<p><output>
+e-mail address full name       nickname
+</output></p>
+
+<p>The three fields should be separated by tabs. The third field is
+currently not used by balsa, but might be in the future. It is also
+kept to ensure compatibility with mutt. </p>
+
+<p><app>Balsa</app> executes your script with one argument: the pattern to
+search for. A space (" ") is used as the first argument when creating
+a list of all users.</p>
+
+<p>All characters are allowed, except the tab (\t), since that
+is the field separator.
+</p>
+
+<p>An example output could be:</p>
+<p><output>
+lbdbq: 3 matches
+</output></p>
+<p><output>
+balsa-list gnome org   Balsa List      balsa-list
+</output></p><p><output>
+jelmer nl linux org    Jelmer Vernooij jelmer
+</output></p><p><output>
+balsa-maintainer theochem kth se       Pawel Salek     balsa-maintainer
+</output></p>
+
+
+<note><p>Your script/program should write its output to stdout and not
+to stderr!
+</p></note>
+</section>
+
+<section id="extern-save-scripts">
+<title>Writing your own save scripts</title>
+
+<p>Adding addresses is also possible. Your script should receive 3
+arguments. The first is an email address, the second a full name and
+the third is an alias (currently not used and replaced by 'TODO').</p>
+
+<p>Note that mutt does not have support for adding addresses and there is thus no compatibility in this 
case.</p>
+
+<p>Comments are welcome:
+<link href="mailto:jelmer nl linux org">jelmer nl linux org</link></p>
+</section>
+</section> <!-- EXTERN -->
+</page>
diff --git a/doc/es/authors.page b/doc/es/authors.page
new file mode 100644
index 0000000..31ac276
--- /dev/null
+++ b/doc/es/authors.page
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="authors" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Autores</title>
+  <p><app>Balsa</app> is currently developed by (in alphabetical
+  order):</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Carlos Morgado (
+      <link href="mailto:chbm chbm nu">chbm chbm nu</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+  </list>
+  <p>In the past, numerous people contributed to balsa, including
+  (in alphabetical order):</p>
+  <list>
+    <item>
+      <p>Hector Garcia Alvarez (
+      <link href="mailto:hector scouts-es org">
+      hector scouts-es org</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Bruno Pires Marinho (
+      <link href="mailto:bapm camoes rnl ist utl pt">
+      bapm camoes rnl ist utl pt</link> )</p>
+    </item>
+    <item>
+      <p>Jay Painter (
+      <link href="mailto:jpaint gimp org">
+      jpaint gimp org</link> )</p>
+    </item>
+    <item>
+      <p>Stuart Parmenter (
+      <link href="mailto:pavlov pavlov net">
+      pavlov pavlov net</link> )</p>
+    </item>
+    <item>
+      <p>David Pickens (
+      <link href="mailto:dpickens iaesthetic com">
+      dpickens iaesthetic com</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>To find more information about it, please visit the
+  <app>Balsa</app>
+  <link href="http://balsa.gnome.org/";>Web page</link>. Please send
+  all comments, suggestions, and bug reports to the
+  <link href="http://bugs.gnome.org/";>GNOME bug tracking
+  database</link>. Instructions for submitting bug reports can be
+  found on-line at
+  <link href="http://balsa.gnome.org/bugs.html";>
+  http://balsa.gnome.org/bugs.html</link>. If you are using GNOME
+  1.1 or later, you can also use command
+  <cmd>bug-buddy</cmd> for submitting bug reports.</p>
+  <p>The following people contributed to this manual:</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Berend De Schouwer (
+      <link href="mailto:bds jhb ucs co za">
+      bds jhb ucs co za</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Craig Routledge (
+      <link href="mailto:webstuff craigroutledge com">
+      webstuff craigroutledge com</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+    <item>
+      <p>Jelmer Vernooij (
+      <link href="mailto:jelmer nl linux org">
+      jelmer nl linux org</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>Please send all comments and suggestions regarding the manual
+  to the GNOME Documentation Project at
+  <link href="mailto:docs gnome org">docs gnome org</link> and the
+  <link href="http://mail.gnome.org/mailman/listinfo/balsa-list";>
+  <app>Balsa</app> Discussion List</link>. You can also add your
+  comments online by using
+  <link href="http://library.gnome.org/devel/gdp-handbook/stable/gettingstarted.html.en";>
+  GNOME Documentation Status Table</link>.</p>
+</page>
diff --git a/doc/es/common-tasks.page b/doc/es/common-tasks.page
new file mode 100644
index 0000000..d09e85c
--- /dev/null
+++ b/doc/es/common-tasks.page
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="common-tasks" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Common Tasks with <app>Balsa</app></title>
+  <p>This section explains many of the things you might want to do
+  with <app>Balsa</app>.</p>
+  <list>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-create-new-mb">Creating new
+        mailboxes</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-move-msg">Moving messages around</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-main-folder-imap">Making one of the main
+        folders IMAP-based</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-alias-expansion">Expanding e-mail
+        addresses automatically</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-ldap">Setting up LDAP address
+        books</link>
+      </p>
+    </item>
+  </list>
+  <section id="ct-create-new-mb">
+    <title>Creating New Mailboxes</title>
+    <p>You can create new local and <link xref="glossary#imap">IMAP</link> mailboxes
+    using the <guiseq><gui>File</gui><gui>New</gui></guiseq> command, or
+    by
+    right-clicking in the mailbox list and selecting
+    <gui>New Mailbox</gui>.
+    This will start a dialog that will let you name the mailbox and
+    specify its location.</p>
+    <p>To create a new <link xref="glossary#pop">POP3</link> mailbox, go to the <link 
xref="preferences">preferences window</link>,
+    select the <gui>Mail options</gui> page, and click <gui>Add</gui>
+    in the <gui>Remote mailbox servers</gui>
+    area. A dialog will be displayed that will let you set up the
+    new mailbox.</p>
+  </section>
+  <section id="ct-move-msg">
+    <title>Moving Messages</title>
+    <p>There are several methods available for moving or copying
+    messages from one mailbox to another. The first is via the
+    <gui>Transfer</gui> context menu, and the second is using drag
+    and drop.</p>
+    <p>To transfer messages using the
+    <gui>Transfer</gui> menu, simply select the messages you desire
+    to move from one mailbox, then press
+    <keyseq><key>Shift</key><key>F10</key></keyseq> or <key>Menu</key>,
+    or click the right
+    mouse button,
+    to bring up the context menu and
+    select the
+    <gui>Move to</gui> submenu. This will display a list of
+    mailboxes similar to the mailbox list in the main window. The
+    list can be scrolled and trees expanded and collapsed, although
+    these changes will not be reflected in the main list. Selecting
+    a mailbox will start the transfer.</p>
+    <p>The other method of transferring messages is to simply drag
+    and drop the message(s) from the message index to the desired
+    destination. Select the message(s) you wish to transfer, then
+    drag them using the mouse until they are over the intended
+    mailbox. The destination can either be in the mailbox list in
+    the main window, or if open mailbox tabs are enabled the
+    messages can be dragged to them.  </p>
+  </section>
+  <section id="ct-main-folder-imap">
+    <title>I want one of the main folders to be IMAP</title>
+    <p>First, create the IMAP folder as you want it configured.
+    Then, press right mouse button on the mailbox entry and select
+    <gui>Mark as Inbox</gui>. That is all!</p>
+  </section>
+  <section id="ct-alias-expansion">
+    <title>I want Balsa to guess my friends</title>
+    <p><app>Balsa</app> can expand the names of your contacts it finds
+    in <app>Balsa</app> addressbooks. It will do this by any part of the
+    contact's name or email address.</p>
+    <p>As you type a username in any of the To:, Cc:, or Bcc: entry
+    boxes in the
+    <link xref="win-composer">Compose window</link>, it will do
+    a case insensitive search in the addressbook for a matching
+    username, and pop up a list of matching complete addresses.
+    Press
+    <key>Cursor-Down</key> to highlight one of the addresses, and
+    <key>Enter</key> to select it.</p>
+    <!--
+  This is best demonstrated
+  with the following picture:</p>
+
+  <figure>
+    <title>Expanding Aliases</title>
+    <screenshot>
+          <mediaobject>
+            <imageobject><imagedata
+                fileref="figures/example-alias.png" format="PNG"/>
+            </imageobject>
+          </mediaobject>
+    </screenshot>
+  </figure>
+
+  <p>The example shows what it looks like if "Balsa Mailing
+  List" is in your address book, and you have typed
+  &quot;ba&quot;</p>
+-->
+    <p>To enable this feature, you must select which address books
+    you wish to be searched for aliases to expand. This can be done
+    in the
+    <link xref="preferences-address-books">
+    Preferences</link> window, on the
+    <gui>Address Books</gui> page. Also, some address books are
+    expensive to lookup. You will need then to press
+    <key>Escape</key> to explicitly expand the alias.</p>
+  </section>
+  <section id="ct-ldap">
+    <title>Setting up LDAP address books</title>
+    <p>Only steps crucial for <app>Balsa</app> are described here. Some
+    of the steps may be specific to OpenLDAP server. Whenever in
+    doubt, consult the documentation provided with your LDAP
+    server.</p>
+    <list>
+      <item>
+        <p>Install the LDAP server software.</p>
+      </item>
+      <item>
+        <p>Configure. In the case of OpenLDAP, edit
+        <file>/etc/openldap/ldap.conf</file> and
+        <file>/etc/openldap/slapd.conf</file>. Consult your LDAP
+        configuration and other sources to choose the right Domain
+        Name for your institution and authentication level
+        apriopriate to your environment.</p>
+      </item>
+      <item>
+        <p>Import data to your LDAP server. OpenLDAP comes with a
+        set of migration tools but they do not create directly
+        objects of standard
+        <code>inetOrgPerson</code> class which is an apropriate type
+        for address book entry. You may need to tune them.</p>
+      </item>
+    </list>
+    <p><app>Balsa</app> searches for objects having
+    <sys>mail</sys> attribute. The search is done on the
+    <sys>cn</sys> attribute and the search filter has a form
+    "(&amp;(mail=*)(cn=John D))". <app>Balsa</app> uses
+    <sys>cn</sys>(common name),
+    <sys>givenName</sys>(given name),
+    <sys>sn</sys>(surname) and
+    <sys>mail</sys>(e-mail address) attributes of the found
+    objects.</p>
+  </section>
+</page>
diff --git a/doc/es/folder-config.page b/doc/es/folder-config.page
new file mode 100644
index 0000000..f30c003
--- /dev/null
+++ b/doc/es/folder-config.page
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="folder-config" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>IMAP Folder Configuration</title>
+  <p>The folder configuration edit dialog allows you to configure
+  entire mailbox sets on remote IMAP servers. Entire configuration
+  is split into basic and advanced parts.</p>
+  <section>
+    <title>Basic IMAP folder configuration</title>
+    <p>The basic IMAP folder configuration tab is probably the only
+    part you need to fill in.</p>
+    <list>
+      <item>
+        <p>Descriptive name is the name of the root node that will
+        be shown in the mailbox tree on the left side.</p>
+      </item>
+      <item>
+        <p>Server is the host name or IP number of the IMAP
+        server.</p>
+      </item>
+      <item>
+        <p>User name is the name used for authorization on the IMAP
+        server.</p>
+      </item>
+      <item>
+        <p>Some servers allow anonymous access to bulletin boards
+        or mailing list archives. Check this box if you want to use
+        this mode - you will not be asked for password.</p>
+      </item>
+      <item>
+        <p>Password is the password used for authorization on the
+        IMAP server.</p>
+      </item>
+      <item>
+        <p>Check box allows you to choose all mailboxes on the
+        server, or only those you subscribed to.</p>
+      </item>
+      <item>
+        <p>Prefix is the root mailbox on the server. You may leave
+        it empty if you want to show all the folders on your server
+        but if your IMAP server stores also other kind of files you
+        may specify for instance "mail".</p>
+      </item>
+    </list>
+  </section>
+  <section>
+    <title>Advanced IMAP folder configuration</title>
+    <p>Sometimes, it is necessary to tune the folder configuration
+    in order to assure a secure connection, adjust to server limits
+    or just obtain better performance. This functionality is
+    provided by the Advanced IMAP folder configuration tab.</p>
+    <list>
+      <item>
+        <p>The
+        <gui>Use SSL</gui> check box should be active if the
+        connection is to be made to IMAPS service on port 993.
+        Connection to this port will be encrypted from the start.
+        Not all servers provide this service - many provide only
+        negotiated TLS encryption.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use TLS</gui> option list determines instruct balsa how
+        to negotiate the TLS encryption. <app>Balsa</app> can never
+        attempt to negotiate it, can start TLS encryption whenever
+        it is supported by server, or can abort the connection if
+        TLS is inavailable or fails for some reason.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Max. number of connections</gui> limits the number of
+        concurrent connections open to the IMAP server. A number
+        around 15-40 is a sane option as it avoids time-consuming
+        and load-creating reselections of imap mailboxes. Some IMAP
+        servers -- notably Courier -- limit the number of
+        connections open from single IP number to 4 by default. The
+        limit in balsa has to be in such a case adjusted
+        accordingly.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Enable persistent cache</gui> check box chooses whether
+        <app>Balsa</app> should try to store downloaded messages between
+        sessions or throw them away when it is closed. The optimal
+        choice depends on the local configuration. If the
+        connection to the IMAP server is slow and local storage in
+        the home directory fast and cheap, it is recommended to
+        enable persistent message cache. If the home directory is
+        slow (eg. NFS-mounted) and the connection to the imap
+        server - fast, persistent cache becomes just a burden and
+        should be disabled.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use IDLE command</gui> check box chooses whether
+        <app>Balsa</app> should try to use IDLE command when available.
+        With this command, some servers notify immediately when a
+        new command arrives. Also, this command may reduce the
+        amount of network traffic. There are some downsides, too:
+        some firewalls do not track IMAP connections correctly and
+        will incorrectly interrupt a session in an IDLE state. In
+        particular, home-grade network routers with NAT translation
+        have notoriously this bug. In such case, it may be safer to
+        disable this command.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Enable bug workarounds</gui> check box makes
+        <app>Balsa</app> work even with an IMAP server that cannot
+        provide selected message parts. <app>Balsa</app> in such a case
+        will try to fetch entire messages instead.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use STATUS for mailbox checking</gui> check box enables
+        a more thorough but potentially more expensive way of
+        checking mailboxes on IMAP server. This method can be
+        consume many resources on the server and should be used
+        <em>only</em> on IMAP servers that have optimized STATUS
+        command.</p>
+      </item>
+    </list>
+  </section>
+  <section id="subfolder-config">
+    <title>IMAP Subfolder Properties</title>
+    <p>The subfolder properties dialog allows you to manage folders
+    on remote IMAP servers. Specifically, you can
+    <em>create</em> a new subfolder,
+    <em>rename</em> an existing subfolder, or
+    <em>move</em> a subfolder within the folder tree.</p>
+    <list>
+      <item>
+        <p>
+        <gui>Folder name</gui> is how the folder is shown in the
+        mailbox tree on the left side.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Subfolder of</gui> indicates the immediate parent of
+        the folder.</p>
+      </item>
+    </list>
+    <p>When the dialog is opened from
+    <guiseq>
+      <gui>File</gui>
+      <gui>New</gui>
+      <gui>Remote IMAP subfolder</gui>
+    </guiseq>, you can enter the folder name and browse IMAP trees
+    to find the parent folder. If you had already selected a
+    mailbox in an IMAP tree, only that tree is shown for browsing;
+    otherwise, all IMAP trees will be shown.</p>
+    <p>When the dialog is opened from
+    <guiseq>
+      <gui>Mailbox</gui>
+      <gui>Edit</gui>
+    </guiseq> with an IMAP folder selected, or by right-clicking on
+    an IMAP mailbox and selecting
+    <gui>Properties...</gui>, the mailbox may be:</p>
+    <list>
+      <item>
+        <p>Renamed, by editing the folder name;</p>
+      </item>
+      <item>
+        <p>Moved, by browsing for a different parent folder in the
+        same tree.</p>
+      </item>
+    </list>
+  </section>
+</page>
diff --git a/doc/es/getting-started.page b/doc/es/getting-started.page
new file mode 100644
index 0000000..11e2a26
--- /dev/null
+++ b/doc/es/getting-started.page
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="getting-started" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="next" xref="win-main"/>
+  </info>
+  <title>Getting Started with <app>Balsa</app></title>
+  <p>If you're starting <app>Balsa</app> for the first time, the first
+  thing you'll see is an assistant that will set up <app>Balsa</app>'s
+  basic settings. <app>Balsa</app> can guess most of what it needs to
+  know about you. It will also create five standard local
+  mailboxes: the Inbox, Outbox, Sentbox, Draftbox, and Trash.
+  (These can be changed to be <link xref="glossary#imap">IMAP</link> mailboxes later.)</p>
+  <figure>
+    <media type="image" src="figures/druid-start.png"/>
+    <title><app>Balsa</app> Start Assistant</title>
+  </figure>
+  <p>Don't worry. <app>Balsa</app> cooperates with other
+  <link xref="glossary#mua">MUA</link>'s very well. They share the
+  same locking semantics for mailboxes. If <app>Balsa</app> shares the
+  same mail directory as <app>pine</app> or <app>Mutt</app>, it will detect
+  new folders as they are created. So if you have to telnet in to
+  your mail machine, you won't be stuck.</p>
+  <p>There are many more settings in <app>Balsa</app>'s
+  <link xref="preferences">preferences window</link>, but most of
+  them do not need to be changed.</p>
+  <p>Once <app>Balsa</app> is configured, you will proceed on to the
+  <link xref="win-main">main window</link>.</p>
+</page>
diff --git a/doc/es/glossary.page b/doc/es/glossary.page
new file mode 100644
index 0000000..51010a0
--- /dev/null
+++ b/doc/es/glossary.page
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="glossary" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Glosario</title>
+    <section id="pop">
+      <title>POP</title>
+      <p>An acronym for "Post Office Protocol", a simple method of
+      retrieving mail messages from a remote mail server. Widely
+      used by mail clients from an Internet Service Provider's mail
+      server to a user's machine for viewing. Currently most people
+      use version three of the protocol, otherwise known as POP3. A
+      very simple protocol, and not very flexible, but simple to
+      implement and ubiquitous throughout the internet.</p>
+    </section>
+    <section id="imap">
+      <title>IMAP</title>
+      <p>An acronym that stands for "Internet Mail Access
+      Protocol". It is a newer method of accessing mail over the
+      internet. It is far more featureful than <link xref="glossary#pop">POP3</link>, allowing
+      for remote folders on the mail server, and more control over
+      mail delivery. However it is not as widely supported.</p>
+    </section>
+    <section id="ldap">
+      <title>LDAP</title>
+      <p>An acronym for "Lightweight Directory Access Protocol". It
+      is a widely-accepted standard for accessing contact
+      information over a network. This enables organizations to
+      store address information in a central database, but have
+      many people able to access it.</p>
+    </section>
+    <section id="libmutt">
+      <title>libmutt</title>
+      <p>The library based on Mutt's code and used by previous
+      versions of <app>Balsa</app> to handle local mail and IMAP
+      servers.</p>
+    </section>
+    <section id="mailbox-list">
+      <title>mailbox list</title>
+      <p>The list of mailboxes found in <app>Balsa</app>'s left hand
+      pane.</p>
+    </section>
+    <section id="message-index">
+      <title>message index</title>
+      <p>The list of messages in <app>Balsa</app>'s upper-right hand
+      pane.</p>
+    </section>
+    <section id="message-view">
+      <title>message view</title>
+      <p>The message display in <app>Balsa</app>'s lower-right hand
+      pane.</p>
+    </section>
+    <section id="mda">
+      <title>MDA</title>
+      <p>An acronym for "Mail Delivery Agent", this type of program
+      is also known as a Local Delivery Agent (LDA). It is
+      responsible for delivering the mail recieved for someone on a
+      machine to the mail folder of that person. <app>procmail</app> is
+      an example of this type of program, although many
+      <link xref="glossary#mta">MTA</link>'s have their own
+      MDA implementations.</p>
+    </section>
+    <section id="mta">
+      <title>MTA</title>
+      <p>An acronym for "Mail Transfer Agent", this class of
+      program is responsible for moving mail around between people,
+      be they on the same computer, on on completely separate
+      networks. Examples of this type of program include
+      <app>sendmail</app>,
+      <app>qmail</app>, and
+      <app>postfix</app>.</p>
+    </section>
+    <section id="mua">
+      <title>MUA</title>
+      <p>An acronym for "Mail User Agent", this the program a user
+      would use to read existing mail and create new messages. MUAs
+      are one of three types of programs that allow internet email
+      to work. The other two types of programs are
+      <link xref="glossary#mta">MTA</link> s and
+      <link xref="glossary#mda">MDA</link> s. <app>Balsa</app> is
+      primarily an MUA, but it also functions as an MDA/MTA when
+      retrieving mail from a remote server.</p>
+    </section>
+    <section id="regular-expression">
+      <title>Expresión regular</title>
+      <p>Often abbreviated as a
+      <em>regexp</em>, this is a method of specifing a pattern to
+      match in text. Both very simple and very complex patterns can
+      be easily matched using this method. For information on how
+      to understand and construct regular expressions the best
+      source is the
+      <cmd>grep</cmd> manual or info page.</p>
+    </section>
+    <section id="smtp">
+      <title>SMTP</title>
+      <p>An acronym that stands for "Simple Mail Transfer
+      Protocol", it is exactly that. A standard that defines a
+      simple an reliable way to transfer messages between computers
+      on a network. It is used by most, if not all, mail programs
+      to transfer mail.</p>
+    </section>
+    <section id="vcard">
+      <title>VCARD</title>
+      <p>VCARD is a standard method of storing contact information
+      for easy exchange between programs. <app>Balsa</app> supports
+      VCARD addressbooks, as does GnomeCard and Evolution. Many
+      other programs are capable of exporting their contact lists
+      in VCARD format as well.</p>
+    </section>
+</page>
diff --git a/doc/es/identities.page b/doc/es/identities.page
new file mode 100644
index 0000000..15b76c6
--- /dev/null
+++ b/doc/es/identities.page
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="identities" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Identities</title>
+  <p>This dialog window lets you specify how you present yourself
+  to the rest of the world through your email. The first page has
+  your general information:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Identity Name</gui>
+      </title>
+      <p>A unique title by which this identity will be named within
+      <app>Balsa</app>.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Full Name</gui>
+      </title>
+      <p>This doesn't
+      <em>have</em> to be your name, I guess. But it's the word
+      prefixing your email address in mail you send.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Mailing Address</gui>
+      </title>
+      <p>As you wish it to appear in your "From" header.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Reply-To address</gui>
+      </title>
+      <p>The address that you wish people to reply to your email
+      with (if you have a home and a work address, for
+      instance).</p>
+    </item>
+    <item>
+      <title>
+        <gui>Default Domain</gui>
+      </title>
+      <p>The domain that you wish to append to all e-mail entries
+      where you did not specify the domain. Normally you would use
+      your local domain. You need to enable
+      <link xref="preferences-address-books">Alias
+      Expansion</link> for this to work.</p>
+    </item>
+  </terms>
+  <p>The "Messages" page shows various initial settings for the new
+  message:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Bcc</gui>
+      </title>
+      <p>The default value for the blind-carbon-copy field when
+      using this identity. Useful if you want to always send a copy
+      of outgoing mail to another account.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Reply String</gui>
+      </title>
+      <p>The prefix for the subject line when replying to a
+      message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Forward String</gui>
+      </title>
+      <p>The prefix for the subject line when forwarding a
+      message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Request Message Disposition Notification</gui>
+      </title>
+      <p>Whether Message Disposition Notification should be
+      requested by default.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Face Path</gui>
+      </title>
+      <p>Whether a "Face" header should be attached to a program.
+      Specified path points out to a file containing a textual
+      representation of the face icon. Please see
+      <link href="http://quimby.gnus.org/circus/face/";>a
+      description of Face and X-Face</link> headers for more details
+      as well as the list of mail programs supporting this
+      feature.</p>
+    </item>
+    <item>
+      <title>
+        <gui>X-Face Path</gui>
+      </title>
+      <p>Whether a "Face" header should be attached to a program.
+      Specified path points out to a file containing a textual
+      representation of the face icon.</p>
+    </item>
+    <item>
+      <title>
+        <gui>SMTP server</gui>
+      </title>
+      <p>The
+      <link xref="preferences-mail-options#smtp-server-config">
+      SMTP server</link> to be
+      used for this identity.</p>
+    </item>
+  </terms>
+  <p>You control the signature that <app>Balsa</app> appends to your
+  messages on the "Signature" page:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Signature Path</gui>
+      </title>
+      <p>The file containing the signature to append to all your
+      messages. This can be generated in one of three ways:</p>
+      <list>
+        <item>
+          <p>From a regular file. List the path to any regular
+          file, and the text from that file will be appended to
+          your messages.</p>
+        </item>
+        <item>
+          <p>A named pipe or FIFO. In this case, to <app>Balsa</app>,
+          the file looks normal, but in reality, it is a pipe to a
+          program that is generating the content. List the path to
+          the pipe.</p>
+        </item>
+        <item>
+          <p>An executable program. <app>Balsa</app> will execute the
+          program and read its output, appending that text to the
+          message. List the path to the program with a "|"
+          prepended to it. For example:</p>
+          <p>"|/home/user/dynsig.pl"</p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <title>
+        <gui>Execute Signature</gui>
+      </title>
+      <p>Execute the instructions in the signature file and use the
+      results as the signature to append to outgoing mail. Select
+      this when generating the signature from an executable program
+      as outlined above in Signature Path.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature</gui>
+      </title>
+      <p>Append the signature to the end of all outgoing mail.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature When Forwarding</gui>
+      </title>
+      <p>Add the signature when forwarding an existing mail.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature When Replying</gui>
+      </title>
+      <p>Add the signature when replying to a existing message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Add Signature Separator</gui>
+      </title>
+      <p>When checked, this has <app>Balsa</app> insert the standard
+      signature separator before your signature.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Prepend Signature</gui>
+      </title>
+      <p>Add the signature before the message text, rather than
+      after it.</p>
+    </item>
+  </terms>
+  <p>Security settings are on the fourth page:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Sign messages by default.</gui>
+      </title>
+      <p>By default enable the cryptographic signature for every
+      new message. The default protocol is determined by the
+      "Default protocol" option.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Encrypt messages by default.</gui>
+      </title>
+      <p>By default encrypt every new message. The default protocol
+      is determined by the "Default protocol" option.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Default protocol.</gui>
+      </title>
+      <p>Choose the default protocol for the cryptographic
+      signature and message encryption.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Always trust GnuPG keys when encrypting.</gui>
+      </title>
+      <p>Do not ask for confirmation when encrypting for a
+      recipient whose GnuPG key is not fully trusted.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Remind me if messages can be encrypted.</gui>
+      </title>
+      <p>Before sending a message, check if valid keys are present
+      for all recipients and show a dialog in this case.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Use secret key with this id for signing.</gui>
+      </title>
+      <p>Usually, <app>Balsa</app> automatically selects a proper secret
+      key for cryptographic signatures from the identity's mail
+      address. Therefore, most users should leave this entry empty.
+      If you want to force using a specific secret key for
+      cryptographic signatures, enter the key id here. You can get
+      the key id by running the command
+      <cmd>gpg --list-secret-keys</cmd>.</p>
+    </item>
+  </terms>
+  <note>
+    <p>These security options are available only if <app>Balsa</app> is
+    built with
+    <app>GnuPG</app> support.</p>
+  </note>
+</page>
diff --git a/doc/es/index.page b/doc/es/index.page
new file mode 100644
index 0000000..1517a74
--- /dev/null
+++ b/doc/es/index.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="index" xml:lang="es">
+  <title><app>Balsa</app> User's Guide</title>
+  <info>
+    <link type="next" xref="introduction"/>
+    <credit type="maintainer">
+      <name>Pawel Salek</name>
+    </credit>
+    <credit type="copyright">
+      <name>Stuart Parmenter y otros, consulte AUTHORS para una lista de la gente</name>
+      <years>1997-2013</years>
+    </credit>
+    <license>
+      <p>Se otorga permiso para hacer y distribuir copias literales de este manual siempre que se adjunten 
en todas las copias la nota de derechos de autor y esta nota de permiso.</p>
+      <p>Se concede permiso para copiar y distribuir versiones modificadas de este manual bajo las 
condiciones de copia verbatim, asintiendo que el trabajo total derivado de éste se distribuya bajo los 
términos de una nota de permiso idéntica a ésta.</p>
+      <p>Se concede permiso para copiar y distribuir traducciones de este manual en cualquier otro idioma, 
bajo las siguientes condiciones para las versiones modificadas, excepto si esta nota de permiso aparece en 
una traducción aprobada por la Free Software Foundation.</p>
+      <p>UNIX es una marca registrada de X/Open Group.</p>
+      <p>Linux es una marca registrada de Linus Torvalds.</p>
+      <p>X Window System es una marca registrada de X Consortium, Inc.</p>
+      <p>Windows es una marca registrada de Microsoft Corp.</p>
+      <p>Macintosh y Apple son marcas registradas de Apple Computer, Inc.</p>
+      <p>El resto de marcas registradas son propiedad de sus respectivos propietarios.</p>
+    </license>
+  </info>
+  <p><app>Balsa</app> is a graphical mail client. While it is in active
+  development, <app>Balsa</app> has many features such as: <link xref="glossary#imap">IMAP</link>
+  and <link xref="glossary#pop">POP3</link> support; sendmail or direct <link 
xref="glossary#smtp">SMTP</link> support;
+  optional multi-threaded retrieval and sending of messages;
+  support for all configurations of local mail folders; automatic
+  mail checking; mail printing; inline attachment viewing; and the
+  proverbial much, much more.</p>
+  <p>This document will introduce a person who understands mail to
+  using <app>Balsa</app>. However, it will not explain email to a
+  confused individual. If you're looking for that, try asking a
+  friend or visiting the
+  <link href="http://www.cs.queensu.ca/FAQs/email/"; type="http">
+  Email FAQ</link>.</p>
+</page>
diff --git a/doc/es/introduction.page b/doc/es/introduction.page
new file mode 100644
index 0000000..08d3e7d
--- /dev/null
+++ b/doc/es/introduction.page
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="introduction" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="next" xref="getting-started"/>
+  </info>
+  <title>Introducción</title>
+  <media src="figures/balsa_logo.png" format="PNG" srccredit="tigert"/>
+  <p><app>Balsa</app> is a graphical mail client. It supports the
+  standard features of any good reader and has new features added
+  continually. See the abstract above for a quick feature
+  rundown.</p>
+  <p><app>Balsa</app> is written using GTK+ and GNOME. Originally based
+  on libmutt, the back end code to <app>Mutt</app>, <app>Balsa</app> now uses
+  a combination of GMime for handling Mime messages, and its own
+  drivers for local and remote mailstores.</p>
+  <p>If you want to learn more about <app>Balsa</app>, your best bet is
+  the mailing list
+  <code>balsa-list gnome org</code>, to which you can subscribe by
+  going to the website
+  <link href="http://mail.gnome.org/mailman/listinfo/balsa-list";>
+  http://mail.gnome.org/mailman/listinfo/balsa-list</link> or by
+  sending a message with a subject of
+  <em>subscribe</em> to
+  <link href="mailto:balsa-list-request gnome org?subject=Subscribe">
+  balsa-list-request gnome org</link>. Bugs can be reported via
+  <app>bug-buddy</app> or to the
+  <link href="http://bugzilla.gnome.org/enter_bug.cgi?product=balsa";>
+  Gnome bug tool</link>.</p>
+</page>
diff --git a/doc/es/its-not-working.page b/doc/es/its-not-working.page
new file mode 100644
index 0000000..d1412fe
--- /dev/null
+++ b/doc/es/its-not-working.page
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="its-not-working" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>It's not Working!!!</title>
+  <p>This is a FAQ for when <app>Balsa</app> appears to lock up, or
+  other things that you think should be happening aren't. If you
+  can't figure out how to do something but <app>Balsa</app> lets you do
+  it, that's a bug. Report it.</p>
+  <list>
+    <item>
+      <p>
+        <link xref="its-not-working#main-to-imap">i
+        I want one of the main
+        folders to be IMAP</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#frozen">
+        <app>Balsa</app>'s frozen!</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#spooky-win">
+        What's that window that flashed
+        on the screen?</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#address-book">
+        The address book doesn't
+        import my addresses.</link>
+      </p>
+    </item>
+  </list>
+  <section id="main-to-imap">
+    <title>I want a basic mailbox to use IMAP</title>
+    <p>See
+    <link xref="common-tasks#ct-main-folder-imap">this section</link>.</p>
+  </section>
+  <section id="frozen">
+    <title><app>Balsa</app>'s frozen!</title>
+    <p>Odds are it isn't. Watch out for:</p>
+    <list>
+      <item>
+        <p>If you don't have threading, <app>Balsa</app> will stop
+        responding when it sends and receives email. Use threading,
+        if possible.</p>
+      </item>
+      <item>
+        <p><app>Balsa</app> is downloading a new message or closing a
+        large mailbox. This could take a while, especially when
+        this file is accessed via NFS.</p>
+      </item>
+      <item>
+        <p>A dialog box is being displayed but it is obscured by
+        another one. This seems to happen under Sawfish. Try moving
+        the windows around and see if there's a hidden dialog
+        somewhere.</p>
+      </item>
+    </list>
+  </section>
+  <section id="spooky-win">
+    <title>What's that window that flashed on the screen?</title>
+    <p>Were you checking your mail? Probably. This is the window
+    that displays progress for retrieving <link xref="glossary#pop">POP3</link> mail. If you
+    don't have any <link xref="glossary#pop">POP3</link> accounts, it will still appear -- but
+    it'll disappear almost instantly. You can disable displaying
+    this window in preferences.</p>
+  </section>
+  <section id="address-book">
+    <title>The address book doesn't import my addresses.</title>
+    <p><app>Balsa</app> attempts to open the file
+    <file>~/.gnome/GnomeCard.gcrd</file>. If you're not using this
+    file, you may need to create a symlink so that <app>Balsa</app> can
+    open it.</p>
+    <p>There have been slight changes in <app>GnomeCard</app>'s file
+    format between its various versions. <app>Balsa</app> is known to
+    work with at least <app>GnomeCard</app> version 1.0.10 and probably
+    most other releases.</p>
+  </section>
+</page>
diff --git a/doc/es/mbox-formats.page b/doc/es/mbox-formats.page
new file mode 100644
index 0000000..f7a932b
--- /dev/null
+++ b/doc/es/mbox-formats.page
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="mbox-formats" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Available Mailbox Formats</title>
+  <p><app>Balsa</app> handles several mailbox formats, including mbox.
+  Further information can be found in the following documents:</p>
+  <terms>
+    <item>
+      <title>Benchmarking mbox versus maildir</title>
+      <p>
+        <link href="http://www.courier-mta.org/mbox-vs-maildir/";>
+        http://www.courier-mta.org/mbox-vs-maildir/</link>
+      </p>
+    </item>
+    <item>
+      <title>Mailbox Format Characteristics</title>
+      <p>
+        <link href="http://www.washington.edu/imap/documentation/formats.txt.html";>
+        http://www.washington.edu/imap/documentation/formats.txt.html</link>
+      </p>
+    </item>
+    <item>
+      <title>Maildir format</title>
+      <p>maildir(5) manual page (from qmail):
+      <link href="http://www.qmail.org/qmail-manual-html/man5/maildir.html";>
+      http://www.qmail.org/qmail-manual-html/man5/maildir.html</link></p>
+    </item>
+    <item>
+      <title>Using Maildir format</title>
+      <p>
+        <link href="http://cr.yp.to/proto/maildir.html";>
+        http://cr.yp.to/proto/maildir.html</link>
+      </p>
+    </item>
+    <item>
+      <title>QMail</title>
+      <p>mbox(5) manual page (from qmail):
+      <link href="http://www.qmail.org/qmail-manual-html/man5/mbox.html";>
+      http://www.qmail.org/qmail-manual-html/man5/mbox.html</link></p>
+    </item>
+    <item>
+      <title>Mailbox formats</title>
+      <p>(From Mail-Administrator HOWTO):
+      <link href="http://linuxdocs.org/HOWTOs/Mail-Administrator-HOWTO-3.html#ss3.5";>
+      http://linuxdocs.org/HOWTOs/Mail-Administrator-HOWTO-3.html#ss3.5</link></p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/es/preferences-address-books.page b/doc/es/preferences-address-books.page
new file mode 100644
index 0000000..b1c8994
--- /dev/null
+++ b/doc/es/preferences-address-books.page
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-address-books" xml:lang="es">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Address Book Preferences</title>
+  <p><app>Balsa</app> supports the use of multiple address books, both
+  local
+  <link xref="glossary#vcard">VCARD</link> and remote <link xref="glossary#ldap">LDAP</link>
+  address books, both of which can be configured here.
+  <app>GnomeCard</app> also uses VCARD address books, so this allows
+  <app>Balsa</app> to share address books with other GNOME
+  applications.</p>
+  <p><app>Balsa</app> also supports LDIF address books, and can be built
+  to use GPE address books, when SQLite is available, and Rubrica
+  address books. Which types are supported depends on how
+  <app>Balsa</app> was built.</p>
+  <p>The main portion of the preferences page is occupied by the
+  list of current address books for <app>Balsa</app>. The list shows the
+  type of address book, the name, and whether it is included in
+  automatic alias expansion when typing new messages. There are
+  also several buttons that manipulate the list of address
+  books:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Add</gui>
+      </title>
+      <p>Using this adds a new address book for <app>Balsa</app> to use
+      to find addresses. If you click it, a drop-down menu of the
+      supported address book types is shown. Click one to begin the
+      process. <app>Balsa</app> pops up a dialog, which, if you choose
+      VCARD, looks like this:</p>
+      <figure>
+        <title>VCARD Address Book Dialog</title>
+        <media type="image" src="figures/address-book-vcard.png"/>
+      </figure>
+      <p>With <link xref="glossary#ldap">LDAP</link> support, the dialog looks somewhat
+      different, offering options to set the location of the
+      directory instead of a file.</p>
+      <figure>
+        <title><link xref="glossary#ldap">LDAP</link> Address Book Dialog</title>
+        <media type="image" src="figures/address-book-ldap.png"/>
+      </figure>
+      <p>In order to use a LDAP address book, you need to know the
+      host name of the LDAP server. Depending on the server
+      configuration, you may need also so called Base Domain Name
+      which identifies your particular department. You can always
+      try leaving Base Domain Name field empty and a default value
+      will be used (OpenLDAP stores the default Base Domain Name in
+
+      <file>/etc/openldap/ldap.conf</file>). If this does not work,
+      you may need to ask your administrator for the value of this.
+      The usual values are usually similar to:
+      "dc=theochem,dc=KTH,dc=se" or "o=Theoretical Chemistry,
+      c=SE".</p>
+    </item>
+    <item>
+      <title>
+        <gui>Modify</gui>
+      </title>
+      <p>This enables you to change the properties of the selected
+      address book.</p>
+      <figure>
+        <title>Modify an Address Book</title>
+        <media type="image" src="figures/address-book-modify.png"/>
+      </figure>
+      <p>It is possible to modify both the name and location for
+      any address book. Also, you can change whether the contents
+      of the address book will be used when attempting to
+      auto-complete an address when sending a message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Delete</gui>
+      </title>
+      <p>Delete the selected address book.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Set as Default</gui>
+      </title>
+      <p>Set the selected address book as default.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/es/preferences-display-options.page b/doc/es/preferences-display-options.page
new file mode 100644
index 0000000..a2aa3b4
--- /dev/null
+++ b/doc/es/preferences-display-options.page
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-display-options" xml:lang="es">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Display Preferences</title>
+  <p>This page controls how <app>Balsa</app> appears to you.</p>
+  <section>
+    <title>Ventana principal</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Use Preview Pane</gui>
+        </title>
+        <p>Set whether to use the preview pane to display messages,
+        or rely on the separate mail viewing window.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Show Mailbox Info</gui>
+        </title>
+        <p>This will allow the number of total and unread messages
+        for each mailbox to be shown in the left pane of the
+        <app>Balsa</app> main window. You can save space by not showing
+        them; if you choose not to show them, <app>Balsa</app> will then
+        show the number of unread messages (in parentheses) after
+        the mailbox name.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Alternative Layout</gui>
+        </title>
+        <p><app>Balsa</app>'s default layout has a full-height mailbox
+        list on the left, and the message list above the preview
+        pane on the right. You can choose an alternative layout, in
+        which the mailbox list and the message list occupy the
+        upper part of the window, and the preview pane is
+        full-width below them.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatic View</gui>
+        </title>
+        <p>Select this option if you want <app>Balsa</app> to open the
+        first unread message when you open a mailbox. If no message
+        is unread, <app>Balsa</app> opens the most recent message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Page Up and Page Down</gui>
+        </title>
+        <p>By default, the 
+        <key>Page Up</key>and 
+        <key>Page Down</key>keys scroll the message by whole pages.
+        Use this option to choose a different amount.</p>
+      </item>
+    </terms>
+  </section>
+  <section>
+    <title>Ventana Mensaje</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Moving a Message</gui>
+        </title>
+        <p>If you are reading a message in its own message window
+        and you move it (to the trash, or another mailbox),
+        <app>Balsa</app> can move on the next unread message or the next
+        message in the same mailbox, or simply close the
+        window.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="sort-and-thread">
+    <title>Sort and Thread</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Default sort column</gui>
+        </title>
+        <p>Choose the column by which you would like a new mailbox
+        to be sorted.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Default threading style</gui>
+        </title>
+        <p>Choose the default threading style for a new
+        mailbox.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Expand threads</gui>
+        </title>
+        <p>If you choose a threaded view of a mailbox, you can
+        decide whether the threads should be expanded or collapsed
+        when the mailbox is opened.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="message">
+    <title>Mensaje</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Fonts</gui>
+        </title>
+        <p>Choose the fonts that you want to be used to display a
+        message. You can choose a distinct font for the message's
+        subject line.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Quoted Text Regular Expression</gui>
+        </title>
+        <p>The entry box allows you to set a
+        <link xref="glossary#regular-expression">regular
+        expression</link>you would like to use to identify text
+        that should be considered quoted for incoming messages. The
+        regular expression should match the beginning of line of
+        quoted text a single level deep, the program will then use
+        this to calculate the depth of quoting and alter the quoted
+        text colors appropriately. A default regexp is provided
+        that should work in most situations.</p>
+        <p>This regexp affects both highlighting and spell
+        checking, and uses the extended regular expression set. For
+        more information see the
+        <cmd>grep</cmd>(1) manual or info page.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Alternative Parts</gui>
+        </title>
+        <p>You can choose whether <app>Balsa</app> should show a
+        text/plain part or a text/html part, when a message
+        contains both.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="colors">
+    <title>Colores</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Message Colors</gui>
+        </title>
+        <p>Choose the colors for quoted text.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Link Color</gui>
+        </title>
+        <p><app>Balsa</app> uses this color to highlight a hyperlink in
+        a message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Composition Window</gui>
+        </title>
+        <p>When you are composing a message, <app>Balsa</app> uses color
+        to show when one of the address fields is incomplete.
+        Choose that color here.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="format">
+    <title>Formato</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Date Encoding</gui>
+        </title>
+        <p>Set the format used to display dates in <app>Balsa</app>.
+        This uses the same format string as 
+        <code>strftime</code>, a summary which is provided
+        below:</p>
+        <list>
+          <item>
+            <p>
+            <code>%a</code>-- The abbreviated weekday
+            name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%A</code>-- The full weekday name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%b</code>-- The abbreviated month name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%B</code>-- The full month name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%d</code>-- The day of the month.</p>
+          </item>
+          <item>
+            <p>
+            <code>%R</code>-- The time using a 24-hour clock.
+            (HH:MM)</p>
+          </item>
+          <item>
+            <p>
+            <code>%r</code>-- The time using a 12-hour clock
+            (HH:MM AM/PM).</p>
+          </item>
+          <item>
+            <p>
+            <code>%T</code>-- The time using a 24-hour clock,
+            with seconds (HH:MM:SS).</p>
+          </item>
+        </list>
+        <note>
+          <p>See the 
+          <code>strftime</code>manual page for a full listing of
+          conversion specifiers.</p>
+        </note>
+      </item>
+      <item>
+        <title>
+          <gui>Selected Headers</gui>
+        </title>
+        <p>A space-separated list of the headers to display in the
+        message window.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Fallback codeset</gui>
+        </title>
+        <p>Some messages contain national characters without
+        specifying how they are encoded. You can choose whether
+        <app>Balsa</app> displays such characters as '?', or tries a
+        specific character set to display such messages.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="status-messages">
+    <title>Status Messages</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Information Messages</gui>
+        </title>
+        <p><app>Balsa</app> gives you information in the form of five
+        different levels of messages. You can specify how you want
+        all five levels to be presented to you.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display Progress</gui>
+        </title>
+        <p>This sets the behaviour of the dialog that is shown when
+        <app>Balsa</app> retrieves messages from it's specified
+        <link xref="glossary#pop">POP3</link> servers. The dialog can be shown only while the
+        messages are being retrieved, automatically closing after
+        <app>Balsa</app> is finished. Or it can be set to stay active
+        until manually closed. Finally, the dialog can not be
+        displayed at all.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/es/preferences-incoming-and-outgoing-mail.page 
b/doc/es/preferences-incoming-and-outgoing-mail.page
new file mode 100644
index 0000000..1c409ce
--- /dev/null
+++ b/doc/es/preferences-incoming-and-outgoing-mail.page
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.ent">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-incoming-and-outgoing-mail" 
xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Incoming and Outgoing Mail Preferences</title>
+  <p>Use this page to set the <app>Balsa</app>'s behaviour regarding
+  incoming and outgoing messages.</p>
+  <section id="incoming">
+    <title>Entrante</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Check Mail Automatically</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will connect to your <link xref="glossary#pop">POP3</link>
+        servers at the given interval and check for mail.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check IMAP mailboxes</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will include your IMAP
+        mailboxes when checking for mail. You can also specify that
+        INBOX is the only mailbox to be checked.</p>
+        <p>Checking IMAP mailboxes can take some time; these
+        options give you extra control over how long the mailbox
+        check will take.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display message if new mail has arrived</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will alert you when mail has
+        arrived.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Do background check quietly</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will give you no indication
+        that a background mail check is in progress.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Wrap Incoming Text</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will wrap text of incoming
+        messages at the specified line length.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reflow messages of type
+          `text/plain;format=flowed'</gui>
+        </title>
+        <p>The `format' parameter distinguishes two ways of
+        representing paragraphs in messages of type `text/plain'
+        (that is, simple text). The value `flowed' indicates that
+        paragraphs have been broken into lines ended with `soft'
+        line breaks: a space is left at the end of the line. A
+        `hard' line break (one that is not preceded by a space)
+        indicates the end of a paragraph.</p>
+        <p><app>Balsa</app> can reflow the paragraphs, quoted or
+        otherwise, in a message of this type. Reflowing eliminates
+        the line fragments that are left when text is first wrapped
+        at one length and then rewrapped to a shorter length, which
+        are often misquoted.</p>
+        <p>The only other value of `format' is `fixed', which is
+        the value assumed by default when `format' is not
+        specified, as with older mailers. In this case, all line
+        breaks must be respected. If you do not select the
+        `Reflow...' option, <app>Balsa</app> will treat all messages of
+        type `text/plain' as if they were `format=fixed'. Long
+        lines will still be wrapped, if the `Wrap Incoming
+        Messages' option is selected, but this will usually leave
+        unquoted line fragments.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Message Disposition Notification request</gui>
+        </title>
+        <p>You will sometimes receive a message whose sender has
+        asked for notification that you have received or seen the
+        message. You can specify how <app>Balsa</app> responds to these
+        requests.</p>
+      </item>
+    </terms>
+  </section>
+  <!-- ################################################################# -->
+  <!--             SUBSECTION: PREFERENCES/MAIL OPTIONS/OUTGOING         -->
+  <!-- ################################################################# -->
+  <section id="outgoing">
+    <title>Saliente</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Wrap Outgoing Text</gui>
+        </title>
+        <p>Have <app>Balsa</app> wrap all outgoing mail at the specified
+        column.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply prefix</gui>
+        </title>
+        <p>The string that <app>Balsa</app> should use as a prefix when
+        quoting a message. Note: When you send a message with 
+        <gui>format=flowed</gui>, <app>Balsa</app> is required to use
+        the one-character string "&gt;".</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatically quote original when replying</gui>
+        </title>
+        <p>Have <app>Balsa</app> include the text of a message in the
+        reply. The text will be prefixed as shown above.</p>
+        <p>You can instead include the original message using an
+        option on the `Edit' menu, or by dragging the message from
+        the message index into the text area of the reply. If you
+        prefer to include text this way, do not select the
+        `Automatically quote...' option.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Don't include HTML parts as text when replying or
+          forwarding mail</gui>
+        </title>
+        <p>Tell <app>Balsa</app> to be sensible.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Forward a mail as attachment instead of quoting
+          it</gui>
+        </title>
+        <p>If this option is selected, messages that are
+        `Automatically quoted' will actually be attached
+        unmodified, instead of included in the text of the reply,
+        prefixed by the reply string.</p>
+        <p>You can also attach any message to a new message by
+        dragging it from the message index into the attachment area
+        of the new message (or, in fact, any part of the new
+        message window except the text area or the address
+        lines).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Send button always queues outgoing mail in
+          outbox</gui>
+        </title>
+        <p>This option gives you control over when <app>Balsa</app>
+        connects to a server to send messages.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Copy outgoing messages to sentbox</gui>
+        </title>
+        <p>Have <app>Balsa</app> save a copy of each message you send in
+        the mailbox marked as the `Sentbox'.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Encoding</gui>
+        </title>
+        <p>Set the character encoding method to either 7 bit, 8
+        bit, or what the quoted message is using.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/es/preferences-mail-options.page b/doc/es/preferences-mail-options.page
new file mode 100644
index 0000000..0c4dccc
--- /dev/null
+++ b/doc/es/preferences-mail-options.page
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-mail-options" xml:lang="es">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Mail Server Preferences</title>
+  <p>This page lets you specify how you get POP3 mail, send mail,
+  etc.</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Remote Mailbox Servers</gui>
+      </title>
+      <p>These are <link xref="glossary#imap">IMAP</link> and <link xref="glossary#pop">POP3</link> servers 
that you
+      receive email from. The three buttons let you create, modify,
+      and remove records. <link xref="glossary#pop">POP3</link> mailboxes will not show up in
+      the mailbox list. You can specify multiple servers, when
+      adding a server you will be asked to give:</p>
+      <list>
+        <item>
+          <p>mailbox name that will identify the mailbox</p>
+        </item>
+        <item>
+          <p>The server you have the POP mailbox on.</p>
+        </item>
+        <item>
+          <p>The port that will be used to connect to the server.
+          The port number is usually 110 but you may change it if
+          you for example use some kind of connection
+          tunneling,</p>
+        </item>
+        <item>
+          <p>The user name on the mailbox server.</p>
+        </item>
+        <item>
+          <p>Corresponding password.</p>
+        </item>
+        <item>
+          <p>You can select the 'delete from server' button to
+          remove the downoladed messages from the server.</p>
+        </item>
+        <item>
+          <p>You can choose to have messages filtered through
+          <app>procmail</app> .</p>
+        </item>
+        <item>
+          <p>The
+          <app>procmail</app> command.</p>
+        </item>
+        <item>
+          <p>Whether to check for new mail.</p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <title>
+        <gui>Local Mail Directory</gui>
+      </title>
+      <p>This is the directory that <app>Balsa</app> will scan looking
+      for mail folders.</p>
+    </item>
+    <item>
+      <title id="smtp-server-config">
+        <gui>Outgoing Mail Servers</gui>
+      </title>
+      <p>Most users will need only one outgoing mail server, but
+      you may need to use more than one. <app>Balsa</app> allows you to
+      set up as many as you need. The server used for a particular
+      message is controlled by the
+      <link xref="identities">identity</link> you choose for the
+      message.</p>
+      <p>To view or change the details of a server, select it and
+      click
+      <gui>Modify</gui> . To create a new server, click
+      <gui>Add</gui> . A dialog will open, showing the properties of
+      the selected server. Specify the domain name and optionally
+      the port for of the SMTP server you use for submitting mail.
+      Please note that the default port number is 587. The syntax
+      is hostname[:port]. Port can be a decimal number or the name
+      of the service as specified in
+      <file>/etc/services</file> . Typically you can just set this
+      to "localhost:smtp". <app>Balsa</app> can also break up a large
+      message into fragments, which can be reassembled by
+      <app>Balsa</app> or any RFC 2046-compliant mailer. This dialog
+      allows you to set this option, and the size above which a
+      message should be split.</p>
+      <p>You will be asked to give:</p>
+      <list>
+        <item>
+          <p>A descriptive name that will identify the server</p>
+        </item>
+        <item>
+          <p>The domain name and port</p>
+        </item>
+        <item>
+          <p>The user name on the SMTP server. If the remote SMTP
+          server requires authentication, enter your user name
+          here. Note that the exact format depends on the MTA in
+          use. For example, some systems expect a user name, others
+          may require an email address.</p>
+        </item>
+        <item>
+          <p>Corresponding pass phrase. If the remote SMTP server
+          requires authentication, enter your pass phrase here.
+          Some systems refer to the pass phrase as a password.
+          Limitations on the length of the pass phrase depend on
+          the SMTP server.</p>
+        </item>
+        <item>
+          <p>When you want <app>Balsa</app> to use TLS.</p>
+        </item>
+        <item>
+          <p>The TLS certificate pass phrase.</p>
+        </item>
+        <item>
+          <p>Whether to split large messages, and the threshhold
+          size.</p>
+        </item>
+      </list>
+    </item>
+  </terms>
+  <section id="incoming">
+    <title>Entrante</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Check Mail Automatically</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will connect to your <link xref="glossary#pop">POP3</link>
+        servers at the given interval and check for mail.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check IMAP mailboxes</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will include your IMAP
+        mailboxes when checking for mail. You can also specify that
+        INBOX is the only mailbox to be checked.</p>
+        <p>Checking IMAP mailboxes can take some time; these
+        options give you extra control over how long the mailbox
+        check will take.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display message if new mail has arrived</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will alert you when mail has
+        arrived.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Do background check quietly</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will give you no indication
+        that a background mail check is in progress.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Wrap Incoming Text</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will wrap text of incoming
+        messages at the specified line length.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reflow messages of type
+          `text/plain;format=flowed'</gui>
+        </title>
+        <p>The `format' parameter distinguishes two ways of
+        representing paragraphs in messages of type `text/plain'
+        (that is, simple text). The value `flowed' indicates that
+        paragraphs have been broken into lines ended with `soft'
+        line breaks: a space is left at the end of the line. A
+        `hard' line break (one that is not preceded by a space)
+        indicates the end of a paragraph.</p>
+        <p><app>Balsa</app> can reflow the paragraphs, quoted or
+        otherwise, in a message of this type. Reflowing eliminates
+        the line fragments that are left when text is first wrapped
+        at one length and then rewrapped to a shorter length, which
+        are often misquoted.</p>
+        <p>The only other value of `format' is `fixed', which is
+        the value assumed by default when `format' is not
+        specified, as with older mailers. In this case, all line
+        breaks must be respected. If you do not select the
+        `Reflow...' option, <app>Balsa</app> will treat all messages of
+        type `text/plain' as if they were `format=fixed'. Long
+        lines will still be wrapped, if the `Wrap Incoming
+        Messages' option is selected, but this will usually leave
+        unquoted line fragments.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Message Disposition Notification request</gui>
+        </title>
+        <p>You will sometimes receive a message whose sender has
+        asked for notification that you have received or seen the
+        message. You can specify how <app>Balsa</app> responds to these
+        requests.</p>
+      </item>
+    </terms>
+  </section>
+  <!-- ################################################################# -->
+  <!--             SUBSECTION: PREFERENCES/MAIL OPTIONS/OUTGOING         -->
+  <!-- ################################################################# -->
+  <section id="outgoing">
+    <title>Saliente</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Wrap Outgoing Text</gui>
+        </title>
+        <p>Have <app>Balsa</app> wrap all outgoing mail at the specified
+        column.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply prefix</gui>
+        </title>
+        <p>The string that <app>Balsa</app> should use as a prefix when
+        quoting a message. Note: When you send a message with 
+        <gui>format=flowed</gui>, <app>Balsa</app> is required to use
+        the one-character string "&gt;".</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatically quote original when replying</gui>
+        </title>
+        <p>Have <app>Balsa</app> include the text of a message in the
+        reply. The text will be prefixed as shown above.</p>
+        <p>You can instead include the original message using an
+        option on the `Edit' menu, or by dragging the message from
+        the message index into the text area of the reply. If you
+        prefer to include text this way, do not select the
+        `Automatically quote...' option.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Don't include HTML parts as text when replying or
+          forwarding mail</gui>
+        </title>
+        <p>Tell <app>Balsa</app> to be sensible.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Forward a mail as attachment instead of quoting
+          it</gui>
+        </title>
+        <p>If this option is selected, messages that are
+        `Automatically quoted' will actually be attached
+        unmodified, instead of included in the text of the reply,
+        prefixed by the reply string.</p>
+        <p>You can also attach any message to a new message by
+        dragging it from the message index into the attachment area
+        of the new message (or, in fact, any part of the new
+        message window except the text area or the address
+        lines).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Send button always queues outgoing mail in
+          outbox</gui>
+        </title>
+        <p>This option gives you control over when <app>Balsa</app>
+        connects to a server to send messages.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Copy outgoing messages to sentbox</gui>
+        </title>
+        <p>Have <app>Balsa</app> save a copy of each message you send in
+        the mailbox marked as the `Sentbox'.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Encoding</gui>
+        </title>
+        <p>Set the character encoding method to either 7 bit, 8
+        bit, or what the quoted message is using.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/es/preferences-miscellaneous.page b/doc/es/preferences-miscellaneous.page
new file mode 100644
index 0000000..66795ca
--- /dev/null
+++ b/doc/es/preferences-miscellaneous.page
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-miscellaneous" xml:lang="es">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Miscellaneous Preferences</title>
+  <terms>
+    <item>
+      <title>
+        <gui>Debug</gui>
+      </title>
+      <p>Toggle the output of debugging information. Depending on
+      what notification priority set for it in the
+      <link xref="preferences-display-options">
+      Display</link> page, it can show up in list or dialog as the
+      program runs.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Empty Trash on Exit</gui>
+      </title>
+      <p>Set <app>Balsa</app> to delete all messages in the
+      <code>Trash</code> mailbox when <app>Balsa</app> exits.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Automatically close mailbox</gui>
+      </title>
+      <p>Set <app>Balsa</app> to close any mailbox that is unused for
+      more than the specified time. The currently displayed mailbox
+      is never automatically closed.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Hide messages marked as deleted</gui>
+      </title>
+      <p>When a message is moved to another mailbox, including the
+      <code>Trash</code> mailbox, it is actually copied to the
+      destination, and the original is marked as deleted. Deleted
+      messages may either be shown in the mailbox index, with the
+      trashcan icon indicating that they are deleted, or hidden.
+      This item controls which of those actions is taken.</p>
+      <p>A message may also be simply marked as deleted, without
+      copying it to another mailbox:
+      <guiseq>
+        <gui>Message</gui>
+        <gui>Toggle flag</gui>
+        <gui>Deleted</gui>
+      </guiseq>. Again, this item controls whether such a message
+      is hidden.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Expunge deleted messages on close</gui>
+      </title>
+      <p>"Expunging" is the act of physically removing from the
+      backing mailstore all messages marked as deleted. You can
+      expunge messages manually:
+      <guiseq>
+        <gui>Mailbox</gui>
+        <gui>Expunge deleted messages</gui>
+      </guiseq>, or you can set <app>Balsa</app> to expunge deleted
+      messages when the mailbox is closed (all mailboxes are closed
+      when you exit <app>Balsa</app>).</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/es/preferences-spelling.page b/doc/es/preferences-spelling.page
new file mode 100644
index 0000000..b8b96fb
--- /dev/null
+++ b/doc/es/preferences-spelling.page
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.ent">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-spelling" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Spell Check Preferences</title>
+  <p>If <app>Balsa</app> is using GtkSpell, you can choose to have your
+  spelling checked as you type. <app>Balsa</app> uses GtkSpell's default
+  settings.</p>
+  <p>If <app>Balsa</app> is not using GtkSpell, you can use this pane to
+  setup <app>Balsa</app> spell check options. <app>Balsa</app> uses the
+  Portable Spell Checking library
+  (<link href="http://pspell.sourceforge.net";>pspell</link>) to
+  provide an interface to the spell checking program of your
+  choice. Currently there are modules for ispell or aspell, both of
+  which can be found at the pspell website. For more information
+  visit the <app>Balsa</app> homepage.</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Pspell Module</gui>
+      </title>
+      <p>The Pspell library allows you to use whatever spell
+      checking engine you prefer, though the use of loadable
+      modules. Currently Pspell has support for two modules, the
+      traditional ispell, and the newer and more advanced
+      aspell.</p>
+      <p>
+      <app>Ispell</app> is most likely available on your system as
+      it is a Unix standard; however
+      <app>Aspell</app> is more advanced as it uses an advanced
+      phonetics engine and adaptive techniques to learn how you
+      tend to misspell words. More information is available at the
+      <link href="http://aspell.sourceforge.net";>Aspell
+      website</link>.</p>
+      <p><app>Balsa</app> will attempt to use whatever module you
+      specify here, however if the module is not installed it will
+      not work and generate an error.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Suggestion Mode</gui>
+      </title>
+      <p>The suggestion mode determines how hard the computer will
+      search for suggestions for misspelled words. There are three
+      options:</p>
+      <terms>
+        <item>
+          <title>
+            <gui>Fast</gui>
+          </title>
+          <p>This mode quickly scans for replacements, which means
+          it might be used by a good speller who occasionally makes
+          typographical errors.</p>
+        </item>
+        <item>
+          <title>
+            <gui>Normal</gui>
+          </title>
+          <p>The Normal mode is probably good enough for most
+          people; it should produce the correct suggestion in the
+          majority of cases.</p>
+        </item>
+        <item>
+          <title>
+            <gui>Bad Spellers</gui>
+          </title>
+          <p>The Bad Spellers mode is the most thorough and
+          accurate mode; however, it also takes the longest to find
+          a list of suggestions.</p>
+        </item>
+      </terms>
+    </item>
+    <item>
+      <title>
+        <gui>Ignore Length</gui>
+      </title>
+      <p>This provides the ability to ignore words shorter than a
+      certain length. It may be useful to automatically skip short
+      acronyms that are normally flagged as incorrect.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/es/preferences-startup.page b/doc/es/preferences-startup.page
new file mode 100644
index 0000000..2598eb6
--- /dev/null
+++ b/doc/es/preferences-startup.page
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-startup" xml:lang="es">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Startup Preferences</title>
+  <terms>
+    <item>
+      <title>
+        <gui>Open Inbox upon Startup</gui>
+      </title>
+      <p>If set, <app>Balsa</app> will open your system inbox upon
+      startup.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Check Mail at Startup</gui>
+      </title>
+      <p>If set, <app>Balsa</app> will automatically attempt to download
+      mail from the <link xref="glossary#pop">POP3</link> mail server upon startup, and will
+      check for new mail on an <link xref="glossary#imap">IMAP</link> server.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Remember Open Mailboxes Between Sessions</gui>
+      </title>
+      <p>When marked, <app>Balsa</app> will remember and reopen
+      mailboxes that were open when <app>Balsa</app> was last quit.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Folder Scanning</gui>
+      </title>
+      <p>Scanning a folder tree can be time-consuming, because of
+      the need to explore an entire tree of subfolders. You can
+      defer scanning the tree by setting the scan depth to 1.
+      <app>Balsa</app> will then descend into the tree only far enough
+      to discover whether any folders that you can see have
+      subfolders. The first time you expand any subtree,
+      <app>Balsa</app> will explore more of the tree.</p>
+      <p>If you prefer to have the whole tree available from
+      startup, choose a depth as great as that of your folder tree.
+      Intermediate settings may also be used.</p>
+      <p>You may set the depth for initial scanning separately for
+      local and <link xref="glossary#imap">IMAP</link> trees.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/es/preferences.page b/doc/es/preferences.page
new file mode 100644
index 0000000..3184d91
--- /dev/null
+++ b/doc/es/preferences.page
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>La ventana de preferencias</title>
+
+<p>
+  <app>Balsa</app> has many more options than the initial assistant reveals.
+  To access the Preferences window, select
+  <guiseq>
+      <gui>Edit</gui> <gui>Preferences</gui>
+  </guiseq>.
+  In the Preferences window, options are organized into groups,
+  and related groups are shown on individual pages.
+  The pages and groups are explained below.
+</p>
+<!--
+<figure>
+  <title>Preferences Window</title>
+  <media type="image" src="figures/preferences-window.png"/>
+</figure>
+-->
+</page>
diff --git a/doc/es/toolbar-prefs.page b/doc/es/toolbar-prefs.page
new file mode 100644
index 0000000..bcfe941
--- /dev/null
+++ b/doc/es/toolbar-prefs.page
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="toolbar-prefs" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Customizing Toolbars</title>
+  <p><app>Balsa</app> allows you to change the layout of the toolbars on
+  the three main types of window: the
+  <link xref="win-main">main window</link>,
+  <link xref="win-message">message windows</link>, and
+  <link xref="win-composer">compose windows</link>. You open the
+  dialog with the
+  <guiseq>
+    <gui>Settings</gui>
+    <gui>Toolbars...</gui>
+  </guiseq> menu item.</p>
+  <p>The dialog contains a notebook with a page for each type of
+  window. On each page, you'll see a Preview of the toolbar, which
+  changes as you change the layout. The list of
+  <gui>Available buttons</gui> shows buttons that may be used on the
+  toolbar, but aren't currently used, and the
+  <gui>Current toolbar</gui> list shows the current layout,
+  including both buttons and separators. You can add buttons to the
+  current toolbar, remove them, or move them up or down in the
+  list, using the controls in the central button box.</p>
+  <p>Below the notebook is a checkbox for wrapping the button
+  labels (the text that may accompany the buttons). This option
+  applies to the toolbars on all three types of window. If you
+  choose wrapping, long labels will be shown on two lines.</p>
+  <p>This is an "instant apply" dialog: the changes you make take
+  effect immediately, as shown in the Preview toolbar. Below the
+  Preview toolbar you'll find a button that restores the standard
+  layout for that toolbar.</p>
+  <note>
+    <p>Note that the standard layout is the one that you see before
+    the toolbar has been customized. If you use this option, all
+    current <em>and past</em> changes will be undone.</p>
+  </note>
+  <p>A second button below the Preview toolbar pops up a menu that
+  gives you control over what is shown in the toolbar: icons, text,
+  or both. The popup (right click) menu for any actual toolbar
+  offers the same choices, as well as the option to open up this
+  dialog ("Customize Toolbars...").</p>
+</page>
diff --git a/doc/es/win-composer.page b/doc/es/win-composer.page
new file mode 100644
index 0000000..bd2e7b0
--- /dev/null
+++ b/doc/es/win-composer.page
@@ -0,0 +1,782 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-composer" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>The Message Composer</title>
+  <figure>
+    <title>Message Composition Window</title>
+    <media src="figures/newmsg-window.png" format="PNG"/>
+  </figure>
+  <p>When the
+  <gui>New Message</gui> or
+  <gui>Reply</gui> or
+  <gui>Forward</gui> action is selected, the message to be sent is
+  brought up in the Message Composer. This window is where you can
+  type the text of the message, attach files, and specify
+  recipients. The window also provides an interface to spell check
+  the message. Signing and encryption of messages using
+  <app>GnuPG</app> or
+  <app>PGP</app> are also supported, when <app>Balsa</app> is built with
+  cryptographic support.</p>
+  <p>When the message window first opens, you will see the several
+  main sections:</p>
+  <list>
+    <item>
+      <p>The menu bar</p>
+    </item>
+    <item>
+      <p>Barra de herramientas</p>
+    </item>
+    <item>
+      <p>Mail headers</p>
+    </item>
+    <item>
+      <p>The attachment box</p>
+    </item>
+    <item>
+      <p>The message body</p>
+    </item>
+  </list>
+  <p>These will each be covered in depth below:</p>
+  <section id="win-composer-menu">
+    <title>Barra de menú</title>
+    <p>This contains all of the available commands for acting on
+    the message, from selecting the headers to display to changing
+    the character set of the message. Some of the menu items are
+    not always available, depending on what state the message is
+    currently in.</p>
+    <terms>
+      <item>
+        <title>
+          <gui>File</gui>
+        </title>
+        <p>The file menu contains commands for manipulating the
+        message as a whole.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Include File...</gui>
+            </guiseq> -- Include a text file in the body of the
+            message; only works for plain text files.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Attach File...</gui>
+            </guiseq> -- Attach any kind of file to the
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Send</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Enter</key>
+            </keyseq> -- Send the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Queue</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Q</key>
+            </keyseq> -- Queue the message in the outbox for
+            sending later.</p>
+            <note>
+              <p>A message is considered valid (ready for sending
+              or queuing) if it contains at least one valid email
+              address, and no invalid addresses, in the
+              <gui>Recipients</gui> fields.</p>
+            </note>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Postpone</gui>
+            </guiseq> -- Save the message in the
+            <code>Draftbox</code> for later revision and sending,
+            and close the compose window. You will be unable to
+            postpone a message that is not currently valid.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Save</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>S</key>
+            </keyseq> -- Save the message in the
+            <code>Draftbox</code> and continue editing.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Page Setup</gui>
+            </guiseq> -- Set print options such as paper size
+            and print orientation.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Print...</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>P</key>
+            </keyseq> -- Print a hard-copy of the current
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Close</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>W</key>
+            </keyseq> -- Close and discard the current
+            message.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Edit</gui>
+        </title>
+        <p>The Edit menu contains commands which are used to modify
+        the body of the message.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Undo</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Z</key>
+            </keyseq> -- Undo the most recent editing
+            action.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Redo</gui>
+            </guiseq>
+            <keyseq>
+              <key>Shift</key>
+              <key>Ctrl</key>
+              <key>Z</key>
+            </keyseq> -- Redo an undone editing action.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Cut</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>X</key>
+            </keyseq> -- Cut the selected text to the
+            clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Copy</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>C</key>
+            </keyseq> -- Copy the selected text to the
+            clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Paste</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>V</key>
+            </keyseq> -- Paste the contents of the clipboard to
+            the current position of the cursor.</p>
+          </item>
+          <item>
+            <p>
+              <guiseq>
+                <gui>Edit</gui>
+                <gui>Select All</gui>
+              </guiseq>
+              <keyseq>
+                <key>Ctrl</key>
+                <key>A</key>
+              </keyseq>
+            </p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Wrap Body</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>B</key>
+            </keyseq> -- Cause all the lines in the message to
+            be wrapped to the specified outgoing mail wrap
+            column.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Reflow Paragraph</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>R</key>
+            </keyseq> -- Cause all selected lines to be wrapped
+            to the specified outgoing mail wrap column.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Check Spelling</gui>
+            </guiseq> -- Start spell checking the current
+            message.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Show</gui>
+        </title>
+        <p>The Show menu is used to control which headers are
+        displayed in the composer window for editing.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Toolbar</gui>
+            </guiseq> -- Show or hide the toolbar.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>From</gui>
+            </guiseq> -- Display the
+            <code>From</code> header.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Recipients</gui>
+            </guiseq> -- Display the
+            <code>To:</code> ,
+            <code>Cc:</code> , and
+            <code>Bcc:</code> addresses.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Reply To</gui>
+            </guiseq> -- Display the
+            <code>Reply-To</code> header.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Fcc</gui>
+            </guiseq> -- Display the
+            <code>Fcc</code> header; this is the folder to which
+            your copy of the sent message will be saved. The
+            default is your Sentbox.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Language</gui>
+        </title>
+        <p>The Language menu allows you to set the language to use
+        for composing and checking the spelling of the message.
+        Only languages for which you have dictionaries installed
+        are shown.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Options</gui>
+        </title>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Request Disposition Notification</gui>
+            </guiseq> -- If checked <app>Balsa</app> will include
+            the
+            <code>Disposition-Notification-To</code> header line
+            with your
+            <code>From</code> address. Please note that the handling
+            of this request depends on the receiving mail program
+            and that it not guaranteed that this notification will
+            be sent back.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Format = Flowed</gui>
+            </guiseq> -- The "Flowed" format (RFC 3676) breaks
+            the message text into paragraphs, which you type
+            continuously using the
+            <key>Enter</key> key only to mark the end of a
+            paragraph, and "fixed" lines which you mark
+            individually using the
+            <key>Enter</key> key. This allows other mailers that
+            recognize the format to display the text appropriately
+            for the width of the recipient's screen, and to quote
+            the text correctly when constructing a reply. The text
+            is also displayed intelligibly by a non-flowed-aware
+            mailer.</p>
+            <note>
+              <p>Using "Format=Flowed" is strongly recommended. It
+              helps to avert the "embarrassing line wrap" that you
+              see when quoted text is broken across lines and shown
+              with the wrong level of quoting.</p>
+            </note>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Send as plain text and HTML</gui>
+            </guiseq> -- <app>Balsa</app> can send and receive
+            messages in right-to-left languages such as Arabic,
+            Hebrew, and Persian, but some other agents such as
+            mailing lists may mangle them when translating into
+            HTML. If the "Send as plain text and HTML" option is
+            selected, <app>Balsa</app> will generate a correct HTML
+            message part that such agents will use instead.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Sign message</gui>
+            </guiseq> -- Cryptographically sign the message.
+            The recipients can check the signature to prove the
+            sender's (=your) identity or to detect any tampering
+            with the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Encrypt message</gui>
+            </guiseq> -- Encrypt the message. Only the intended
+            recipient(s) can decrypt and read the contents.</p>
+          </item>
+          <item>
+            <p>The following options determine the protocol used
+            for signing and/or encrypting the message. You should
+            choose the appropriate protocol which all recipients
+            can use.</p>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>GnuPG uses MIME mode</gui>
+                </guiseq> -- Sign and/or encrypt the complete
+                message, including all attachments, using the
+                PGP/MIME mode (RFC 3156). Note that the message
+                envelope (including the Subject) is not
+                protected.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>GnuPG uses old OpenPGP mode</gui>
+                </guiseq> -- Sign and/or encrypt only the
+                message text, but not attachments, using the
+                OpenPGP mode (RFC 2440). If you want to add any
+                attachments, sign and/or encrypt them manually
+                before adding.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>S/MIME mode (GpgSM)</gui>
+                </guiseq> -- Sign and/or encrypt the complete
+                message, including all attachments, using the
+                S/MIME mode (RFC 2633). Note that the message
+                envelope (including the Subject) is not
+                protected.</p>
+              </item>
+            </list>
+            <note>
+              <p>Cryptographic signatures and encryption are
+              available only when <app>Balsa</app> has been built with
+              <app>GnuPG</app> support. For a detailed description of
+              E-Mail cryptography, see the
+              <link href="http://www.gnupg.org/documentation/manuals/gnupg/"; type="http"> GnuPG 
Manual</link> and the
+              <link href="http://www.dewinter.com/gnupg_howto/english/GPGMiniHowto.html"; type="http"> GnuPG 
HOWTO</link> .</p>
+            </note>
+          </item>
+        </list>
+      </item>
+    </terms>
+  </section>
+  <section id="win-composer-toolbar">
+    <title>Barra de herramientas</title>
+    <p>The toolbar contains buttons for the most commonly used
+    functions when sending messages, including Send, Attach
+    File..., and Save. As with the menu bar, some buttons are
+    disabled if the message is not correctly setup to be sent.</p>
+    <figure>
+      <title>Barra de herramientas</title>
+      <media type="image" src="figures/newmsg-window-toolbar.png"/>
+    </figure>
+    <terms>
+      <item>
+        <title>
+          <gui>Send</gui>
+        </title>
+        <p>Send the current message. Only available if the message
+        is legal to be sent (i.e. proper email addresses). This
+        button may also be configured to queue the message in the
+        outbox to be sent later (see the
+        <link xref="preferences-outgoing">
+        Preferences</link> dialog).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Attach</gui>
+        </title>
+        <p>Open a dialog to attach a file to the current
+        message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Postpone</gui>
+        </title>
+        <p>Postpone the message to the Draftbox for later revision
+        and sending.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check Spelling</gui>
+        </title>
+        <p>Start a spell check on the current message. If
+        <app>Balsa</app> is built with support for
+        <app>GtkSpell</app> , your spelling is checked in place.
+        Otherwise, <app>Balsa</app> can use either
+        <app>ispell</app> or
+        <app>aspell</app> to do the spell checking. Settings for
+        this can be found in the
+        <link xref="preferences-spelling">
+        Preferences</link> dialog.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Print</gui>
+        </title>
+        <p>Print out the draft of the message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cancel</gui>
+        </title>
+        <p>Close the composition window without saving or sending
+        the message within.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="win-composer-headers">
+    <title>Cabeceras</title>
+    <p>The headers area is where the information regarding where
+    the message is being sent to and from, as well as comments and
+    keywords can be entered. All of the available headers are not
+    shown by default, but they can be turned on and off very
+    quickly using the menu.</p>
+    <terms>
+      <item>
+        <title>
+          <gui>From</gui>
+        </title>
+        <p>
+        <code>From</code> is used to indicate the origin of the
+        message, <app>Balsa</app> automatically fills this in for you if
+        you have entered your name and email address in the
+        <link xref="identities">identities</link> window.</p>
+      </item>
+      <item>
+        <title>
+          <gui>To</gui>
+        </title>
+        <p>The
+        <code>To</code> header is used to indicate the intended
+        recipient of the message; <app>Balsa</app> automatically fills
+        this in for you if you are replying to a message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Subject</gui>
+        </title>
+        <p>The
+        <code>Subject</code> header is used to summarize the topic
+        of the message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cc</gui>
+        </title>
+        <p>The "Carbon Copy" header. A comma separated list of
+        recipients other than the main recipient should go
+        here.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Bcc</gui>
+        </title>
+        <p>The
+        <code>Bcc</code> , or "Blind Carbon Copy" header. Similar to
+        the Cc header, except that email addresses placed in this
+        header will not appear as recipients to readers of the
+        message. Also known as a "silent" carbon copy.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Fcc</gui>
+        </title>
+        <p>The
+        <code>Fcc</code> header stands for "Folder Carbon Copy", and
+        it is used to specify any folders that you want the message
+        copied to after being sent. It is presented as a drop-down
+        combo box with a list of all available mailboxes, simply
+        select the destination.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply-To</gui>
+        </title>
+        <p>The
+        <code>Reply-To</code> header is for specifying what email
+        address you want any replies to go to.</p>
+      </item>
+    </terms>
+    <section id="specify-addresses">
+    <title>Specifying Addresses</title>
+    <p><app>Balsa</app> supports many different methods of selecting
+    email addresss. All of the headers that can contain addresses
+    have a small colored book to the left of them that will open up
+    <app>Balsa</app>'s address book.</p>
+    <p>However, <app>Balsa</app> will also attempt to guess what the
+    headers should contain depending on what context the
+    composition window is opened in, so it may not be neccessary to
+    fill them in most of the time.</p>
+    <note>
+      <p>Also, <app>Balsa</app> supports alias expansion. As you type a
+      name, <app>Balsa</app> will guess the e-mail address from all the
+      entries in the <app>GnomeCard</app> application. To enable this
+      feature, read the section on
+      <link xref="common-tasks#ct-alias-expansion">
+      Alias Expansion</link> . In
+      addtion, the composition window supports drag-and-drop of
+      addresses from the <app>GnomeCard</app> application.</p>
+    </note> &gt;</section>
+  </section>
+  <section id="win-composer-attachments">
+    <title>Adjuntos</title>
+    <figure>
+      <title>List of Attachments</title>
+      <media type="image" src="figures/newmsg-window-attachments.png"/>
+    </figure>
+    <p>Below the headers may be a large box displaying a list of
+    attachments; this view can be toggled in the
+    <gui>Show</gui> menu.</p>
+    <p>When there are attachments displayed, it is possible to
+    right-click on one of them to access an option menu.
+    <gui>Inline</gui> and
+    <gui>Attachment</gui> are mutually exclusive options that will
+    display to the recipient either the attachment inline with the
+    rest of the message, or separately as an attachment. Selecting
+    <gui>Reference</gui> will send a MIME external part reference (a
+    kind of link) in lieu of the actual file.
+    <gui>Remove</gui> , and any available
+    <gui>Open with</gui> options are also available.</p>
+  </section>
+  <section id="win-composer-body">
+    <title>Cuerpo del mensaje</title>
+    <p>Finally, below the attachment list is the main area of the
+    window where the text of the message is displayed. The text
+    editing capabilities are very basic, but it supports cut, copy,
+    and paste so it is possible to write a message in your favorite
+    editor and simply paste it in.</p>
+    <p>If the message is a reply or forward, the referenced message
+    will be displayed in the body text widget, with the prefix
+    specified in the
+    <link xref="preferences-outgoing">Preferences</link> dialog.</p>
+  </section>
+  <section id="win-composer-spellcheck">
+    <title>Corrector ortográfico</title>
+    <p>Once the spell check has been started, it will take a moment
+    to load the text and spell checking module, and then it will
+    automatically begin checking the message. If it finds any words
+    that are incorrect, the word will be highlighted and a panel
+    will be shown that offers a number of suggestions and available
+    courses of action.</p>
+    <figure>
+      <title>Spell Checking Panel</title>
+      <media type="image" src="figures/spell-check.png"/>
+    </figure>
+    <p>As shown above, the panel consists of a list of two panes,
+    one the left containing a list of suggestions and an entry box,
+    while the right contains several buttons to choose your action.
+    The list on the left is re-generated for each incorrect word,
+    with all the suggestions the spell check program comes up with.
+    You can choose what program you want to use through loadable
+    modules, selectable in the
+    <link xref="preferences-spelling">Preferences</link> dialog. The
+    entry box above the list is what will be used to replace the
+    current word, and usually reflects the current selection in the
+    list, but can be edited by hand if you wish to make manual
+    changes.</p>
+    <p>The buttons on the left control the actions to take for each
+    incorrect word. The buttons include:</p>
+    <terms>
+      <item>
+        <title>
+          <gui>Change</gui>
+        </title>
+        <p>Change the incorrect word with the currently selected
+        suggested word or the user's edited word.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Change All</gui>
+        </title>
+        <p>Change all occurances of the current incorrect word with
+        the currently selected suggestion.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Ignore</gui>
+        </title>
+        <p>Ignore the current incorrect word and continue to the
+        next one.</p>
+      </item>
+      <item>
+        <p>Ignore all occurrances of the current word, and continue
+        to the next incorrect word.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Learn</gui>
+        </title>
+        <p>Add the current incorrect word to your personal
+        dictionary. This will cause it to be considered correct for
+        all future spell checks.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Done</gui>
+        </title>
+        <p>Stop the spell check at the current point, keeping all
+        changes so far and returning to the normal message window
+        interface.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cancel</gui>
+        </title>
+        <p>Stop the spell check at the current point, reverting all
+        changes so far, including any words added to your personal
+        dictionary.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="addr-book-buttons">
+    <title>Libreta de direcciones</title>
+    <p>When composing a message, clicking on any of the colored
+    book icons next to a destination field (To, Cc, Bcc) will bring
+    up the <app>Balsa</app> address book. It helps you to select
+    recipients for your messages quickly and easily.</p>
+    <figure>
+      <title>Address Book Window</title>
+      <media type="image" src="figures/address-book.png"/>
+    </figure>
+    <p>The address book provides two panes, the one on the left
+    consisting of all available addresses, while the one on the
+    right contains the intended recipients of your message.
+    Addresses are added to the recipient list by selecting them in
+    the left pane and clicking the arrow button pointing to the
+    right, or by simply double-clicking on the address. This will
+    remove the address from the left pane, so they cannot be added
+    more than once. If you decide that you no longer want to send
+    the message to a particular address, simply select it in the
+    right-hand pane and click the left-arrow button, or
+    double-click it again, to move it back.</p>
+    <p>If, while selecting people to send your message to, you
+    decide to add someone new to the address book, it is a simple
+    matter to click on the
+    <gui>Run GnomeCard</gui> button. This will bring up the
+    <app>GnomeCard</app> application, allowing you to easily manipulate
+    your contact list. After any changes have been made using the
+    address book, they can be forced to show up in the left hand
+    pane by clicking on the
+    <gui>Re-Import</gui> button.</p>
+  </section>
+</page>
diff --git a/doc/es/win-filters.page b/doc/es/win-filters.page
new file mode 100644
index 0000000..b7739f0
--- /dev/null
+++ b/doc/es/win-filters.page
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-filters" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>The Filters Window</title>
+  <p>This window is divided in two parts: the left part is the list
+  of all filters. When you select one of them, the right part
+  displays its properties. The right part is a two-page notebook
+  (the
+  <link xref="win-filters#wf-match-page">match page</link>, and the
+  <link xref="win-filters#wf-action-page">action page</link>); their
+  descriptions follow.</p>
+  <p>There are two buttons under the filters list:
+  <list>
+    <item>
+      <p>The
+      <gui>New</gui> button: you click on it to create a new filter;
+      the filter is initially named "New Filter", and contains no
+      condition. Then you fill in the different fields in the
+      notebook pages (in particular remember to change the name of
+      the filter), add the conditions that will describe how this
+      filters matches a message, and to confirm the modifications
+      push the
+      <gui>Apply</gui> button on the right hand side of the Filters
+      window.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Remove</gui> button: removes the currently selected
+      filter.</p>
+    </item>
+  </list></p>
+  <section id="wf-match-page">
+    <title>The Match Page</title>
+    <p>Each filter is made of one or several conditions; each
+    condition represents a test to be applied to the messages. The
+    results of these tests is then combined following the type of
+    operation specified:
+    <list>
+      <item>
+        <p>AND: all condition tests must be true to make the
+        match.</p>
+      </item>
+      <item>
+        <p>OR: one condition test must be true to make the
+        match.</p>
+      </item>
+    </list></p>
+    <p>Then the page displays the name of the filter and the
+    conditions that describes how the filters matches a message.
+    The list displays the type of the conditions (the conditions
+    will be described later):
+    <list>
+      <item>
+        <p>
+        <gui>Simple</gui>: the match is done by a simple substring
+        test.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Regular expression</gui>: the match uses regular
+        expressions on the message headers.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Date interval</gui>: the match is done by checking if
+        the date of the message is within certain bounds.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Flag condition</gui>: the match is done by checking
+        the flags of the message: unread, replied, deleted,
+        flagged.</p>
+      </item>
+    </list>The three buttons under the list allows you to edit the
+    selected condition, add a new one, or remove one. Editing or
+    creating a condition is done in the
+    <link xref="win-condition">condition window</link>, which
+    pops up when you click on the
+    <gui>Edit</gui> or the
+    <gui>New</gui> button.</p>
+    <p>The two buttons under the notebook at the right hand side of
+    the window lets you manipulate the currently selected filter.
+    The
+    <gui>Apply</gui> button is used to confirm the modifications you
+    have made on any field. If you make changes and select another
+    filter without first clicking on the
+    <gui>Apply</gui> button, all your changes will be lost.</p>
+    <p>The
+    <gui>Revert</gui> button cancels all previous changes: the
+    current filter is reverted to its state just before the last
+    click on the
+    <gui>Apply</gui> button.</p>
+  </section>
+  <section id="wf-action-page">
+    <title>The Action Page</title>
+    <p>This page describes the actions to take in case the filter
+    matches. First you specify the notification to inform you that
+    the one or several messages has matched the filter in the
+    <gui>Notification</gui> frame. Then in the
+    <gui>Action</gui> frame you tell what to do with the matching
+    messages. You can ask <app>Balsa</app> to copy or move them to any
+    mailbox, or to send them to the trash can. The other actions
+    are not yet implemented.</p>
+  </section>
+  <section id="win-condition">
+    <title>The Condition Window</title>
+    <p>This window is used to edit an existing condition or to
+    create a new one. It displays all the information needed to
+    describe the condition, it is launched when you click on the
+    <gui>Edit</gui> or
+    <gui>New</gui> buttons under the conditions list in the match
+    page of the notebook in the right part of the
+    <link xref="win-filters">filters window</link>.</p>
+    <p>This window is made of three frames:
+    <list>
+      <item>
+        <p>The
+        <gui>Match in</gui> frame: it's a set of check boxes, one
+        per match field. For example if you want to match all
+        messages that was sent by hotmail users, you just have to
+        check the
+        <gui>From</gui> box, or if you want to match all messages
+        about <app>Balsa</app>, check the
+        <gui>Subject</gui> box.</p>
+        <warning>
+          <p>Be careful with
+          <gui>Body</gui> match, this can take time for large
+          messages.</p>
+        </warning>
+        <p>For advanced use you can also specify directly the name
+        of the header to match on. A standard example the
+        "X-Mailer" is a header added to your message by the MUAs
+        with their name and versions.</p>
+        <p>The
+        <gui>All</gui> button will check all boxes, whereas the
+        <gui>Clear</gui> button will uncheck all boxes (as you might
+        have guessed).</p>
+        <p>If you specify several headers, a message will match
+        this condition if one of the header matches. For example if
+        you want to filter all messages talking about <app>Balsa</app>,
+        you should check the
+        <gui>Body</gui> and the
+        <gui>Subject</gui> boxes, so that all mails with the word
+        <quote>Balsa</quote> in its subject or its body will match.
+        You can also, if you're fed up with <app>Balsa</app> ;-), match
+        all mails that do NOT contain the word
+        <quote>Balsa</quote> in their subject and in their body
+        neither. See the description of the search types to see how
+        to do this.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Search Type</gui> frame: it's a list of the different
+        condition types. You choose
+        <gui>Simple</gui>,
+        <gui>Regular expression</gui>,
+        <gui>Date interval</gui>, or
+        <gui>flag condition</gui>. Your choice will change the
+        third frame so that it displays the fields needed by the
+        type of match chosen.</p>
+      </item>
+      <item>
+        <p>This part depends on the search type you've chosen:
+        <list>
+          <item>
+            <p>
+            <gui>Simple</gui> type: a text entry lets you input the
+            string to look for (case does not matter, the search is
+            case-insensitive). The button lets you specify if a
+            message matches when the string is or is NOT a
+            substring of the specified headers, the sentence above
+            the text entry will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Regular expression</gui>: you can input a list of
+            regular expressions. You type your regular expression
+            in the text entry, then you click on the
+            <gui>Add</gui> button to put it into the list. Of course
+            the
+            <gui>Remove</gui> button destroys the selected regular
+            expression in the list. The last button
+            <gui>One matches/None matches</gui> lets you specify
+            when a message matches the condition: when one of the
+            regular expression matches or when none matches. The
+            sentence above te list will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Date</gui> interval: you can input the interval by
+            the mean of the two text entries. A blank entry means
+            no bound. The button tells to match when the message
+            date is within the bounds or not. The sentence above
+            the text entries will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Flag condition</gui>: the four check boxes let you
+            select which messages will match this condition. If you
+            want to match all replied OR unread messages, check the
+            corresponding boxes. The button let you specify that
+            the match will be done when none of the specified flags
+            are set, the sentence above the check boxes will be
+            updated accordingly. For example if you want to filter
+            all read and replied messages, check the
+            <gui>unread</gui> and
+            <gui>replied</gui> boxes, and click on the button.</p>
+          </item>
+        </list></p>
+      </item>
+    </list></p>
+  </section>
+</page>
diff --git a/doc/es/win-main.page b/doc/es/win-main.page
new file mode 100644
index 0000000..70d4f74
--- /dev/null
+++ b/doc/es/win-main.page
@@ -0,0 +1,897 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-main" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>La ventana principal</title>
+  <figure>
+    <media type="image" src="figures/main-window.png"/>
+    <title>Ventana principal</title>
+  </figure>
+  <p> <app>Balsa</app> 's main window has three major areas. To the left
+  is the
+  <link xref="win-main#subwin-mblist"> mailbox list</link> . This displays all
+  the mailboxes <app>Balsa</app> knows about; it will scan for ones in
+  your local mail directory. (This means <app>Balsa</app> works well
+  with <app>procmail</app> .) It will also list <link xref="glossary#imap">IMAP</link> mailboxes that
+  you have configured. If the
+  <gui> Show Mailbox Info</gui> preference is set, two columns will
+  also be displayed next to the mailbox names containing the number
+  of unread and total messages in each mailbox that has unread
+  messages; otherwise, the number of unread messages is shown in
+  parentheses after the mailbox name. Also, any mailboxes that
+  contain unread messages will be shown in a bold font.</p>
+  <p> At the top-right is a view of the currently open mailbox,
+  called the
+  <link xref="win-main#subwin-msgindex"> message index</link> . You can browse
+  messages and manipulate them here.</p>
+  <p> At the bottom-right of <app>Balsa</app> 's main window is the
+  <link xref="win-main#subwin-msgview"> message view</link> . This displays
+  the message selected in the message index. You can save
+  attachments, view attachments, and read incoming email here.</p>
+  <section id="menu-toolbar">
+    <title>Menú y barra de herramientas</title>
+    <figure>
+      <media type="image" src="figures/main-window-toolbar.png"/>
+      <title>Barra de herramientas de la ventana principal</title>
+    </figure>
+    <p> The menu bar, located at the top of the Main Window,
+    provides the following commands:</p>
+    <terms>
+      <item>
+        <title>
+          <guiseq>
+            <gui> File</gui>
+          </guiseq>
+        </title>
+        <p>Este menú contiene comandos básicos.</p>
+        <terms>
+          <item>
+            <title>
+              <guiseq>
+                <gui> File</gui>
+                <gui> New</gui>
+              </guiseq>
+            </title>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Message...</gui>
+                </guiseq>
+                <key>M</key> -- Create a new message, and
+                display a new window to type the message in.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Mailbox...</gui>
+                </guiseq> -- Open a dialog box to create a new
+                mailbox. There are various items like this,
+                corresponding to the different types of mailbox
+                that <app>Balsa</app> supports. See the
+                <link xref="mbox-formats"> discussion of different
+                mailbox formats</link> and their advantages and
+                disadvantages.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Remote IMAP folder...</gui>
+                </guiseq> -- Open a dialog box to create a
+                folder for an account on an IMAP server. This
+                <link xref="folder-config"> IMAP folder
+                properties</link> dialog can also be used to change
+                the details of the account.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Remote IMAP subfolder...</gui>
+                </guiseq> -- Open a dialog box to create a new
+                subfolder in an existing IMAP folder tree. This
+                <link xref="subfolder-config"> IMAP subfolder
+                properties</link> dialog can also be used to rename
+                or move a subfolder.</p>
+              </item>
+            </list>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Continue</gui>
+            </guiseq>
+            <key>C</key> -- Continue a postponed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Get New Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>M</key></keyseq> -- 
+            This causes <app>Balsa</app> to
+            attempt to retrieve any new messages from the
+            <link xref="glossary#pop">POP3</link> server.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Send Queued Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>T</key></keyseq> --
+            Send all mail waiting in the
+            Outbox mailbox to the mail server now.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Send and Receive Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>B</key></keyseq> --
+            Send all mail waiting in the
+            Outbox mailbox to the mail server now and retrieve any
+            new messages.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Page Setup</gui>
+            </guiseq> -- Set print options such as paper size
+            and print orientation.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Print</gui>
+            </guiseq> -- Print the currently selected message
+            (displayed in the message view pane.)</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Address Book</gui>
+            </guiseq>
+            <key>B</key> -- Open <app>Balsa</app> 's address
+            book.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Quit</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>Q</key></keyseq> --
+            Exit the program.</p>
+          </item>
+        </terms>
+      </item>
+      <item>
+        <title>
+          <gui> Edit</gui>
+        </title>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Copy</gui>
+            </guiseq>
+            <keyseq><key>Ctrl&gt;</key><key>C</key></keyseq> --
+            Copy selected text to the clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Select All</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>A</key></keyseq> --
+            Select all text in the currently
+            displayed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Select Thread</gui>
+            </guiseq> -- Select all messages in the same thread
+            as the currently displayed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find</gui>
+            </guiseq> 
+            <keyseq><key>Ctrl</key><key>F</key></keyseq> --
+            Find messages in the current mailbox
+            that match a given set of conditions, using the
+            <link xref="win-search"> search mailbox
+            window</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find Next</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>G</key></keyseq> --
+            Find the next matching message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find in Message</gui>
+            </guiseq> <key>/</key>--
+            Selecting this option opens a "search
+            bar" at the foot of the message preview, in which you
+            can type text for which <app>Balsa</app> will search in the
+            current message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Filters</gui>
+            </guiseq> -- Open up the
+            <link xref="win-filters"> filters window</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Export filters</gui>
+            </guiseq> -- Open up a window for exporting filters
+            in the Sieve format.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Preferences...</gui>
+            </guiseq> -- Open the
+            <link xref="preferences"> Preferences</link> window to
+            change the settings of <app>Balsa</app> .</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> View</gui>
+        </title>
+        <p>Menú para cambiar cómo se ven los mensajes</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Show Mailbox Tree</gui>
+            </guiseq> <key>F9</key> --
+            Toggle the display of the mailbox tree
+            in the main window.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Show Mailbox Tabs</gui>
+            </guiseq> -- Toggle the display of tabs for all
+            open mailboxes.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Wrap</gui>
+            </guiseq> -- Toggle the display of messages using
+            word wrap. The column to which the message is wrapped
+            is set in the
+            <link xref="preferences"> Preferences</link> window.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> No Headers</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> Selected Headers</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> All Headers</gui>
+            </guiseq> -- Select the headers to display in the
+            message pane.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Flat index</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> Simple threading</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> JWZ threading</gui>
+            </guiseq> -- Select the type of threading used to
+            display the messages in the message index.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Expand All</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>E</key></keyseq> --
+            <guiseq>
+              <gui> View</gui>
+              <gui> Collapse All</gui>
+            </guiseq>
+             <keyseq><key>Ctrl</key><key>L</key></keyseq> --
+             Expand or collapse all
+             threads in the currently displayed mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Zoom In</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>+</key></keyseq>,
+            <guiseq>
+              <gui> Zoom Out</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>-</key></keyseq>,
+            <guiseq>
+              <gui> Zoom 100%</gui>
+            </guiseq> -- Alter the font size of HTML messages.
+            Plain text messages will always use the font specified
+            in the
+            <link xref="preferences"> Preferences</link> window.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> Mailbox</gui>
+        </title>
+        <p>Para manipular los buzones.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next</gui>
+            </guiseq> <key>N</key>--
+            Select the next message in the current
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Previous</gui>
+            </guiseq> <key> P</key> --
+            Select the previous message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next Unread</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>N</key></keyseq> --
+            Select the next unread message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next Flagged</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>Alt</key><key>F</key></keyseq> --
+            Select the next flagged message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Hide messages</gui>
+            </guiseq> -- A submenu listing all the types of
+            messages that may be hidden and unhidden in the current
+            mailbox. Types in the submenu are toggled when
+            selected. A Checkmark indicates it is currently
+            hidden.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Reset Filter</gui>
+            </guiseq> -- Resets to the mailbox filter.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Select All</gui>
+            </guiseq> -- Selects all messages in the current
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Edit...</gui>
+            </guiseq> -- Edit mailbox properties.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Delete...</gui>
+            </guiseq> -- Delete the currently selected
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Expunge Deleted Messages</gui>
+            </guiseq> -- Physically remove from the backing
+            mailstore all messages marked as deleted.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Close</gui>
+            </guiseq> -- Close the currently selected
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Empty Trash</gui>
+            </guiseq> -- Delete all messages from the
+            <code> Trash</code> mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Select Filters</gui>
+            </guiseq> -- Pop up a dialog that allows you to
+            control which filters are applied to this mailbox, and
+            optionally to apply them.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Remove Duplicates</gui>
+            </guiseq> -- Remove duplicate messages; <app>Balsa</app>
+            locates all messages in the current mailbox that have
+            the same Message-ID header, and removes all but
+            one.</p>
+          </item>
+        </list>
+      </item>
+      <item id="subwin-messagemenu">
+        <title>
+          <gui> Message</gui>
+        </title>
+        <p> This menu has commands for manipulating messages.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <key> R</key>
+              <gui> Message</gui>
+              <gui> Reply...</gui>
+            </guiseq> <key>R</key> -- Reply to the currently selected
+            message(s).</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> A</key>
+              <gui> Message</gui>
+              <gui> Reply to All...</gui>
+            </guiseq> <key>A</key> -- Reply to the currently selected
+            message(s), sending the reply to all senders and
+            recipients of the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> G</key>
+              <gui> Message</gui>
+              <gui> Reply to Group...</gui>
+            </guiseq> <key>G</key> -- Reply to a mailing list, instead of
+            the sender to that list.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> F</key>
+              <gui> Message</gui>
+              <gui> Forward attached...</gui>
+            </guiseq> -- Forward the currently selected
+            message(s) as an attachment.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Forward inline...</gui>
+            </guiseq> -- Forward the currently selected
+            message(s), quoted inline.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Next Part</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>.</key></keyseq>--
+            View the next part of the message (if
+            the message is multi-part).</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <shortcut>
+                <keycombo>
+                  <sys> Ctrl</sys>
+                  <sys> ,</sys>
+                </keycombo>
+              </shortcut>
+              <gui> Message</gui>
+              <gui> Previous Part</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>,</key></keyseq> --
+            View the previous part of the
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Save Current Part...</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>S</key></keyseq>--
+            Save the currently selected part of
+            the message to a file.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <shortcut>
+                <keycombo>
+                  <sys> Ctrl</sys>
+                  <sys> U</sys>
+                </keycombo>
+              </shortcut>
+              <gui> Message</gui>
+              <gui> View Source...</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>U</key></keyseq> --
+            Opens a new window that displays the
+            raw message as received from the
+            <link xref="glossary#mta">MTA</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Copy</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>C</key></keyseq> --
+            Copies to the clipboard any text
+            selected in the message view of the current
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Select Text</gui>
+            </guiseq> -- Selects the entire text of the current
+            message in the message view.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Move to Trash</gui>
+            </guiseq> <key>D</key> -- Moves the currently selected
+            message(s) to the Trash.</p>
+          </item>
+          <item>
+            <p>
+              <guiseq>
+                <gui> Message</gui>
+                <gui> Toggle flag</gui>
+              </guiseq>
+            </p>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Flagged</gui>
+                </guiseq> <key>X</key> --
+                Toggle the flag on the currently
+                selected message(s). This is shown as an
+                exclamation mark next in the message index.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <shortcut>
+                    <keycombo>
+                      <sys> Ctrl</sys>
+                      <sys> D</sys>
+                    </keycombo>
+                  </shortcut>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Deleted</gui>
+                </guiseq>
+                <keyseq><key>Ctrl</key><key>D</key></keyseq> --
+                Marks the message as set for
+                deletion. The message will be actually removed from
+                the backing mailstore when it is "expunged" either
+                manually, or as specified in the
+                <link xref="preferences">Preferences</link>.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <shortcut>
+                    <keycombo>
+                      <sys> Ctrl</sys>
+                      <sys> R</sys>
+                    </keycombo>
+                  </shortcut>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> New</gui>
+                </guiseq>
+                <keyseq><key>Ctrl</key><key>R</key></keyseq> --
+                Marks a message that has been read
+                as new, and vice-versa. The message will display
+                the standard icon and font for a new message.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Answered</gui>
+                </guiseq> -- Toggles the reply icon for a
+                message.</p>
+              </item>
+            </list>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> S</key>
+              <gui> Message</gui>
+              <gui> Store Address...</gui>
+            </guiseq> <key>S</key>-- Add the sender of the currently
+            selected message to your address book.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> Settings</gui>
+        </title>
+        <p> Menu for changing <app>Balsa</app> 's configuration.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Settings</gui>
+              <gui> Toolbars...</gui>
+            </guiseq> -- Open the
+            <link xref="toolbar-prefs"> Toolbars</link> window to
+            modify the content and arrangement of the toolbars in
+            <app>Balsa</app> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Settings</gui>
+              <gui> Identities...</gui>
+            </guiseq> -- Open the
+            <link xref="identities"> Identities</link> window to
+            customize how you present yourself to the rest of the
+            world.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Help</gui>
+        </title>
+        <p>Menu for getting this help, and information about <app>Balsa</app>.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Help</gui>
+              <gui>Contents</gui>
+            </guiseq> <key>F1</key> -- Show this help file.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Help</gui>
+              <gui>About</gui>
+            </guiseq> -- Show information about <app>Balsa</app>.</p>
+          </item>
+        </list>
+      </item>
+    </terms>
+  </section>
+  <section id="subwin-mblist">
+    <title> The Mailbox List</title>
+    <p> The mailbox list in the main window lists all of your
+    mailboxes. <app>Balsa</app> will automatically detect your local
+    mailboxes by searching for mailboxes under your local mail
+    directory (probably ~/mail). This lets <app>Balsa</app> coexist with
+    <app>pine</app> and <app>procmail</app> without causing problems.</p>
+    <p> Your mailboxes will be displayed as a tree view, with
+    mailboxes in subdirectories of your local mail directory
+    initially hidden but accessible by expanding the tree.
+    <link xref="glossary#imap">IMAP</link> mailboxes will also be displayed as being at the top
+    level of the tree. <link xref="glossary#pop">POP3</link> mailboxes are not displayed.</p>
+  </section>
+  <section id="subwin-msgindex">
+    <title> The Message Index</title>
+    <p> The message index displays the messages in the current
+    folder, and lets you choose which messages to view. Click on
+    the notebook tabs, if shown, or click on a folder in the
+    mailbox list to bring it to the front.</p>
+    <p> From the message index you can do a lot. Clicking on a
+    message will cause it to be displayed in the message view.
+    Right-clicking on it will give a pop-up menu letting you reply
+    to the message (or forward it, etc.) and move it to another
+    folder (using the
+    <gui> Move to</gui> menu item). Double-clicking on a message, or
+    pressing either the space-bar or the
+    <sys> Enter</sys> key while the keyboard focus is in the index,
+    will open the message in a separate window. Also, it is
+    possible to drag and drop messages from the index to other
+    mailboxes in the mailbox list and open mailbox tabs.</p>
+    <p> The pop-up (context) menu contains the following items:</p>
+    <list>
+      <item>
+        <p>
+        <guiseq>
+          <gui> Reply</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Reply To All</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Reply To Group</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Forward Attached</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Forward Inline</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Store Address</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Delete</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Undelete</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Move To Trash</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Toggle Flagged</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Toggle Unread</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Move to</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> View Source</gui>
+        </guiseq> -- These perform the same actions as their
+        counterparts in the
+        <link xref="win-main#subwin-messagemenu"> message menu</link> .</p>
+      </item>
+      <item>
+        <p>
+        <guiseq>
+          <gui> Move to</gui>
+        </guiseq> -- Moves the currently selected message(s) to
+        another mailbox. When this menu item is selected, a list of
+        available mailboxes is displayed, from which the
+        destination may be selected.</p>
+      </item>
+    </list>
+  </section>
+  <section id="subwin-msgview">
+    <title> The Message View</title>
+    <p> This displays the email that is selected in the message
+    index. Message headers are displayed above the main text of the
+    message, unless they have been disabled. The text of the
+    message is shown below the headers.</p>
+    <p> If the message is multipart, an attachment icon will appear
+    beside the headers. Clicking this icon will display a list of
+    the parts from which you may select one. If <app>Balsa</app> is
+    unable to display it, you will be given a choice of
+    applications known to handle the part. Additionally, there is
+    always an option to save the attachment to a file.</p>
+    <note>
+      <p> <app>Balsa</app> supports viewing HTML messages only when
+      compiled with
+      <app> gtkhtml</app> or
+      <app> WebKit</app> support. Gtkhtml support will be compiled in
+      if gtkhtml-devel files are found. WebKit is currently
+      supported only on an experimental basis,</p>
+    </note>
+    <p> You are not restricted to that pane either. Double-clicking
+    on a message in the message index, or touching either the space
+    bar or the
+    <sys> Enter</sys> key, will open it in a
+    <link xref="win-message"> separate window</link> .</p>
+  </section>
+</page>
diff --git a/doc/es/win-message.page b/doc/es/win-message.page
new file mode 100644
index 0000000..1110994
--- /dev/null
+++ b/doc/es/win-message.page
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-message" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>The Message Window</title>
+
+<p>
+  In addition to the preview pane, <app>Balsa</app> can display messages in
+  separate windows.  Simply double-click on the desired message from
+  the message index in the main window, or select the message and press
+  the space bar.  Any number of windows may be
+  opened, although only one per unique message.
+</p>
+
+<p>
+  The message window has a menu and toolbar containing commands
+  pertinent to an individual message.  Commands are as described in
+  the <link xref="win-main">main window</link>.
+  Below the menu and toolbar are the message headers in a box,
+  followed by the message body.
+</p>
+
+<figure>
+  <title>Ventana Mensaje</title>
+  <media type="image" src="figures/message-window.png" format="PNG"/>
+</figure>
+
+<p>
+  If your copy of <app>Balsa</app> has cryptographic support, there will be
+  an icon in the header box depicting an envelope with a lock and a
+  check mark.  Clicking the icon will check the key used to sign the
+  message.  The message body will contain an icon and some
+  descriptive text noting whether the signing key is valid, invalid,
+  or unchecked.
+</p>
+
+<p>
+  If the message contains attachments or more than one part of any
+  kind, an attachment icon will be present in the header box as
+  shown below.  Clicking this icon will show a menu of all available
+  parts.  Selecting a part will update the display of the message
+  body accordingly.
+</p>
+
+<figure>
+  <title>Selecting a Message Part</title>
+  <media tyep="image" src="figures/msg-part-select.png" format="PNG"/>
+</figure>
+
+<p>
+  The <gui>complete message</gui> selection will
+  do its best to render all
+  parts at once, but some may have to be selected individually or
+  opened in an external program.  Parts which cannot be rendered
+  within <app>Balsa</app> will instead display a list of options for opening
+  external programs or saving the data.  Right-clicking on a part
+  will also provide a menu with these options.
+</p>
+
+<p>
+  Navigation between messages is possible without returning to the
+  index in the main window.  Next unread being quite useful for
+  checking all new mail.  Deleting the current message will
+  automatically display the next unread one.  This behavior can be
+  changed in the <link xref="preferences">preferences</link>.
+</p>
+</page>
diff --git a/doc/es/win-run-filters.page b/doc/es/win-run-filters.page
new file mode 100644
index 0000000..a5964e9
--- /dev/null
+++ b/doc/es/win-run-filters.page
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-run-filters" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>The Select Filters Window</title>
+  <p>This window is divided in two lists: the left one displays all
+  available filters, and the right part displays all filters to be
+  applied on the mailbox (the name of which is shown in the window
+  title). See the
+  <link xref="win-filters">filters window</link> section to see
+  how to set up filters.</p>
+  <p>The right list has three columns. The first one contains the
+  filters name. The two others tells you if the filter will be
+  automatically applied: e.g. if a dot is displayed in the second
+  column
+  (<gui>On reception</gui>), this tells you that whenever new
+  messages arrived in this mailbox, they will be filtered by the
+  corresponding filter (Note: the filter is applied only on the new
+  messages, not the entire mailbox; this is similar to the use of
+  procmail). In the same way, if a dot is displayed in the third
+  column
+  (<gui>On exit</gui>), the filter will be applied to the entire
+  mailbox when you exit <app>Balsa</app>.</p>
+  <p>Note: the
+  <gui>On exit</gui> feature is not yet implemented.</p>
+  <p>When you tell <app>Balsa</app> to apply several filters on the same
+  mailbox (i.e. when you put several filters in the right list),
+  only the first match counts: the filters are applied in the
+  specified order and the first that matches on the current message
+  will be applied but not the following ones.</p>
+  <p>There are two buttons between the filters lists:
+  <list>
+    <item>
+      <p>The
+      <gui>Add</gui> button: moves the selected filters from the
+      left list to the right one, adding more filters to be applied
+      to the mailbox.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Remove</gui> button: removes the currently selected
+      filter in the right list and puts it back in the left
+      list.</p>
+    </item>
+  </list></p>
+  <p>The
+  <gui>Up</gui> and
+  <gui>Down</gui> buttons under the right list serve to reorder the
+  filters that are to be applied. This is a sort of priority
+  between filters, because if several filters could match the
+  current message, only the first one will be applied. The
+  <gui>Apply Now</gui> button applies all filters of the right list
+  to the entire mailbox immediately (be patient, this can take a
+  quite a long time on big mailboxes or remote ones).</p>
+  <p>You can also use this dialog to apply a filter to a mailbox
+  without actually attaching it to the mailbox. Select one or more
+  filters in the left hand list, and click the
+  <gui>Apply Selected</gui> button below that list.</p>
+  <p>There are three buttons below the filters lists:
+  <list>
+    <item>
+      <p>The
+      <gui>OK</gui> button: saves the list of filters associated to
+      the mailbox. Note that this does not apply the filters to the
+      mailbox. It is useful only when you have set up automatic
+      filters, or when you have to manually apply a lot of filters
+      frequently to this mailbox: the next time <app>Balsa</app> will
+      reload the saved filters and you will only have to press the
+      <gui>Apply</gui> button.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Cancel</gui> button: this discards any changes and closes
+      the dialog box.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Help</gui> button: opens this help window.</p>
+    </item>
+  </list></p>
+</page>
diff --git a/doc/es/win-search.page b/doc/es/win-search.page
new file mode 100644
index 0000000..1550a1c
--- /dev/null
+++ b/doc/es/win-search.page
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-search" xml:lang="es">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>The Search Mailbox Window</title>
+  <p>You can search a mailbox to find and display messages that
+  contain a given string in the To, From, Subject, or Cc headers,
+  or in the message body. This window allows you to specify the
+  string for which you want to search and where <app>Balsa</app> should
+  look. Open the window with the
+  <guiseq>
+    <gui>Edit</gui>
+    <gui>Find</gui>
+  </guiseq>command, or
+  <keyseq>
+    <key>Ctrl</key>
+    <key>F</key>
+  </keyseq>.</p>
+  <p>You can view the matching messages in two ways:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Show only matching messages</gui>
+      </title>
+      <p>If you click the
+      <gui>Apply</gui>button, the mailbox view will be filtered to
+      show only the messages that match the conditions. If you
+      click the
+      <gui>Clear</gui>button, the filter will be cleared, and the
+      mailbox view will be restored to show all messages. You can
+      also use
+      <guiseq>
+        <gui>Mailbox</gui>
+        <gui>Reset Filter</gui>
+      </guiseq>to restore the view.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Open next matching message</gui>
+      </title>
+      <p>Alternatively, you can step through the matching messages,
+      either forward or in reverse, and optionally wrapping the
+      search when it reaches the end of the mailbox. Click the
+      <gui>OK</gui>button to view the first matching message after
+      (or before) the current message. Then you can use
+      <guiseq>
+        <gui>Edit</gui>
+        <gui>Find Next</gui>
+      </guiseq>, or
+      <keyseq>
+        <key>Ctrl</key>
+        <key>G</key>
+      </keyseq>, to step through the matching messages.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/fr/ab-conf.page b/doc/fr/ab-conf.page
new file mode 100644
index 0000000..74c8740
--- /dev/null
+++ b/doc/fr/ab-conf.page
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="ab-conf" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>Address Book Configuration</title>
+  <p>À compléter.</p>
+
+<section id="CHOICE">
+  <title>Type du carnet d'adresses</title>
+  <p>Vous pouvez choisir entre plusieurs types de carnet d'adresses.</p>
+</section>
+
+<section id="EXTERN">
+<title>Carnet d'adresses externe</title>
+<!-- Balsa support for an external query addressbook -->
+<!-- By Jelmer Vernooij <jelmer nl linux org>        -->
+
+<p>The balsa addressbook supports input from programs. Thus, you
+can use (no importing needed!) for example your pine or mutt
+addressbook. The mutt mailer (<link href="http://www.mutt.org/";>www.mutt.org</link>) uses an identical
+system to retrieve addresses from programs.</p>
+
+  <section id="extern-existing-programs">
+   <title>Programmes existants</title>
+
+<p>The following programs are compatible with the mutt mail reader
+and <em>should</em> be with balsa. Submit links to more programs.</p>
+
+<list>
+<item><p>
+<link href="http://www.spinnaker.de/lbdb/"; type="http">http://www.spinnaker.de/lbdb/</link> - The little
+brother database. Read emailaddresses and names from: finger,
+/etc/passwd, incoming procmail email, NIS, fido, the abook program,
+mutt addressbook, pine addressbook, palm addressbook, gnomecard
+addressbook, big brother database, ldap database.
+</p></item>
+
+<item><p>
+<link href="http://www.fiction.net/blong/programs/mutt/";>http://www.fiction.net/blong/programs/mutt/</link>
+ - palm address database, ldapsearch wrapper, ph/qi server, UIUC, ph,
+</p></item>
+</list>
+</section>
+
+<section id="extern-load-scripts">
+<title>Écriture de vos propres scripts de chargement</title>
+
+<p><app>Balsa</app> ignores the first line of output from your program. You
+might want to write comments or debug output on this line. The
+remaining lines should have this format:</p>
+<p><output>
+e-mail address full name       nickname
+</output></p>
+
+<p>Les trois champs doivent être séparés par des tabulations. Le troisième champ n'est pas pour le moment 
utilisé par Balsa, mais il pourrait l'être prochainement. Il est aussi conservé pour la compatibilité avec 
mutt.</p>
+
+<p><app>Balsa</app> executes your script with one argument: the pattern to
+search for. A space (" ") is used as the first argument when creating
+a list of all users.</p>
+
+<p>Tous les caractères sont admis, excepté la tabulation (\t), qui est le séparateur de champs.</p>
+
+<p>Un exemple de sortie peut être :</p>
+<p><output>
+lbdbq: 3 matches
+</output></p>
+<p><output>
+balsa-list gnome org   Balsa List      balsa-list
+</output></p><p><output>
+jelmer nl linux org    Jelmer Vernooij jelmer
+</output></p><p><output>
+balsa-maintainer theochem kth se       Pawel Salek     balsa-maintainer
+</output></p>
+
+
+<note><p>Your script/program should write its output to stdout and not
+to stderr!
+</p></note>
+</section>
+
+<section id="extern-save-scripts">
+<title>Écriture de vos propres scripts de sauvegarde</title>
+
+<p>Ajouter des adresses est possible. Votre script doit recevoir trois paramètres. Le premier est une 
adresse électronique, le second un nom complet et le troisième un alias (non utilisé pour le moment et 
remplacé par « TODO »).</p>
+
+<p>Notez que mutt ne prend pas en charge l'ajout d'adresses et qu'il n'y a donc pas de compatibilité dans ce 
cas.</p>
+
+<p>Comments are welcome:
+<link href="mailto:jelmer nl linux org">jelmer nl linux org</link></p>
+</section>
+</section> <!-- EXTERN -->
+</page>
diff --git a/doc/fr/authors.page b/doc/fr/authors.page
new file mode 100644
index 0000000..c5ae84d
--- /dev/null
+++ b/doc/fr/authors.page
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="authors" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Auteurs</title>
+  <p><app>Balsa</app> is currently developed by (in alphabetical
+  order):</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Carlos Morgado (
+      <link href="mailto:chbm chbm nu">chbm chbm nu</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+  </list>
+  <p>In the past, numerous people contributed to balsa, including
+  (in alphabetical order):</p>
+  <list>
+    <item>
+      <p>Hector Garcia Alvarez (
+      <link href="mailto:hector scouts-es org">
+      hector scouts-es org</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Bruno Pires Marinho (
+      <link href="mailto:bapm camoes rnl ist utl pt">
+      bapm camoes rnl ist utl pt</link> )</p>
+    </item>
+    <item>
+      <p>Jay Painter (
+      <link href="mailto:jpaint gimp org">
+      jpaint gimp org</link> )</p>
+    </item>
+    <item>
+      <p>Stuart Parmenter (
+      <link href="mailto:pavlov pavlov net">
+      pavlov pavlov net</link> )</p>
+    </item>
+    <item>
+      <p>David Pickens (
+      <link href="mailto:dpickens iaesthetic com">
+      dpickens iaesthetic com</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>To find more information about it, please visit the
+  <app>Balsa</app>
+  <link href="http://balsa.gnome.org/";>Web page</link>. Please send
+  all comments, suggestions, and bug reports to the
+  <link href="http://bugs.gnome.org/";>GNOME bug tracking
+  database</link>. Instructions for submitting bug reports can be
+  found on-line at
+  <link href="http://balsa.gnome.org/bugs.html";>
+  http://balsa.gnome.org/bugs.html</link>. If you are using GNOME
+  1.1 or later, you can also use command
+  <cmd>bug-buddy</cmd> for submitting bug reports.</p>
+  <p>The following people contributed to this manual:</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Berend De Schouwer (
+      <link href="mailto:bds jhb ucs co za">
+      bds jhb ucs co za</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Craig Routledge (
+      <link href="mailto:webstuff craigroutledge com">
+      webstuff craigroutledge com</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+    <item>
+      <p>Jelmer Vernooij (
+      <link href="mailto:jelmer nl linux org">
+      jelmer nl linux org</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>Please send all comments and suggestions regarding the manual
+  to the GNOME Documentation Project at
+  <link href="mailto:docs gnome org">docs gnome org</link> and the
+  <link href="http://mail.gnome.org/mailman/listinfo/balsa-list";>
+  <app>Balsa</app> Discussion List</link>. You can also add your
+  comments online by using
+  <link href="http://library.gnome.org/devel/gdp-handbook/stable/gettingstarted.html.en";>
+  GNOME Documentation Status Table</link>.</p>
+</page>
diff --git a/doc/fr/common-tasks.page b/doc/fr/common-tasks.page
new file mode 100644
index 0000000..bc9003b
--- /dev/null
+++ b/doc/fr/common-tasks.page
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="common-tasks" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Common Tasks with <app>Balsa</app></title>
+  <p>This section explains many of the things you might want to do
+  with <app>Balsa</app>.</p>
+  <list>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-create-new-mb">Creating new
+        mailboxes</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-move-msg">Moving messages around</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-main-folder-imap">Making one of the main
+        folders IMAP-based</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-alias-expansion">Expanding e-mail
+        addresses automatically</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="common-tasks#ct-ldap">Setting up LDAP address
+        books</link>
+      </p>
+    </item>
+  </list>
+  <section id="ct-create-new-mb">
+    <title>Création de nouvelles boîtes aux lettres</title>
+    <p>You can create new local and <link xref="glossary#imap">IMAP</link> mailboxes
+    using the <guiseq><gui>File</gui><gui>New</gui></guiseq> command, or
+    by
+    right-clicking in the mailbox list and selecting
+    <gui>New Mailbox</gui>.
+    This will start a dialog that will let you name the mailbox and
+    specify its location.</p>
+    <p>To create a new <link xref="glossary#pop">POP3</link> mailbox, go to the <link 
xref="preferences">preferences window</link>,
+    select the <gui>Mail options</gui> page, and click <gui>Add</gui>
+    in the <gui>Remote mailbox servers</gui>
+    area. A dialog will be displayed that will let you set up the
+    new mailbox.</p>
+  </section>
+  <section id="ct-move-msg">
+    <title>Déplacement de messages</title>
+    <p>There are several methods available for moving or copying
+    messages from one mailbox to another. The first is via the
+    <gui>Transfer</gui> context menu, and the second is using drag
+    and drop.</p>
+    <p>To transfer messages using the
+    <gui>Transfer</gui> menu, simply select the messages you desire
+    to move from one mailbox, then press
+    <keyseq><key>Shift</key><key>F10</key></keyseq> or <key>Menu</key>,
+    or click the right
+    mouse button,
+    to bring up the context menu and
+    select the
+    <gui>Move to</gui> submenu. This will display a list of
+    mailboxes similar to the mailbox list in the main window. The
+    list can be scrolled and trees expanded and collapsed, although
+    these changes will not be reflected in the main list. Selecting
+    a mailbox will start the transfer.</p>
+    <p>The other method of transferring messages is to simply drag
+    and drop the message(s) from the message index to the desired
+    destination. Select the message(s) you wish to transfer, then
+    drag them using the mouse until they are over the intended
+    mailbox. The destination can either be in the mailbox list in
+    the main window, or if open mailbox tabs are enabled the
+    messages can be dragged to them.  </p>
+  </section>
+  <section id="ct-main-folder-imap">
+    <title>Je veux qu'un des répertoires principaux soit IMAP</title>
+    <p>First, create the IMAP folder as you want it configured.
+    Then, press right mouse button on the mailbox entry and select
+    <gui>Mark as Inbox</gui>. That is all!</p>
+  </section>
+  <section id="ct-alias-expansion">
+    <title>Je veux que Balsa devine mes contacts</title>
+    <p><app>Balsa</app> can expand the names of your contacts it finds
+    in <app>Balsa</app> addressbooks. It will do this by any part of the
+    contact's name or email address.</p>
+    <p>As you type a username in any of the To:, Cc:, or Bcc: entry
+    boxes in the
+    <link xref="win-composer">Compose window</link>, it will do
+    a case insensitive search in the addressbook for a matching
+    username, and pop up a list of matching complete addresses.
+    Press
+    <key>Cursor-Down</key> to highlight one of the addresses, and
+    <key>Enter</key> to select it.</p>
+    <!--
+  This is best demonstrated
+  with the following picture:</p>
+
+  <figure>
+    <title>Expanding Aliases</title>
+    <screenshot>
+          <mediaobject>
+            <imageobject><imagedata
+                fileref="figures/example-alias.png" format="PNG"/>
+            </imageobject>
+          </mediaobject>
+    </screenshot>
+  </figure>
+
+  <p>The example shows what it looks like if "Balsa Mailing
+  List" is in your address book, and you have typed
+  &quot;ba&quot;</p>
+-->
+    <p>To enable this feature, you must select which address books
+    you wish to be searched for aliases to expand. This can be done
+    in the
+    <link xref="preferences-address-books">
+    Preferences</link> window, on the
+    <gui>Address Books</gui> page. Also, some address books are
+    expensive to lookup. You will need then to press
+    <key>Escape</key> to explicitly expand the alias.</p>
+  </section>
+  <section id="ct-ldap">
+    <title>Configuration d'un carnet d'adresses LDAP</title>
+    <p>Only steps crucial for <app>Balsa</app> are described here. Some
+    of the steps may be specific to OpenLDAP server. Whenever in
+    doubt, consult the documentation provided with your LDAP
+    server.</p>
+    <list>
+      <item>
+        <p>Installez le logiciel de serveur LDAP.</p>
+      </item>
+      <item>
+        <p>Configure. In the case of OpenLDAP, edit
+        <file>/etc/openldap/ldap.conf</file> and
+        <file>/etc/openldap/slapd.conf</file>. Consult your LDAP
+        configuration and other sources to choose the right Domain
+        Name for your institution and authentication level
+        apriopriate to your environment.</p>
+      </item>
+      <item>
+        <p>Import data to your LDAP server. OpenLDAP comes with a
+        set of migration tools but they do not create directly
+        objects of standard
+        <code>inetOrgPerson</code> class which is an apropriate type
+        for address book entry. You may need to tune them.</p>
+      </item>
+    </list>
+    <p><app>Balsa</app> searches for objects having
+    <sys>mail</sys> attribute. The search is done on the
+    <sys>cn</sys> attribute and the search filter has a form
+    "(&amp;(mail=*)(cn=John D))". <app>Balsa</app> uses
+    <sys>cn</sys>(common name),
+    <sys>givenName</sys>(given name),
+    <sys>sn</sys>(surname) and
+    <sys>mail</sys>(e-mail address) attributes of the found
+    objects.</p>
+  </section>
+</page>
diff --git a/doc/fr/folder-config.page b/doc/fr/folder-config.page
new file mode 100644
index 0000000..70c2d1f
--- /dev/null
+++ b/doc/fr/folder-config.page
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="folder-config" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>IMAP Folder Configuration</title>
+  <p>La boîte de dialogue de configuration des dossiers vous permet de configurer des jeux complets de 
boîtes aux lettres sur des serveurs IMAP distants. La configuration est séparée en deux volets : Base et 
Avancé.</p>
+  <section>
+    <title>Configuration de base d'un répertoire IMAP</title>
+    <p>L'onglet Base de la configuration des répertoires IMAP est probablement le seul volet que vous serez 
amené à remplir.</p>
+    <list>
+      <item>
+        <p>Le nom de la boîte aux lettres est le nom du nœud racine qui s'affiche dans l'arborescence des 
boîtes aux lettres sur le côté gauche.</p>
+      </item>
+      <item>
+        <p>Le serveur est le nom d'hôte ou l'adresse IP du serveur IMAP.</p>
+      </item>
+      <item>
+        <p>Le nom d'utilisateur est le nom de celui ayant droit d'accès au serveur IMAP.</p>
+      </item>
+      <item>
+        <p>Certains serveurs autorisent un accès anonyme aux serveurs d'informations ou aux archives des 
listes de diffusion. Cochez cette case si vous souhaitez utiliser ce mode - vous n'aurez pas à fournir de mot 
de passe.</p>
+      </item>
+      <item>
+        <p>Le mot de passe est le mot de passe autorisant l'accès au serveur IMAP.</p>
+      </item>
+      <item>
+        <p>Cette case à cocher permet de choisir toutes les boîtes aux lettres sur le serveur ou seulement 
celles auxquelles vous êtes inscrit.</p>
+      </item>
+      <item>
+        <p>Le préfixe est la boîte aux lettres racine sur le serveur. Vous pouvez le laisser vide si vous 
souhaitez afficher tous les répertoires de votre serveur, mais, si votre serveur IMAP stocke d'autres types 
de fichiers, vous pouvez spécifier « mail » par exemple.</p>
+      </item>
+    </list>
+  </section>
+  <section>
+    <title>Configuration avancée de répertoire IMAP</title>
+    <p>Il est parfois nécessaire d'ajuster la configuration du répertoire de façon à assurer une connexion 
sûre, de s'adapter aux limitations du serveur ou simplement d'améliorer les performances. Ces fonctionnalités 
se trouvent dans l'onglet Avancé de la configuration de répertoire IMAP.</p>
+    <list>
+      <item>
+        <p>The
+        <gui>Use SSL</gui> check box should be active if the
+        connection is to be made to IMAPS service on port 993.
+        Connection to this port will be encrypted from the start.
+        Not all servers provide this service - many provide only
+        negotiated TLS encryption.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use TLS</gui> option list determines instruct balsa how
+        to negotiate the TLS encryption. <app>Balsa</app> can never
+        attempt to negotiate it, can start TLS encryption whenever
+        it is supported by server, or can abort the connection if
+        TLS is inavailable or fails for some reason.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Max. number of connections</gui> limits the number of
+        concurrent connections open to the IMAP server. A number
+        around 15-40 is a sane option as it avoids time-consuming
+        and load-creating reselections of imap mailboxes. Some IMAP
+        servers -- notably Courier -- limit the number of
+        connections open from single IP number to 4 by default. The
+        limit in balsa has to be in such a case adjusted
+        accordingly.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Enable persistent cache</gui> check box chooses whether
+        <app>Balsa</app> should try to store downloaded messages between
+        sessions or throw them away when it is closed. The optimal
+        choice depends on the local configuration. If the
+        connection to the IMAP server is slow and local storage in
+        the home directory fast and cheap, it is recommended to
+        enable persistent message cache. If the home directory is
+        slow (eg. NFS-mounted) and the connection to the imap
+        server - fast, persistent cache becomes just a burden and
+        should be disabled.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use IDLE command</gui> check box chooses whether
+        <app>Balsa</app> should try to use IDLE command when available.
+        With this command, some servers notify immediately when a
+        new command arrives. Also, this command may reduce the
+        amount of network traffic. There are some downsides, too:
+        some firewalls do not track IMAP connections correctly and
+        will incorrectly interrupt a session in an IDLE state. In
+        particular, home-grade network routers with NAT translation
+        have notoriously this bug. In such case, it may be safer to
+        disable this command.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Enable bug workarounds</gui> check box makes
+        <app>Balsa</app> work even with an IMAP server that cannot
+        provide selected message parts. <app>Balsa</app> in such a case
+        will try to fetch entire messages instead.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Use STATUS for mailbox checking</gui> check box enables
+        a more thorough but potentially more expensive way of
+        checking mailboxes on IMAP server. This method can be
+        consume many resources on the server and should be used
+        <em>only</em> on IMAP servers that have optimized STATUS
+        command.</p>
+      </item>
+    </list>
+  </section>
+  <section id="subfolder-config">
+    <title>Propriétés du sous-dossier IMAP</title>
+    <p>The subfolder properties dialog allows you to manage folders
+    on remote IMAP servers. Specifically, you can
+    <em>create</em> a new subfolder,
+    <em>rename</em> an existing subfolder, or
+    <em>move</em> a subfolder within the folder tree.</p>
+    <list>
+      <item>
+        <p>
+        <gui>Folder name</gui> is how the folder is shown in the
+        mailbox tree on the left side.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Subfolder of</gui> indicates the immediate parent of
+        the folder.</p>
+      </item>
+    </list>
+    <p>When the dialog is opened from
+    <guiseq>
+      <gui>File</gui>
+      <gui>New</gui>
+      <gui>Remote IMAP subfolder</gui>
+    </guiseq>, you can enter the folder name and browse IMAP trees
+    to find the parent folder. If you had already selected a
+    mailbox in an IMAP tree, only that tree is shown for browsing;
+    otherwise, all IMAP trees will be shown.</p>
+    <p>When the dialog is opened from
+    <guiseq>
+      <gui>Mailbox</gui>
+      <gui>Edit</gui>
+    </guiseq> with an IMAP folder selected, or by right-clicking on
+    an IMAP mailbox and selecting
+    <gui>Properties...</gui>, the mailbox may be:</p>
+    <list>
+      <item>
+        <p>renommée, en modifiant le nom du répertoire,</p>
+      </item>
+      <item>
+        <p>déplacée, en parcourant un répertoire parent dans la même arborescence.</p>
+      </item>
+    </list>
+  </section>
+</page>
diff --git a/doc/fr/getting-started.page b/doc/fr/getting-started.page
new file mode 100644
index 0000000..59769ee
--- /dev/null
+++ b/doc/fr/getting-started.page
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="getting-started" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="next" xref="win-main"/>
+  </info>
+  <title>Getting Started with <app>Balsa</app></title>
+  <p>If you're starting <app>Balsa</app> for the first time, the first
+  thing you'll see is an assistant that will set up <app>Balsa</app>'s
+  basic settings. <app>Balsa</app> can guess most of what it needs to
+  know about you. It will also create five standard local
+  mailboxes: the Inbox, Outbox, Sentbox, Draftbox, and Trash.
+  (These can be changed to be <link xref="glossary#imap">IMAP</link> mailboxes later.)</p>
+  <figure>
+    <media type="image" src="figures/druid-start.png"/>
+    <title><app>Balsa</app> Start Assistant</title>
+  </figure>
+  <p>Don't worry. <app>Balsa</app> cooperates with other
+  <link xref="glossary#mua">MUA</link>'s very well. They share the
+  same locking semantics for mailboxes. If <app>Balsa</app> shares the
+  same mail directory as <app>pine</app> or <app>Mutt</app>, it will detect
+  new folders as they are created. So if you have to telnet in to
+  your mail machine, you won't be stuck.</p>
+  <p>There are many more settings in <app>Balsa</app>'s
+  <link xref="preferences">preferences window</link>, but most of
+  them do not need to be changed.</p>
+  <p>Once <app>Balsa</app> is configured, you will proceed on to the
+  <link xref="win-main">main window</link>.</p>
+</page>
diff --git a/doc/fr/glossary.page b/doc/fr/glossary.page
new file mode 100644
index 0000000..370b128
--- /dev/null
+++ b/doc/fr/glossary.page
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="glossary" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Glossaire</title>
+    <section id="pop">
+      <title>POP</title>
+      <p>Acronyme de « Post Office Protocol » (protocole du bureau de poste), une méthode simple pour 
récupérer les courriels d'un serveur de courrier distant. Il est largement utilisé par les clients de 
messagerie pour accéder aux serveurs des fournisseurs d'accès internet. À l'heure actuelle, la version 3 est 
la plus couramment employée ; elle est connue sous le nom POP3. C'est un protocole très simple, pas très 
souple, mais facile à mettre en place et omniprésent sur internet.</p>
+    </section>
+    <section id="imap">
+      <title>IMAP</title>
+      <p>An acronym that stands for "Internet Mail Access
+      Protocol". It is a newer method of accessing mail over the
+      internet. It is far more featureful than <link xref="glossary#pop">POP3</link>, allowing
+      for remote folders on the mail server, and more control over
+      mail delivery. However it is not as widely supported.</p>
+    </section>
+    <section id="ldap">
+      <title>LDAP</title>
+      <p>Acronyme pour « Lightweight Directory Access Protocol » (protocole léger d'accès à un annuaire). 
C'est une norme largement acceptée pour accéder aux informations des contacts sur un réseau. Cela permet à 
des organisations d'enregistrer les informations d'adressage dans une base de données centrale et d'avoir de 
nombreuses personnes capables d'y accéder.</p>
+    </section>
+    <section id="libmutt">
+      <title>libmutt</title>
+      <p>The library based on Mutt's code and used by previous
+      versions of <app>Balsa</app> to handle local mail and IMAP
+      servers.</p>
+    </section>
+    <section id="mailbox-list">
+      <title>liste de boîtes aux lettres</title>
+      <p>The list of mailboxes found in <app>Balsa</app>'s left hand
+      pane.</p>
+    </section>
+    <section id="message-index">
+      <title>index de messages</title>
+      <p>The list of messages in <app>Balsa</app>'s upper-right hand
+      pane.</p>
+    </section>
+    <section id="message-view">
+      <title>vue du message</title>
+      <p>The message display in <app>Balsa</app>'s lower-right hand
+      pane.</p>
+    </section>
+    <section id="mda">
+      <title>MDA</title>
+      <p>An acronym for "Mail Delivery Agent", this type of program
+      is also known as a Local Delivery Agent (LDA). It is
+      responsible for delivering the mail recieved for someone on a
+      machine to the mail folder of that person. <app>procmail</app> is
+      an example of this type of program, although many
+      <link xref="glossary#mta">MTA</link>'s have their own
+      MDA implementations.</p>
+    </section>
+    <section id="mta">
+      <title>MTA</title>
+      <p>An acronym for "Mail Transfer Agent", this class of
+      program is responsible for moving mail around between people,
+      be they on the same computer, on on completely separate
+      networks. Examples of this type of program include
+      <app>sendmail</app>,
+      <app>qmail</app>, and
+      <app>postfix</app>.</p>
+    </section>
+    <section id="mua">
+      <title>MUA</title>
+      <p>An acronym for "Mail User Agent", this the program a user
+      would use to read existing mail and create new messages. MUAs
+      are one of three types of programs that allow internet email
+      to work. The other two types of programs are
+      <link xref="glossary#mta">MTA</link> s and
+      <link xref="glossary#mda">MDA</link> s. <app>Balsa</app> is
+      primarily an MUA, but it also functions as an MDA/MTA when
+      retrieving mail from a remote server.</p>
+    </section>
+    <section id="regular-expression">
+      <title>Expression régulière</title>
+      <p>Often abbreviated as a
+      <em>regexp</em>, this is a method of specifing a pattern to
+      match in text. Both very simple and very complex patterns can
+      be easily matched using this method. For information on how
+      to understand and construct regular expressions the best
+      source is the
+      <cmd>grep</cmd> manual or info page.</p>
+    </section>
+    <section id="smtp">
+      <title>SMTP</title>
+      <p>Acronyme pour « Simple Mail Transfer Protocol » (protocole simple de transfert de courrier). C'est 
exactement cela : une norme qui définit un moyen simple et fiable pour transférer des messages entre des 
ordinateurs sur un réseau. Il est utilisé par la plupart, si ce n'est tous les programmes de courrier pour 
transférer du courrier.</p>
+    </section>
+    <section id="vcard">
+      <title>VCARD</title>
+      <p>VCARD is a standard method of storing contact information
+      for easy exchange between programs. <app>Balsa</app> supports
+      VCARD addressbooks, as does GnomeCard and Evolution. Many
+      other programs are capable of exporting their contact lists
+      in VCARD format as well.</p>
+    </section>
+</page>
diff --git a/doc/fr/identities.page b/doc/fr/identities.page
new file mode 100644
index 0000000..f7fd841
--- /dev/null
+++ b/doc/fr/identities.page
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="identities" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Identités</title>
+  <p>Cette boîte de dialogue vous permet de définir la manière de vous présenter au reste du monde à travers 
vos courriers électroniques. Le premier onglet contient des informations d'ordre général :</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Identity Name</gui>
+      </title>
+      <p>A unique title by which this identity will be named within
+      <app>Balsa</app>.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Full Name</gui>
+      </title>
+      <p>This doesn't
+      <em>have</em> to be your name, I guess. But it's the word
+      prefixing your email address in mail you send.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Mailing Address</gui>
+      </title>
+      <p>L'adresse telle que vous souhaitez la voir affichée dans le champ « De » de l'en-tête.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Reply-To address</gui>
+      </title>
+      <p>L'adresse à laquelle vous souhaitez que les gens adressent leurs courriels de réponse (si vous avez 
une adresse personnelle et de travail par exemple).</p>
+    </item>
+    <item>
+      <title>
+        <gui>Default Domain</gui>
+      </title>
+      <p>The domain that you wish to append to all e-mail entries
+      where you did not specify the domain. Normally you would use
+      your local domain. You need to enable
+      <link xref="preferences-address-books">Alias
+      Expansion</link> for this to work.</p>
+    </item>
+  </terms>
+  <p>The "Messages" page shows various initial settings for the new
+  message:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Bcc</gui>
+      </title>
+      <p>La valeur par défaut pour la copie carbone invisible lorsque vous utilisez cette identité. Utile si 
vous souhaitez toujours envoyer une copie du courriel sortant à un autre compte.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Reply String</gui>
+      </title>
+      <p>Le préfixe utilisé dans la ligne Sujet lors de la réponse à un message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Forward String</gui>
+      </title>
+      <p>Le préfixe utilisé dans la ligne Sujet lors du transfert d'un message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Request Message Disposition Notification</gui>
+      </title>
+      <p>Indique si l'accusé de réception de message doit être demandé par défaut.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Face Path</gui>
+      </title>
+      <p>Whether a "Face" header should be attached to a program.
+      Specified path points out to a file containing a textual
+      representation of the face icon. Please see
+      <link href="http://quimby.gnus.org/circus/face/";>a
+      description of Face and X-Face</link> headers for more details
+      as well as the list of mail programs supporting this
+      feature.</p>
+    </item>
+    <item>
+      <title>
+        <gui>X-Face Path</gui>
+      </title>
+      <p>Indique si l'en-tête « Face » doit être joint à un programme. Le chemin spécifié pointe vers un 
fichier contenant une représentation en caractères alphabétiques de l'icône de l'avatar.</p>
+    </item>
+    <item>
+      <title>
+        <gui>SMTP server</gui>
+      </title>
+      <p>The
+      <link xref="preferences-mail-options#smtp-server-config">
+      SMTP server</link> to be
+      used for this identity.</p>
+    </item>
+  </terms>
+  <p>You control the signature that <app>Balsa</app> appends to your
+  messages on the "Signature" page:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Signature Path</gui>
+      </title>
+      <p>Le fichier contenant la signature que vous ajoutez à tous vos messages. La signature peut être 
générée de l'une des trois façons suivantes :</p>
+      <list>
+        <item>
+          <p>à partir d'un fichier ordinaire. Sélectionnez le chemin de n'importe quel fichier et le texte 
qu'il contient est alors ajouté en fin de vos messages.</p>
+        </item>
+        <item>
+          <p>A named pipe or FIFO. In this case, to <app>Balsa</app>,
+          the file looks normal, but in reality, it is a pipe to a
+          program that is generating the content. List the path to
+          the pipe.</p>
+        </item>
+        <item>
+          <p>An executable program. <app>Balsa</app> will execute the
+          program and read its output, appending that text to the
+          message. List the path to the program with a "|"
+          prepended to it. For example:</p>
+          <p>"|/home/user/dynsig.pl"</p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <title>
+        <gui>Execute Signature</gui>
+      </title>
+      <p>Exécute les instructions contenues dans le fichier signature et ajoute le résultat en tant que 
signature des courriels sortants. Sélectionnez cette option quand vous générez la signature à l'aide d'un 
programme comme décrit ci-dessus dans Chemin de la signature.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature</gui>
+      </title>
+      <p>Ajoute la signature à la fin de tout courriel sortant.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature When Forwarding</gui>
+      </title>
+      <p>Inclut la signature lorsque vous faites suivre un courriel existant.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Include Signature When Replying</gui>
+      </title>
+      <p>Ajoute la signature lorsque vous répondez à un courriel.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Add Signature Separator</gui>
+      </title>
+      <p>When checked, this has <app>Balsa</app> insert the standard
+      signature separator before your signature.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Prepend Signature</gui>
+      </title>
+      <p>Ajoute la signature avant le texte du message, au lieu de la placer à la fin.</p>
+    </item>
+  </terms>
+  <p>Les paramètres de sécurité se définissent dans le quatrième onglet :</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Sign messages by default.</gui>
+      </title>
+      <p>By default enable the cryptographic signature for every
+      new message. The default protocol is determined by the
+      "Default protocol" option.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Encrypt messages by default.</gui>
+      </title>
+      <p>By default encrypt every new message. The default protocol
+      is determined by the "Default protocol" option.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Default protocol.</gui>
+      </title>
+      <p>Choisit le protocole par défaut pour la signature chiffrée et le chiffrement des messages.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Always trust GnuPG keys when encrypting.</gui>
+      </title>
+      <p>Ne demande pas de confirmation lors du chiffrement d'un message dont le destinataire n'a pas de clé 
GnuPG entièrement approuvée.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Remind me if messages can be encrypted.</gui>
+      </title>
+      <p>Avant d'envoyer un message, vérifie si des clés valides sont présentes pour tous les destinataires 
et affiche une boîte de dialogue dans ce cas.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Use secret key with this id for signing.</gui>
+      </title>
+      <p>Usually, <app>Balsa</app> automatically selects a proper secret
+      key for cryptographic signatures from the identity's mail
+      address. Therefore, most users should leave this entry empty.
+      If you want to force using a specific secret key for
+      cryptographic signatures, enter the key id here. You can get
+      the key id by running the command
+      <cmd>gpg --list-secret-keys</cmd>.</p>
+    </item>
+  </terms>
+  <note>
+    <p>These security options are available only if <app>Balsa</app> is
+    built with
+    <app>GnuPG</app> support.</p>
+  </note>
+</page>
diff --git a/doc/fr/index.page b/doc/fr/index.page
new file mode 100644
index 0000000..3330a0b
--- /dev/null
+++ b/doc/fr/index.page
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="guide" id="index" xml:lang="fr">
+  <title><app>Balsa</app> User's Guide</title>
+  <info>
+    <link type="next" xref="introduction"/>
+    <credit type="maintainer">
+      <name>Pawel Salek</name>
+    </credit>
+    <credit type="copyright">
+      <name>Stuart Parmenter et d'autres, consultez la liste dans le fichier AUTHORS</name>
+      <years>1997-2013</years>
+    </credit>
+    <license>
+      <p>Permission vous est donnée de réaliser et de diffuser des copies textuelles de ce manuel à 
condition que la notice de copyright et celle de la présente autorisation soient préservées dans toutes les 
copies.</p>
+      <p>Permission vous est donnée de copier et de diffuser des versions modifiées de ce manuel aux mêmes 
conditions que celles pour la copie textuelle, à condition que la totalité de l'œuvre dérivée soit distribuée 
sous les termes d'une notice d'autorisation identique à la présente.</p>
+      <p>Permission vous est donnée de copier et de diffuser des traductions de ce manuel dans d'autres 
langues aux conditions ci-dessus relatives aux versions modifiées, excepté le fait que cette notice 
d'autorisation doit être formulée dans une traduction approuvée par la Free Software Foundation.</p>
+      <p>UNIX est une marque déposée de X/Open Group.</p>
+      <p>Linux est une marque déposée de Linus Torvalds.</p>
+      <p>X Window System est une marque déposée de X Consortium, Inc.</p>
+      <p>Windows est une marque déposée de Microsoft Corp.</p>
+      <p>Macintosh et Apple sont des marques déposées de Apple Computer, Inc.</p>
+      <p>Toutes les autres marques déposées appartiennent à leur propriétaire respectif.</p>
+    </license>
+  </info>
+  <p><app>Balsa</app> is a graphical mail client. While it is in active
+  development, <app>Balsa</app> has many features such as: <link xref="glossary#imap">IMAP</link>
+  and <link xref="glossary#pop">POP3</link> support; sendmail or direct <link 
xref="glossary#smtp">SMTP</link> support;
+  optional multi-threaded retrieval and sending of messages;
+  support for all configurations of local mail folders; automatic
+  mail checking; mail printing; inline attachment viewing; and the
+  proverbial much, much more.</p>
+  <p>This document will introduce a person who understands mail to
+  using <app>Balsa</app>. However, it will not explain email to a
+  confused individual. If you're looking for that, try asking a
+  friend or visiting the
+  <link href="http://www.cs.queensu.ca/FAQs/email/"; type="http">
+  Email FAQ</link>.</p>
+</page>
diff --git a/doc/fr/introduction.page b/doc/fr/introduction.page
new file mode 100644
index 0000000..14d1822
--- /dev/null
+++ b/doc/fr/introduction.page
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="introduction" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="next" xref="getting-started"/>
+  </info>
+  <title>Introduction</title>
+  <media src="figures/balsa_logo.png" format="PNG" srccredit="tigert"/>
+  <p><app>Balsa</app> is a graphical mail client. It supports the
+  standard features of any good reader and has new features added
+  continually. See the abstract above for a quick feature
+  rundown.</p>
+  <p><app>Balsa</app> is written using GTK+ and GNOME. Originally based
+  on libmutt, the back end code to <app>Mutt</app>, <app>Balsa</app> now uses
+  a combination of GMime for handling Mime messages, and its own
+  drivers for local and remote mailstores.</p>
+  <p>If you want to learn more about <app>Balsa</app>, your best bet is
+  the mailing list
+  <code>balsa-list gnome org</code>, to which you can subscribe by
+  going to the website
+  <link href="http://mail.gnome.org/mailman/listinfo/balsa-list";>
+  http://mail.gnome.org/mailman/listinfo/balsa-list</link> or by
+  sending a message with a subject of
+  <em>subscribe</em> to
+  <link href="mailto:balsa-list-request gnome org?subject=Subscribe">
+  balsa-list-request gnome org</link>. Bugs can be reported via
+  <app>bug-buddy</app> or to the
+  <link href="http://bugzilla.gnome.org/enter_bug.cgi?product=balsa";>
+  Gnome bug tool</link>.</p>
+</page>
diff --git a/doc/fr/its-not-working.page b/doc/fr/its-not-working.page
new file mode 100644
index 0000000..a86ce77
--- /dev/null
+++ b/doc/fr/its-not-working.page
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="its-not-working" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Ça ne fonctionne pas !!!</title>
+  <p>This is a FAQ for when <app>Balsa</app> appears to lock up, or
+  other things that you think should be happening aren't. If you
+  can't figure out how to do something but <app>Balsa</app> lets you do
+  it, that's a bug. Report it.</p>
+  <list>
+    <item>
+      <p>
+        <link xref="its-not-working#main-to-imap">i
+        I want one of the main
+        folders to be IMAP</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#frozen">
+        <app>Balsa</app>'s frozen!</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#spooky-win">
+        What's that window that flashed
+        on the screen?</link>
+      </p>
+    </item>
+    <item>
+      <p>
+        <link xref="its-not-working#address-book">
+        The address book doesn't
+        import my addresses.</link>
+      </p>
+    </item>
+  </list>
+  <section id="main-to-imap">
+    <title>Je veux qu'une boîte aux lettres de base utilise IMAP</title>
+    <p>See
+    <link xref="common-tasks#ct-main-folder-imap">this section</link>.</p>
+  </section>
+  <section id="frozen">
+    <title><app>Balsa</app>'s frozen!</title>
+    <p>Il ne l'est probablement pas. Vérifiez que :</p>
+    <list>
+      <item>
+        <p>If you don't have threading, <app>Balsa</app> will stop
+        responding when it sends and receives email. Use threading,
+        if possible.</p>
+      </item>
+      <item>
+        <p><app>Balsa</app> is downloading a new message or closing a
+        large mailbox. This could take a while, especially when
+        this file is accessed via NFS.</p>
+      </item>
+      <item>
+        <p>Une boîte de dialogue est affichée, mais elle est cachée par une autre. Cela semble se produire 
avec Sawfish. Déplacez les fenêtres et cherchez s'il n'y a pas de boîte de dialogue en arrière plan.</p>
+      </item>
+    </list>
+  </section>
+  <section id="spooky-win">
+    <title>Qu'est-ce que cette fenêtre qui a clignoté à l'écran ?</title>
+    <p>Were you checking your mail? Probably. This is the window
+    that displays progress for retrieving <link xref="glossary#pop">POP3</link> mail. If you
+    don't have any <link xref="glossary#pop">POP3</link> accounts, it will still appear -- but
+    it'll disappear almost instantly. You can disable displaying
+    this window in preferences.</p>
+  </section>
+  <section id="address-book">
+    <title>Le carnet d'adresses n'importe pas mes adresses</title>
+    <p><app>Balsa</app> attempts to open the file
+    <file>~/.gnome/GnomeCard.gcrd</file>. If you're not using this
+    file, you may need to create a symlink so that <app>Balsa</app> can
+    open it.</p>
+    <p>There have been slight changes in <app>GnomeCard</app>'s file
+    format between its various versions. <app>Balsa</app> is known to
+    work with at least <app>GnomeCard</app> version 1.0.10 and probably
+    most other releases.</p>
+  </section>
+</page>
diff --git a/doc/fr/mbox-formats.page b/doc/fr/mbox-formats.page
new file mode 100644
index 0000000..1c7bf06
--- /dev/null
+++ b/doc/fr/mbox-formats.page
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="mbox-formats" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Available Mailbox Formats</title>
+  <p><app>Balsa</app> handles several mailbox formats, including mbox.
+  Further information can be found in the following documents:</p>
+  <terms>
+    <item>
+      <title>Benchmarking mbox versus maildir</title>
+      <p>
+        <link href="http://www.courier-mta.org/mbox-vs-maildir/";>
+        http://www.courier-mta.org/mbox-vs-maildir/</link>
+      </p>
+    </item>
+    <item>
+      <title>Mailbox Format Characteristics</title>
+      <p>
+        <link href="http://www.washington.edu/imap/documentation/formats.txt.html";>
+        http://www.washington.edu/imap/documentation/formats.txt.html</link>
+      </p>
+    </item>
+    <item>
+      <title>Maildir format</title>
+      <p>maildir(5) manual page (from qmail):
+      <link href="http://www.qmail.org/qmail-manual-html/man5/maildir.html";>
+      http://www.qmail.org/qmail-manual-html/man5/maildir.html</link></p>
+    </item>
+    <item>
+      <title>Using Maildir format</title>
+      <p>
+        <link href="http://cr.yp.to/proto/maildir.html";>
+        http://cr.yp.to/proto/maildir.html</link>
+      </p>
+    </item>
+    <item>
+      <title>QMail</title>
+      <p>mbox(5) manual page (from qmail):
+      <link href="http://www.qmail.org/qmail-manual-html/man5/mbox.html";>
+      http://www.qmail.org/qmail-manual-html/man5/mbox.html</link></p>
+    </item>
+    <item>
+      <title>Mailbox formats</title>
+      <p>(From Mail-Administrator HOWTO):
+      <link href="http://linuxdocs.org/HOWTOs/Mail-Administrator-HOWTO-3.html#ss3.5";>
+      http://linuxdocs.org/HOWTOs/Mail-Administrator-HOWTO-3.html#ss3.5</link></p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/fr/preferences-address-books.page b/doc/fr/preferences-address-books.page
new file mode 100644
index 0000000..bb85921
--- /dev/null
+++ b/doc/fr/preferences-address-books.page
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-address-books" xml:lang="fr">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Address Book Preferences</title>
+  <p><app>Balsa</app> supports the use of multiple address books, both
+  local
+  <link xref="glossary#vcard">VCARD</link> and remote <link xref="glossary#ldap">LDAP</link>
+  address books, both of which can be configured here.
+  <app>GnomeCard</app> also uses VCARD address books, so this allows
+  <app>Balsa</app> to share address books with other GNOME
+  applications.</p>
+  <p><app>Balsa</app> also supports LDIF address books, and can be built
+  to use GPE address books, when SQLite is available, and Rubrica
+  address books. Which types are supported depends on how
+  <app>Balsa</app> was built.</p>
+  <p>The main portion of the preferences page is occupied by the
+  list of current address books for <app>Balsa</app>. The list shows the
+  type of address book, the name, and whether it is included in
+  automatic alias expansion when typing new messages. There are
+  also several buttons that manipulate the list of address
+  books:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Add</gui>
+      </title>
+      <p>Using this adds a new address book for <app>Balsa</app> to use
+      to find addresses. If you click it, a drop-down menu of the
+      supported address book types is shown. Click one to begin the
+      process. <app>Balsa</app> pops up a dialog, which, if you choose
+      VCARD, looks like this:</p>
+      <figure>
+        <title>VCARD Address Book Dialog</title>
+        <media type="image" src="figures/address-book-vcard.png"/>
+      </figure>
+      <p>With <link xref="glossary#ldap">LDAP</link> support, the dialog looks somewhat
+      different, offering options to set the location of the
+      directory instead of a file.</p>
+      <figure>
+        <title><link xref="glossary#ldap">LDAP</link> Address Book Dialog</title>
+        <media type="image" src="figures/address-book-ldap.png"/>
+      </figure>
+      <p>In order to use a LDAP address book, you need to know the
+      host name of the LDAP server. Depending on the server
+      configuration, you may need also so called Base Domain Name
+      which identifies your particular department. You can always
+      try leaving Base Domain Name field empty and a default value
+      will be used (OpenLDAP stores the default Base Domain Name in
+
+      <file>/etc/openldap/ldap.conf</file>). If this does not work,
+      you may need to ask your administrator for the value of this.
+      The usual values are usually similar to:
+      "dc=theochem,dc=KTH,dc=se" or "o=Theoretical Chemistry,
+      c=SE".</p>
+    </item>
+    <item>
+      <title>
+        <gui>Modify</gui>
+      </title>
+      <p>Vous permet de modifier les propriétés du carnet d'adresse sélectionné.</p>
+      <figure>
+        <title>Modifier un carnet d'adresses</title>
+        <media type="image" src="figures/address-book-modify.png"/>
+      </figure>
+      <p>Il est possible de modifier à la fois le nom et l'emplacement de tout carnet d'adresse. Vous pouvez 
aussi activer ou non la complétion automatique des adresses à partir du contenu du carnet lors de l'envoi 
d'un message.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Delete</gui>
+      </title>
+      <p>Supprime le carnet d'adresses sélectionné.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Set as Default</gui>
+      </title>
+      <p>Définit le carnet d'adresses sélectionné comme carnet par défaut.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/fr/preferences-display-options.page b/doc/fr/preferences-display-options.page
new file mode 100644
index 0000000..7c6759b
--- /dev/null
+++ b/doc/fr/preferences-display-options.page
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-display-options" xml:lang="fr">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Display Preferences</title>
+  <p>This page controls how <app>Balsa</app> appears to you.</p>
+  <section>
+    <title>Fenêtre principale</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Use Preview Pane</gui>
+        </title>
+        <p>Définit si l'affichage des messages s'opère dans le volet d'aperçu ou dans une fenêtre 
d'affichage séparée.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Show Mailbox Info</gui>
+        </title>
+        <p>This will allow the number of total and unread messages
+        for each mailbox to be shown in the left pane of the
+        <app>Balsa</app> main window. You can save space by not showing
+        them; if you choose not to show them, <app>Balsa</app> will then
+        show the number of unread messages (in parentheses) after
+        the mailbox name.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Alternative Layout</gui>
+        </title>
+        <p><app>Balsa</app>'s default layout has a full-height mailbox
+        list on the left, and the message list above the preview
+        pane on the right. You can choose an alternative layout, in
+        which the mailbox list and the message list occupy the
+        upper part of the window, and the preview pane is
+        full-width below them.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatic View</gui>
+        </title>
+        <p>Select this option if you want <app>Balsa</app> to open the
+        first unread message when you open a mailbox. If no message
+        is unread, <app>Balsa</app> opens the most recent message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Page Up and Page Down</gui>
+        </title>
+        <p>By default, the 
+        <key>Page Up</key>and 
+        <key>Page Down</key>keys scroll the message by whole pages.
+        Use this option to choose a different amount.</p>
+      </item>
+    </terms>
+  </section>
+  <section>
+    <title>Fenêtre de message</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Moving a Message</gui>
+        </title>
+        <p>If you are reading a message in its own message window
+        and you move it (to the trash, or another mailbox),
+        <app>Balsa</app> can move on the next unread message or the next
+        message in the same mailbox, or simply close the
+        window.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="sort-and-thread">
+    <title>Tri et fils</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Default sort column</gui>
+        </title>
+        <p>Choisissez la colonne sur laquelle vous voulez effectuer le tri dans les nouvelles boîtes aux 
lettres.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Default threading style</gui>
+        </title>
+        <p>Choisissez le style par défaut des fils de discussion pour les nouvelles boîtes aux lettres.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Expand threads</gui>
+        </title>
+        <p>Si vous choisissez d'afficher une boîte aux lettres sous forme de fil de discussion, vous pouvez 
décider si les messages du fil doivent être déroulés ou enroulés quand la boîte est ouverte.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="message">
+    <title>Message</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Fonts</gui>
+        </title>
+        <p>Choisissez la police de caractères à utiliser pour l'affichage des messages. Vous pouvez choisir 
une police différente pour la ligne Sujet du message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Quoted Text Regular Expression</gui>
+        </title>
+        <p>The entry box allows you to set a
+        <link xref="glossary#regular-expression">regular
+        expression</link>you would like to use to identify text
+        that should be considered quoted for incoming messages. The
+        regular expression should match the beginning of line of
+        quoted text a single level deep, the program will then use
+        this to calculate the depth of quoting and alter the quoted
+        text colors appropriately. A default regexp is provided
+        that should work in most situations.</p>
+        <p>This regexp affects both highlighting and spell
+        checking, and uses the extended regular expression set. For
+        more information see the
+        <cmd>grep</cmd>(1) manual or info page.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Alternative Parts</gui>
+        </title>
+        <p>You can choose whether <app>Balsa</app> should show a
+        text/plain part or a text/html part, when a message
+        contains both.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="colors">
+    <title>Couleurs</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Message Colors</gui>
+        </title>
+        <p>Choisissez les couleurs du texte cité.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Link Color</gui>
+        </title>
+        <p><app>Balsa</app> uses this color to highlight a hyperlink in
+        a message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Composition Window</gui>
+        </title>
+        <p>When you are composing a message, <app>Balsa</app> uses color
+        to show when one of the address fields is incomplete.
+        Choose that color here.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="format">
+    <title>Formats</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Date Encoding</gui>
+        </title>
+        <p>Set the format used to display dates in <app>Balsa</app>.
+        This uses the same format string as 
+        <code>strftime</code>, a summary which is provided
+        below:</p>
+        <list>
+          <item>
+            <p>
+            <code>%a</code>-- The abbreviated weekday
+            name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%A</code>-- The full weekday name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%b</code>-- The abbreviated month name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%B</code>-- The full month name.</p>
+          </item>
+          <item>
+            <p>
+            <code>%d</code>-- The day of the month.</p>
+          </item>
+          <item>
+            <p>
+            <code>%R</code>-- The time using a 24-hour clock.
+            (HH:MM)</p>
+          </item>
+          <item>
+            <p>
+            <code>%r</code>-- The time using a 12-hour clock
+            (HH:MM AM/PM).</p>
+          </item>
+          <item>
+            <p>
+            <code>%T</code>-- The time using a 24-hour clock,
+            with seconds (HH:MM:SS).</p>
+          </item>
+        </list>
+        <note>
+          <p>See the 
+          <code>strftime</code>manual page for a full listing of
+          conversion specifiers.</p>
+        </note>
+      </item>
+      <item>
+        <title>
+          <gui>Selected Headers</gui>
+        </title>
+        <p>Une liste, séparée par des espaces, des en-têtes à afficher dans la fenêtre des messages.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Fallback codeset</gui>
+        </title>
+        <p>Some messages contain national characters without
+        specifying how they are encoded. You can choose whether
+        <app>Balsa</app> displays such characters as '?', or tries a
+        specific character set to display such messages.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="status-messages">
+    <title>Messages d'état</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Information Messages</gui>
+        </title>
+        <p><app>Balsa</app> gives you information in the form of five
+        different levels of messages. You can specify how you want
+        all five levels to be presented to you.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display Progress</gui>
+        </title>
+        <p>This sets the behaviour of the dialog that is shown when
+        <app>Balsa</app> retrieves messages from it's specified
+        <link xref="glossary#pop">POP3</link> servers. The dialog can be shown only while the
+        messages are being retrieved, automatically closing after
+        <app>Balsa</app> is finished. Or it can be set to stay active
+        until manually closed. Finally, the dialog can not be
+        displayed at all.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/fr/preferences-incoming-and-outgoing-mail.page 
b/doc/fr/preferences-incoming-and-outgoing-mail.page
new file mode 100644
index 0000000..55aad6e
--- /dev/null
+++ b/doc/fr/preferences-incoming-and-outgoing-mail.page
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.ent">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-incoming-and-outgoing-mail" 
xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Incoming and Outgoing Mail Preferences</title>
+  <p>Use this page to set the <app>Balsa</app>'s behaviour regarding
+  incoming and outgoing messages.</p>
+  <section id="incoming">
+    <title>Entrants</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Check Mail Automatically</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will connect to your <link xref="glossary#pop">POP3</link>
+        servers at the given interval and check for mail.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check IMAP mailboxes</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will include your IMAP
+        mailboxes when checking for mail. You can also specify that
+        INBOX is the only mailbox to be checked.</p>
+        <p>La durée de la vérification dans les boîtes aux lettres IMAP peut se révèler longue ; les options 
suivantes vous donnent un meilleur contrôle sur le temps que la vérification prend.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display message if new mail has arrived</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will alert you when mail has
+        arrived.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Do background check quietly</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will give you no indication
+        that a background mail check is in progress.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Wrap Incoming Text</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will wrap text of incoming
+        messages at the specified line length.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reflow messages of type
+          `text/plain;format=flowed'</gui>
+        </title>
+        <p>Le paramètre « format » distingue deux façons de représenter les paragraphes dans les messages du 
type « Texte/brut » (texte simple). La valeur « flux » indique que les paragraphes sont coupés en lignes 
terminées par des sauts de ligne « logiques » : un espace est laissé en fin de ligne. Un saut de ligne manuel 
(non précédé par un espace) indique la fin d'un paragraphe.</p>
+        <p><app>Balsa</app> can reflow the paragraphs, quoted or
+        otherwise, in a message of this type. Reflowing eliminates
+        the line fragments that are left when text is first wrapped
+        at one length and then rewrapped to a shorter length, which
+        are often misquoted.</p>
+        <p>The only other value of `format' is `fixed', which is
+        the value assumed by default when `format' is not
+        specified, as with older mailers. In this case, all line
+        breaks must be respected. If you do not select the
+        `Reflow...' option, <app>Balsa</app> will treat all messages of
+        type `text/plain' as if they were `format=fixed'. Long
+        lines will still be wrapped, if the `Wrap Incoming
+        Messages' option is selected, but this will usually leave
+        unquoted line fragments.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Message Disposition Notification request</gui>
+        </title>
+        <p>You will sometimes receive a message whose sender has
+        asked for notification that you have received or seen the
+        message. You can specify how <app>Balsa</app> responds to these
+        requests.</p>
+      </item>
+    </terms>
+  </section>
+  <!-- ################################################################# -->
+  <!--             SUBSECTION: PREFERENCES/MAIL OPTIONS/OUTGOING         -->
+  <!-- ################################################################# -->
+  <section id="outgoing">
+    <title>Sortants</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Wrap Outgoing Text</gui>
+        </title>
+        <p>Have <app>Balsa</app> wrap all outgoing mail at the specified
+        column.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply prefix</gui>
+        </title>
+        <p>The string that <app>Balsa</app> should use as a prefix when
+        quoting a message. Note: When you send a message with 
+        <gui>format=flowed</gui>, <app>Balsa</app> is required to use
+        the one-character string "&gt;".</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatically quote original when replying</gui>
+        </title>
+        <p>Have <app>Balsa</app> include the text of a message in the
+        reply. The text will be prefixed as shown above.</p>
+        <p>Vous pouvez aussi inclure le message original à l'aide de l'option du menu « Éditer » ou en 
glissant-déposant le message de l'index des messages dans la zone de texte de votre réponse. Si vous préférez 
inclure le texte de cette façon, ne sélectionnez pas l'option « Mettre automatiquement ... en citation ... 
».</p>
+      </item>
+      <item>
+        <title>
+          <gui>Don't include HTML parts as text when replying or
+          forwarding mail</gui>
+        </title>
+        <p>Tell <app>Balsa</app> to be sensible.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Forward a mail as attachment instead of quoting
+          it</gui>
+        </title>
+        <p>Si cette option est sélectionnée, les messages qui sont « automatiquement cités » seront en fait 
mis en pièces jointes sans modification, au lieu d'être inclus dans le texte de la réponse avec le préfixe ad 
hoc.</p>
+        <p>Vous pouvez aussi attacher n'importe quel message dans un nouveau en le faisant glisser de 
l'index des messages dans la zone des pièces jointes du nouveau message (ou, en fait, n'importe quelles 
parties du message exceptées la zone de texte ou les adresses).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Send button always queues outgoing mail in
+          outbox</gui>
+        </title>
+        <p>This option gives you control over when <app>Balsa</app>
+        connects to a server to send messages.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Copy outgoing messages to sentbox</gui>
+        </title>
+        <p>Have <app>Balsa</app> save a copy of each message you send in
+        the mailbox marked as the `Sentbox'.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Encoding</gui>
+        </title>
+        <p>Définit la méthode de codage des caractères à 7 bits, 8 bits ou ce que le message cité 
utilise.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/fr/preferences-mail-options.page b/doc/fr/preferences-mail-options.page
new file mode 100644
index 0000000..775d7e4
--- /dev/null
+++ b/doc/fr/preferences-mail-options.page
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-mail-options" xml:lang="fr">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Mail Server Preferences</title>
+  <p>Cette page vous permet de définir comment vous recevez les courriers électroniques POP3, comment vous 
les envoyez, etc.</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Remote Mailbox Servers</gui>
+      </title>
+      <p>These are <link xref="glossary#imap">IMAP</link> and <link xref="glossary#pop">POP3</link> servers 
that you
+      receive email from. The three buttons let you create, modify,
+      and remove records. <link xref="glossary#pop">POP3</link> mailboxes will not show up in
+      the mailbox list. You can specify multiple servers, when
+      adding a server you will be asked to give:</p>
+      <list>
+        <item>
+          <p>Le nom pour identifier la boîte aux lettres.</p>
+        </item>
+        <item>
+          <p>Le serveur sur lequel vous disposez d'une boîte aux lettres POP.</p>
+        </item>
+        <item>
+          <p>Le port utilisé pour se connecter au serveur. Le numéro du port est habituellement 110 mais 
vous pouvez le modifier si, par exemple, vous utilisez un tunnel pour votre connexion.</p>
+        </item>
+        <item>
+          <p>Le nom d'utilisateur sur le serveur de boîtes aux lettres.</p>
+        </item>
+        <item>
+          <p>Le mot de passe correspondant.</p>
+        </item>
+        <item>
+          <p>Si vous voulez supprimer les messages sur le serveur en cochant ou non la case « Supprimer les 
messages du serveur après le téléchargement ».</p>
+        </item>
+        <item>
+          <p>You can choose to have messages filtered through
+          <app>procmail</app> .</p>
+        </item>
+        <item>
+          <p>The
+          <app>procmail</app> command.</p>
+        </item>
+        <item>
+          <p>Si vous voulez vérifier ou non la présence de nouveaux messages.</p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <title>
+        <gui>Local Mail Directory</gui>
+      </title>
+      <p>This is the directory that <app>Balsa</app> will scan looking
+      for mail folders.</p>
+    </item>
+    <item>
+      <title id="smtp-server-config">
+        <gui>Outgoing Mail Servers</gui>
+      </title>
+      <p>Most users will need only one outgoing mail server, but
+      you may need to use more than one. <app>Balsa</app> allows you to
+      set up as many as you need. The server used for a particular
+      message is controlled by the
+      <link xref="identities">identity</link> you choose for the
+      message.</p>
+      <p>To view or change the details of a server, select it and
+      click
+      <gui>Modify</gui> . To create a new server, click
+      <gui>Add</gui> . A dialog will open, showing the properties of
+      the selected server. Specify the domain name and optionally
+      the port for of the SMTP server you use for submitting mail.
+      Please note that the default port number is 587. The syntax
+      is hostname[:port]. Port can be a decimal number or the name
+      of the service as specified in
+      <file>/etc/services</file> . Typically you can just set this
+      to "localhost:smtp". <app>Balsa</app> can also break up a large
+      message into fragments, which can be reassembled by
+      <app>Balsa</app> or any RFC 2046-compliant mailer. This dialog
+      allows you to set this option, and the size above which a
+      message should be split.</p>
+      <p>You will be asked to give:</p>
+      <list>
+        <item>
+          <p>Un nom pour décrire et identifier le serveur.</p>
+        </item>
+        <item>
+          <p>Le nom de domaine et le port.</p>
+        </item>
+        <item>
+          <p>Le nom d'utilisateur sur le serveur SMTP. Si le serveur SMTP distant nécessite une 
authentification, saisissez votre nom d'utilisateur ici. Notez que le format exact dépend du MTA utilisé. Par 
exemple, certains systèmes attendent un nom d'utilisateur, d'autres une adresse électronique.</p>
+        </item>
+        <item>
+          <p>La phrase de passe correspondante. Si le serveur SMTP nécessite une authentification, saisissez 
votre phrase de passe ici. Certains systèmes utilisent « mot de passe » pour « phrase de passe ». Les limites 
de la longueur de la phrase de passe dépendent du serveur SMTP.</p>
+        </item>
+        <item>
+          <p>When you want <app>Balsa</app> to use TLS.</p>
+        </item>
+        <item>
+          <p>La phrase de passe du certificat TLS.</p>
+        </item>
+        <item>
+          <p>S'il faut couper les messages de taille importante et la taille de seuil.</p>
+        </item>
+      </list>
+    </item>
+  </terms>
+  <section id="incoming">
+    <title>Entrants</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Check Mail Automatically</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will connect to your <link xref="glossary#pop">POP3</link>
+        servers at the given interval and check for mail.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check IMAP mailboxes</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will include your IMAP
+        mailboxes when checking for mail. You can also specify that
+        INBOX is the only mailbox to be checked.</p>
+        <p>La durée de la vérification dans les boîtes aux lettres IMAP peut se révèler longue ; les options 
suivantes vous donnent un meilleur contrôle sur le temps que la vérification prend.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Display message if new mail has arrived</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will alert you when mail has
+        arrived.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Do background check quietly</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will give you no indication
+        that a background mail check is in progress.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Wrap Incoming Text</gui>
+        </title>
+        <p>If selected, <app>Balsa</app> will wrap text of incoming
+        messages at the specified line length.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reflow messages of type
+          `text/plain;format=flowed'</gui>
+        </title>
+        <p>Le paramètre « format » distingue deux façons de représenter les paragraphes dans les messages du 
type « Texte/brut » (texte simple). La valeur « flux » indique que les paragraphes sont coupés en lignes 
terminées par des sauts de ligne « logiques » : un espace est laissé en fin de ligne. Un saut de ligne manuel 
(non précédé par un espace) indique la fin d'un paragraphe.</p>
+        <p><app>Balsa</app> can reflow the paragraphs, quoted or
+        otherwise, in a message of this type. Reflowing eliminates
+        the line fragments that are left when text is first wrapped
+        at one length and then rewrapped to a shorter length, which
+        are often misquoted.</p>
+        <p>The only other value of `format' is `fixed', which is
+        the value assumed by default when `format' is not
+        specified, as with older mailers. In this case, all line
+        breaks must be respected. If you do not select the
+        `Reflow...' option, <app>Balsa</app> will treat all messages of
+        type `text/plain' as if they were `format=fixed'. Long
+        lines will still be wrapped, if the `Wrap Incoming
+        Messages' option is selected, but this will usually leave
+        unquoted line fragments.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Message Disposition Notification request</gui>
+        </title>
+        <p>You will sometimes receive a message whose sender has
+        asked for notification that you have received or seen the
+        message. You can specify how <app>Balsa</app> responds to these
+        requests.</p>
+      </item>
+    </terms>
+  </section>
+  <!-- ################################################################# -->
+  <!--             SUBSECTION: PREFERENCES/MAIL OPTIONS/OUTGOING         -->
+  <!-- ################################################################# -->
+  <section id="outgoing">
+    <title>Sortants</title>
+    <terms>
+      <item>
+        <title>
+          <gui>Wrap Outgoing Text</gui>
+        </title>
+        <p>Have <app>Balsa</app> wrap all outgoing mail at the specified
+        column.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply prefix</gui>
+        </title>
+        <p>The string that <app>Balsa</app> should use as a prefix when
+        quoting a message. Note: When you send a message with 
+        <gui>format=flowed</gui>, <app>Balsa</app> is required to use
+        the one-character string "&gt;".</p>
+      </item>
+      <item>
+        <title>
+          <gui>Automatically quote original when replying</gui>
+        </title>
+        <p>Have <app>Balsa</app> include the text of a message in the
+        reply. The text will be prefixed as shown above.</p>
+        <p>Vous pouvez aussi inclure le message original à l'aide de l'option du menu « Éditer » ou en 
glissant-déposant le message de l'index des messages dans la zone de texte de votre réponse. Si vous préférez 
inclure le texte de cette façon, ne sélectionnez pas l'option « Mettre automatiquement ... en citation ... 
».</p>
+      </item>
+      <item>
+        <title>
+          <gui>Don't include HTML parts as text when replying or
+          forwarding mail</gui>
+        </title>
+        <p>Tell <app>Balsa</app> to be sensible.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Forward a mail as attachment instead of quoting
+          it</gui>
+        </title>
+        <p>Si cette option est sélectionnée, les messages qui sont « automatiquement cités » seront en fait 
mis en pièces jointes sans modification, au lieu d'être inclus dans le texte de la réponse avec le préfixe ad 
hoc.</p>
+        <p>Vous pouvez aussi attacher n'importe quel message dans un nouveau en le faisant glisser de 
l'index des messages dans la zone des pièces jointes du nouveau message (ou, en fait, n'importe quelles 
parties du message exceptées la zone de texte ou les adresses).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Send button always queues outgoing mail in
+          outbox</gui>
+        </title>
+        <p>This option gives you control over when <app>Balsa</app>
+        connects to a server to send messages.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Copy outgoing messages to sentbox</gui>
+        </title>
+        <p>Have <app>Balsa</app> save a copy of each message you send in
+        the mailbox marked as the `Sentbox'.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Encoding</gui>
+        </title>
+        <p>Définit la méthode de codage des caractères à 7 bits, 8 bits ou ce que le message cité 
utilise.</p>
+      </item>
+    </terms>
+  </section>
+</page>
diff --git a/doc/fr/preferences-miscellaneous.page b/doc/fr/preferences-miscellaneous.page
new file mode 100644
index 0000000..a97c2b2
--- /dev/null
+++ b/doc/fr/preferences-miscellaneous.page
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-miscellaneous" xml:lang="fr">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Miscellaneous Preferences</title>
+  <terms>
+    <item>
+      <title>
+        <gui>Debug</gui>
+      </title>
+      <p>Toggle the output of debugging information. Depending on
+      what notification priority set for it in the
+      <link xref="preferences-display-options">
+      Display</link> page, it can show up in list or dialog as the
+      program runs.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Empty Trash on Exit</gui>
+      </title>
+      <p>Set <app>Balsa</app> to delete all messages in the
+      <code>Trash</code> mailbox when <app>Balsa</app> exits.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Automatically close mailbox</gui>
+      </title>
+      <p>Set <app>Balsa</app> to close any mailbox that is unused for
+      more than the specified time. The currently displayed mailbox
+      is never automatically closed.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Hide messages marked as deleted</gui>
+      </title>
+      <p>When a message is moved to another mailbox, including the
+      <code>Trash</code> mailbox, it is actually copied to the
+      destination, and the original is marked as deleted. Deleted
+      messages may either be shown in the mailbox index, with the
+      trashcan icon indicating that they are deleted, or hidden.
+      This item controls which of those actions is taken.</p>
+      <p>A message may also be simply marked as deleted, without
+      copying it to another mailbox:
+      <guiseq>
+        <gui>Message</gui>
+        <gui>Toggle flag</gui>
+        <gui>Deleted</gui>
+      </guiseq>. Again, this item controls whether such a message
+      is hidden.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Expunge deleted messages on close</gui>
+      </title>
+      <p>"Expunging" is the act of physically removing from the
+      backing mailstore all messages marked as deleted. You can
+      expunge messages manually:
+      <guiseq>
+        <gui>Mailbox</gui>
+        <gui>Expunge deleted messages</gui>
+      </guiseq>, or you can set <app>Balsa</app> to expunge deleted
+      messages when the mailbox is closed (all mailboxes are closed
+      when you exit <app>Balsa</app>).</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/fr/preferences-spelling.page b/doc/fr/preferences-spelling.page
new file mode 100644
index 0000000..4fc7686
--- /dev/null
+++ b/doc/fr/preferences-spelling.page
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.ent">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-spelling" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Spell Check Preferences</title>
+  <p>If <app>Balsa</app> is using GtkSpell, you can choose to have your
+  spelling checked as you type. <app>Balsa</app> uses GtkSpell's default
+  settings.</p>
+  <p>If <app>Balsa</app> is not using GtkSpell, you can use this pane to
+  setup <app>Balsa</app> spell check options. <app>Balsa</app> uses the
+  Portable Spell Checking library
+  (<link href="http://pspell.sourceforge.net";>pspell</link>) to
+  provide an interface to the spell checking program of your
+  choice. Currently there are modules for ispell or aspell, both of
+  which can be found at the pspell website. For more information
+  visit the <app>Balsa</app> homepage.</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Pspell Module</gui>
+      </title>
+      <p>La bibliothèque Pspell permet d'utiliser le moteur de correction orthographique de votre choix, 
mais par l'intermédiaire de modules à charger. Pour le moment Pspell accepte deux modules : ispell, le module 
traditionnel, et aspell, plus récent et plus perfectionné.</p>
+      <p>
+      <app>Ispell</app> is most likely available on your system as
+      it is a Unix standard; however
+      <app>Aspell</app> is more advanced as it uses an advanced
+      phonetics engine and adaptive techniques to learn how you
+      tend to misspell words. More information is available at the
+      <link href="http://aspell.sourceforge.net";>Aspell
+      website</link>.</p>
+      <p><app>Balsa</app> will attempt to use whatever module you
+      specify here, however if the module is not installed it will
+      not work and generate an error.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Suggestion Mode</gui>
+      </title>
+      <p>Le mode de suggestion détermine la profondeur de recherche par l'ordinateur des suggestions pour 
remplacer les mots mal orthographiés. Il y a trois options :</p>
+      <terms>
+        <item>
+          <title>
+            <gui>Fast</gui>
+          </title>
+          <p>Ce mode effectue une recherche rapide des remplacements possibles ; il est utilisable par un 
utilisateur qui possède une bonne orthographe et ne fait des erreurs typographiques qu'occasionnellement.</p>
+        </item>
+        <item>
+          <title>
+            <gui>Normal</gui>
+          </title>
+          <p>Le mode normal est probablement suffisant pour la plupart des utilisateurs ; il fournira les 
suggestions correctes dans la majorité des cas.</p>
+        </item>
+        <item>
+          <title>
+            <gui>Bad Spellers</gui>
+          </title>
+          <p>Le mode mauvaise orthographe est le mode le plus détaillé et le plus précis ; par contre il est 
aussi le plus lent à fournir la liste de suggestions.</p>
+        </item>
+      </terms>
+    </item>
+    <item>
+      <title>
+        <gui>Ignore Length</gui>
+      </title>
+      <p>Cette option fournit la possibilité d'ignorer les mots dont la longueur est inférieure à celle 
indiquée. Cela peut être utile pour sauter automatiquement des acronymes courts qui sont normalement marqués 
comme incorrects.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/fr/preferences-startup.page b/doc/fr/preferences-startup.page
new file mode 100644
index 0000000..48846e3
--- /dev/null
+++ b/doc/fr/preferences-startup.page
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences-startup" xml:lang="fr">
+  <info>
+    <link type="topic" xref="preferences"/>
+    <link type="guide" xref="preferences"/>
+  </info>
+  <title>Startup Preferences</title>
+  <terms>
+    <item>
+      <title>
+        <gui>Open Inbox upon Startup</gui>
+      </title>
+      <p>If set, <app>Balsa</app> will open your system inbox upon
+      startup.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Check Mail at Startup</gui>
+      </title>
+      <p>If set, <app>Balsa</app> will automatically attempt to download
+      mail from the <link xref="glossary#pop">POP3</link> mail server upon startup, and will
+      check for new mail on an <link xref="glossary#imap">IMAP</link> server.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Remember Open Mailboxes Between Sessions</gui>
+      </title>
+      <p>When marked, <app>Balsa</app> will remember and reopen
+      mailboxes that were open when <app>Balsa</app> was last quit.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Folder Scanning</gui>
+      </title>
+      <p>Scanning a folder tree can be time-consuming, because of
+      the need to explore an entire tree of subfolders. You can
+      defer scanning the tree by setting the scan depth to 1.
+      <app>Balsa</app> will then descend into the tree only far enough
+      to discover whether any folders that you can see have
+      subfolders. The first time you expand any subtree,
+      <app>Balsa</app> will explore more of the tree.</p>
+      <p>Si vous préférez avoir toute l'arborescence disponible dès le démarrage, choisissez une profondeur 
du même ordre que celle de votre arborescence. Des valeurs intermédiaires peuvent aussi être utilisées.</p>
+      <p>You may set the depth for initial scanning separately for
+      local and <link xref="glossary#imap">IMAP</link> trees.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/fr/preferences.page b/doc/fr/preferences.page
new file mode 100644
index 0000000..838363d
--- /dev/null
+++ b/doc/fr/preferences.page
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="preferences" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>Fenêtre des Préférences</title>
+
+<p>
+  <app>Balsa</app> has many more options than the initial assistant reveals.
+  To access the Preferences window, select
+  <guiseq>
+      <gui>Edit</gui> <gui>Preferences</gui>
+  </guiseq>.
+  In the Preferences window, options are organized into groups,
+  and related groups are shown on individual pages.
+  The pages and groups are explained below.
+</p>
+<!--
+<figure>
+  <title>Preferences Window</title>
+  <media type="image" src="figures/preferences-window.png"/>
+</figure>
+-->
+</page>
diff --git a/doc/fr/toolbar-prefs.page b/doc/fr/toolbar-prefs.page
new file mode 100644
index 0000000..83f32b5
--- /dev/null
+++ b/doc/fr/toolbar-prefs.page
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="toolbar-prefs" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Personnalisation des barres d'outils</title>
+  <p><app>Balsa</app> allows you to change the layout of the toolbars on
+  the three main types of window: the
+  <link xref="win-main">main window</link>,
+  <link xref="win-message">message windows</link>, and
+  <link xref="win-composer">compose windows</link>. You open the
+  dialog with the
+  <guiseq>
+    <gui>Settings</gui>
+    <gui>Toolbars...</gui>
+  </guiseq> menu item.</p>
+  <p>The dialog contains a notebook with a page for each type of
+  window. On each page, you'll see a Preview of the toolbar, which
+  changes as you change the layout. The list of
+  <gui>Available buttons</gui> shows buttons that may be used on the
+  toolbar, but aren't currently used, and the
+  <gui>Current toolbar</gui> list shows the current layout,
+  including both buttons and separators. You can add buttons to the
+  current toolbar, remove them, or move them up or down in the
+  list, using the controls in the central button box.</p>
+  <p>Une case à cocher pour introduire un saut de ligne dans le texte des étiquettes de boutons (s'il y a 
lieu) est placée au dessous des onglets. Cette option concerne les barres d'outils des trois types de 
fenêtres. Si vous cochez la case, les étiquettes longues s'afficheront sur deux lignes.</p>
+  <p>This is an "instant apply" dialog: the changes you make take
+  effect immediately, as shown in the Preview toolbar. Below the
+  Preview toolbar you'll find a button that restores the standard
+  layout for that toolbar.</p>
+  <note>
+    <p>Note that the standard layout is the one that you see before
+    the toolbar has been customized. If you use this option, all
+    current <em>and past</em> changes will be undone.</p>
+  </note>
+  <p>A second button below the Preview toolbar pops up a menu that
+  gives you control over what is shown in the toolbar: icons, text,
+  or both. The popup (right click) menu for any actual toolbar
+  offers the same choices, as well as the option to open up this
+  dialog ("Customize Toolbars...").</p>
+</page>
diff --git a/doc/fr/win-composer.page b/doc/fr/win-composer.page
new file mode 100644
index 0000000..d1e857c
--- /dev/null
+++ b/doc/fr/win-composer.page
@@ -0,0 +1,729 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-composer" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Fenêtre de rédaction des messages</title>
+  <figure>
+    <title>Fenêtre de rédaction des messages</title>
+    <media src="figures/newmsg-window.png" format="PNG"/>
+  </figure>
+  <p>When the
+  <gui>New Message</gui> or
+  <gui>Reply</gui> or
+  <gui>Forward</gui> action is selected, the message to be sent is
+  brought up in the Message Composer. This window is where you can
+  type the text of the message, attach files, and specify
+  recipients. The window also provides an interface to spell check
+  the message. Signing and encryption of messages using
+  <app>GnuPG</app> or
+  <app>PGP</app> are also supported, when <app>Balsa</app> is built with
+  cryptographic support.</p>
+  <p>Lorsque la fenêtre de rédaction des messages s'ouvre, les composants principaux suivants apparaissent 
:</p>
+  <list>
+    <item>
+      <p>Barre de menus</p>
+    </item>
+    <item>
+      <p>Barre d'outils</p>
+    </item>
+    <item>
+      <p>En-têtes de courrier</p>
+    </item>
+    <item>
+      <p>Boîte des pièces jointes</p>
+    </item>
+    <item>
+      <p>Corps du message.</p>
+    </item>
+  </list>
+  <p>Nous détaillerons chacun d'entre eux successivement :</p>
+  <section id="win-composer-menu">
+    <title>Barre de menus</title>
+    <p>Elle contient toutes les commandes disponibles pour agir sur le message, de la sélection des en-têtes 
à afficher jusqu'au changement du jeu de caractères du message. Certaines entrées de menu ne sont pas 
toujours disponibles selon l'état du message actuel.</p>
+    <terms>
+      <item>
+        <title>
+          <gui>File</gui>
+        </title>
+        <p>Le menu Fichier contient les commandes pour manipuler le message complet.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Include File...</gui>
+            </guiseq> -- Include a text file in the body of the
+            message; only works for plain text files.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Attach File...</gui>
+            </guiseq> -- Attach any kind of file to the
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Send</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Enter</key>
+            </keyseq> -- Send the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Queue</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Q</key>
+            </keyseq> -- Queue the message in the outbox for
+            sending later.</p>
+            <note>
+              <p>A message is considered valid (ready for sending
+              or queuing) if it contains at least one valid email
+              address, and no invalid addresses, in the
+              <gui>Recipients</gui> fields.</p>
+            </note>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Postpone</gui>
+            </guiseq> -- Save the message in the
+            <code>Draftbox</code> for later revision and sending,
+            and close the compose window. You will be unable to
+            postpone a message that is not currently valid.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Save</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>S</key>
+            </keyseq> -- Save the message in the
+            <code>Draftbox</code> and continue editing.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Page Setup</gui>
+            </guiseq> -- Set print options such as paper size
+            and print orientation.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Print...</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>P</key>
+            </keyseq> -- Print a hard-copy of the current
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>File</gui>
+              <gui>Close</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>W</key>
+            </keyseq> -- Close and discard the current
+            message.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Edit</gui>
+        </title>
+        <p>Le menu Éditer contient les commandes utilisées pour modifier le corps du message.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Undo</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>Z</key>
+            </keyseq> -- Undo the most recent editing
+            action.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Redo</gui>
+            </guiseq>
+            <keyseq>
+              <key>Shift</key>
+              <key>Ctrl</key>
+              <key>Z</key>
+            </keyseq> -- Redo an undone editing action.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Cut</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>X</key>
+            </keyseq> -- Cut the selected text to the
+            clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Copy</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>C</key>
+            </keyseq> -- Copy the selected text to the
+            clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Paste</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>V</key>
+            </keyseq> -- Paste the contents of the clipboard to
+            the current position of the cursor.</p>
+          </item>
+          <item>
+            <p>
+              <guiseq>
+                <gui>Edit</gui>
+                <gui>Select All</gui>
+              </guiseq>
+              <keyseq>
+                <key>Ctrl</key>
+                <key>A</key>
+              </keyseq>
+            </p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Wrap Body</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>B</key>
+            </keyseq> -- Cause all the lines in the message to
+            be wrapped to the specified outgoing mail wrap
+            column.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Reflow Paragraph</gui>
+            </guiseq>
+            <keyseq>
+              <key>Ctrl</key>
+              <key>R</key>
+            </keyseq> -- Cause all selected lines to be wrapped
+            to the specified outgoing mail wrap column.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Edit</gui>
+              <gui>Check Spelling</gui>
+            </guiseq> -- Start spell checking the current
+            message.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Show</gui>
+        </title>
+        <p>Le menu Afficher contrôle le choix des en-têtes modifiables affichés dans la fenêtre de 
rédaction.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Toolbar</gui>
+            </guiseq> -- Show or hide the toolbar.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>From</gui>
+            </guiseq> -- Display the
+            <code>From</code> header.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Recipients</gui>
+            </guiseq> -- Display the
+            <code>To:</code> ,
+            <code>Cc:</code> , and
+            <code>Bcc:</code> addresses.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Reply To</gui>
+            </guiseq> -- Display the
+            <code>Reply-To</code> header.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Show</gui>
+              <gui>Fcc</gui>
+            </guiseq> -- Display the
+            <code>Fcc</code> header; this is the folder to which
+            your copy of the sent message will be saved. The
+            default is your Sentbox.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Language</gui>
+        </title>
+        <p>The Language menu allows you to set the language to use
+        for composing and checking the spelling of the message.
+        Only languages for which you have dictionaries installed
+        are shown.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Options</gui>
+        </title>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Request Disposition Notification</gui>
+            </guiseq> -- If checked <app>Balsa</app> will include
+            the
+            <code>Disposition-Notification-To</code> header line
+            with your
+            <code>From</code> address. Please note that the handling
+            of this request depends on the receiving mail program
+            and that it not guaranteed that this notification will
+            be sent back.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Format = Flowed</gui>
+            </guiseq> -- The "Flowed" format (RFC 3676) breaks
+            the message text into paragraphs, which you type
+            continuously using the
+            <key>Enter</key> key only to mark the end of a
+            paragraph, and "fixed" lines which you mark
+            individually using the
+            <key>Enter</key> key. This allows other mailers that
+            recognize the format to display the text appropriately
+            for the width of the recipient's screen, and to quote
+            the text correctly when constructing a reply. The text
+            is also displayed intelligibly by a non-flowed-aware
+            mailer.</p>
+            <note>
+              <p>Using "Format=Flowed" is strongly recommended. It
+              helps to avert the "embarrassing line wrap" that you
+              see when quoted text is broken across lines and shown
+              with the wrong level of quoting.</p>
+            </note>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Send as plain text and HTML</gui>
+            </guiseq> -- <app>Balsa</app> can send and receive
+            messages in right-to-left languages such as Arabic,
+            Hebrew, and Persian, but some other agents such as
+            mailing lists may mangle them when translating into
+            HTML. If the "Send as plain text and HTML" option is
+            selected, <app>Balsa</app> will generate a correct HTML
+            message part that such agents will use instead.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Sign message</gui>
+            </guiseq> -- Cryptographically sign the message.
+            The recipients can check the signature to prove the
+            sender's (=your) identity or to detect any tampering
+            with the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Options</gui>
+              <gui>Encrypt message</gui>
+            </guiseq> -- Encrypt the message. Only the intended
+            recipient(s) can decrypt and read the contents.</p>
+          </item>
+          <item>
+            <p>Les options suivantes indiquent le protocole utilisé pour signer et/ou chiffrer le message. 
Vous devez choisir un protocole approprié que tous les destinataires pourront utiliser.</p>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>GnuPG uses MIME mode</gui>
+                </guiseq> -- Sign and/or encrypt the complete
+                message, including all attachments, using the
+                PGP/MIME mode (RFC 3156). Note that the message
+                envelope (including the Subject) is not
+                protected.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>GnuPG uses old OpenPGP mode</gui>
+                </guiseq> -- Sign and/or encrypt only the
+                message text, but not attachments, using the
+                OpenPGP mode (RFC 2440). If you want to add any
+                attachments, sign and/or encrypt them manually
+                before adding.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui>Options</gui>
+                  <gui>S/MIME mode (GpgSM)</gui>
+                </guiseq> -- Sign and/or encrypt the complete
+                message, including all attachments, using the
+                S/MIME mode (RFC 2633). Note that the message
+                envelope (including the Subject) is not
+                protected.</p>
+              </item>
+            </list>
+            <note>
+              <p>Cryptographic signatures and encryption are
+              available only when <app>Balsa</app> has been built with
+              <app>GnuPG</app> support. For a detailed description of
+              E-Mail cryptography, see the
+              <link href="http://www.gnupg.org/documentation/manuals/gnupg/"; type="http"> GnuPG 
Manual</link> and the
+              <link href="http://www.dewinter.com/gnupg_howto/english/GPGMiniHowto.html"; type="http"> GnuPG 
HOWTO</link> .</p>
+            </note>
+          </item>
+        </list>
+      </item>
+    </terms>
+  </section>
+  <section id="win-composer-toolbar">
+    <title>Barre d'outils</title>
+    <p>La barre d'outils comporte les boutons concernant les actions les plus courantes lors de l'envoi de 
messages : envoyer, joindre un fichier... et enregistrer. Comme dans les menus, certains boutons sont 
désactivés si le message n'est pas prêt à être envoyé.</p>
+    <figure>
+      <title>Barre d'outils</title>
+      <media type="image" src="figures/newmsg-window-toolbar.png"/>
+    </figure>
+    <terms>
+      <item>
+        <title>
+          <gui>Send</gui>
+        </title>
+        <p>Send the current message. Only available if the message
+        is legal to be sent (i.e. proper email addresses). This
+        button may also be configured to queue the message in the
+        outbox to be sent later (see the
+        <link xref="preferences-outgoing">
+        Preferences</link> dialog).</p>
+      </item>
+      <item>
+        <title>
+          <gui>Attach</gui>
+        </title>
+        <p>Ouvre une boîte de dialogue pour joindre un fichier au message actuel.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Postpone</gui>
+        </title>
+        <p>Enregistre le message dans les Brouillons pour révision et envoi ultérieur.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Check Spelling</gui>
+        </title>
+        <p>Start a spell check on the current message. If
+        <app>Balsa</app> is built with support for
+        <app>GtkSpell</app> , your spelling is checked in place.
+        Otherwise, <app>Balsa</app> can use either
+        <app>ispell</app> or
+        <app>aspell</app> to do the spell checking. Settings for
+        this can be found in the
+        <link xref="preferences-spelling">
+        Preferences</link> dialog.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Print</gui>
+        </title>
+        <p>Imprime le brouillon du message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cancel</gui>
+        </title>
+        <p>Ferme la fenêtre de rédaction sans enregistrer ni envoyer le message.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="win-composer-headers">
+    <title>En-têtes</title>
+    <p>La zone des en-têtes contient les informations relatives aux destinataires et à l'expéditeur du 
message ; des commentaires et des mots-clés peuvent également être ajoutés. Tous les en-têtes disponibles ne 
sont pas affichés par défaut, mais ils peuvent être activés ou désactivés rapidement à l'aide du menu 
principal.</p>
+    <terms>
+      <item>
+        <title>
+          <gui>From</gui>
+        </title>
+        <p>
+        <code>From</code> is used to indicate the origin of the
+        message, <app>Balsa</app> automatically fills this in for you if
+        you have entered your name and email address in the
+        <link xref="identities">identities</link> window.</p>
+      </item>
+      <item>
+        <title>
+          <gui>To</gui>
+        </title>
+        <p>The
+        <code>To</code> header is used to indicate the intended
+        recipient of the message; <app>Balsa</app> automatically fills
+        this in for you if you are replying to a message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Subject</gui>
+        </title>
+        <p>The
+        <code>Subject</code> header is used to summarize the topic
+        of the message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cc</gui>
+        </title>
+        <p>L'en-tête « Copie carbone ». Il est possible de saisir ici une liste, séparée par des virgules, 
de destinataires autres que le destinataire principal.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Bcc</gui>
+        </title>
+        <p>The
+        <code>Bcc</code> , or "Blind Carbon Copy" header. Similar to
+        the Cc header, except that email addresses placed in this
+        header will not appear as recipients to readers of the
+        message. Also known as a "silent" carbon copy.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Fcc</gui>
+        </title>
+        <p>The
+        <code>Fcc</code> header stands for "Folder Carbon Copy", and
+        it is used to specify any folders that you want the message
+        copied to after being sent. It is presented as a drop-down
+        combo box with a list of all available mailboxes, simply
+        select the destination.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Reply-To</gui>
+        </title>
+        <p>The
+        <code>Reply-To</code> header is for specifying what email
+        address you want any replies to go to.</p>
+      </item>
+    </terms>
+    <section id="specify-addresses">
+    <title>Specifying Addresses</title>
+    <p><app>Balsa</app> supports many different methods of selecting
+    email addresss. All of the headers that can contain addresses
+    have a small colored book to the left of them that will open up
+    <app>Balsa</app>'s address book.</p>
+    <p>However, <app>Balsa</app> will also attempt to guess what the
+    headers should contain depending on what context the
+    composition window is opened in, so it may not be neccessary to
+    fill them in most of the time.</p>
+    <note>
+      <p>Also, <app>Balsa</app> supports alias expansion. As you type a
+      name, <app>Balsa</app> will guess the e-mail address from all the
+      entries in the <app>GnomeCard</app> application. To enable this
+      feature, read the section on
+      <link xref="common-tasks#ct-alias-expansion">
+      Alias Expansion</link> . In
+      addtion, the composition window supports drag-and-drop of
+      addresses from the <app>GnomeCard</app> application.</p>
+    </note> &gt;</section>
+  </section>
+  <section id="win-composer-attachments">
+    <title>Pièces jointes</title>
+    <figure>
+      <title>Liste des pièces jointes</title>
+      <media type="image" src="figures/newmsg-window-attachments.png"/>
+    </figure>
+    <p>Below the headers may be a large box displaying a list of
+    attachments; this view can be toggled in the
+    <gui>Show</gui> menu.</p>
+    <p>When there are attachments displayed, it is possible to
+    right-click on one of them to access an option menu.
+    <gui>Inline</gui> and
+    <gui>Attachment</gui> are mutually exclusive options that will
+    display to the recipient either the attachment inline with the
+    rest of the message, or separately as an attachment. Selecting
+    <gui>Reference</gui> will send a MIME external part reference (a
+    kind of link) in lieu of the actual file.
+    <gui>Remove</gui> , and any available
+    <gui>Open with</gui> options are also available.</p>
+  </section>
+  <section id="win-composer-body">
+    <title>Corps du message</title>
+    <p>Enfin, sous la liste des pièces jointes, se situe la zone principale de la fenêtre où le texte du 
message s'affiche. Les fonctionnalités d'édition de texte sont tout à fait élémentaires, mais elles prennent 
en charge le couper, copier et coller ; il vous est donc possible d'écrire le message dans votre éditeur 
favori et de coller simplement celui-ci dans cette zone.</p>
+    <p>If the message is a reply or forward, the referenced message
+    will be displayed in the body text widget, with the prefix
+    specified in the
+    <link xref="preferences-outgoing">Preferences</link> dialog.</p>
+  </section>
+  <section id="win-composer-spellcheck">
+    <title>Correcteur orthographique</title>
+    <p>Lors du lancement d'une vérification orthographique, un certain délai pour le chargement du texte et 
du module de correction est nécessaire ; une fois ces chargements effectués, la vérification du message 
commence automatiquement. Si un mot incorrect est repéré, il est surligné et une boîte de dialogue propose un 
certain nombre de suggestions et de possibilités d'action.</p>
+    <figure>
+      <title>Boîte de dialogue de vérification orthographique</title>
+      <media type="image" src="figures/spell-check.png"/>
+    </figure>
+    <p>As shown above, the panel consists of a list of two panes,
+    one the left containing a list of suggestions and an entry box,
+    while the right contains several buttons to choose your action.
+    The list on the left is re-generated for each incorrect word,
+    with all the suggestions the spell check program comes up with.
+    You can choose what program you want to use through loadable
+    modules, selectable in the
+    <link xref="preferences-spelling">Preferences</link> dialog. The
+    entry box above the list is what will be used to replace the
+    current word, and usually reflects the current selection in the
+    list, but can be edited by hand if you wish to make manual
+    changes.</p>
+    <p>Les boutons en bas du panneau contrôlent les actions à effectuer pour chaque mot incorrect. 
L'utilisateur dispose des boutons suivants :</p>
+    <terms>
+      <item>
+        <title>
+          <gui>Change</gui>
+        </title>
+        <p>Remplace le mot incorrect par la suggestion proposée ou par le mot modifié par l'utilisateur.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Change All</gui>
+        </title>
+        <p>Remplace toutes les occurrences du mot incorrect par la suggestion actuellement sélectionnée.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Ignore</gui>
+        </title>
+        <p>Ignore le mot incorrect actuel et continue la correction jusqu'au prochain mot incorrect.</p>
+      </item>
+      <item>
+        <p>Ignore toutes les occurrences du mot actuel et poursuit jusqu'au prochain mot incorrect.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Learn</gui>
+        </title>
+        <p>Ajoute le mot incorrect à votre dictionnaire personnel. Ainsi, le mot sera considéré comme 
correctement orthographié lors des vérifications suivantes.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Done</gui>
+        </title>
+        <p>Met fin à la vérification orthographique au point actuel, conserve tous les changements effectués 
et retourne à l'interface habituelle de rédaction de message.</p>
+      </item>
+      <item>
+        <title>
+          <gui>Cancel</gui>
+        </title>
+        <p>Met fin à la vérification orthographique au point actuel, annule tous les changements effectués, 
y compris l'incorporation de mots nouveaux dans votre dictionnaire personnel.</p>
+      </item>
+    </terms>
+  </section>
+  <section id="addr-book-buttons">
+    <title>Carnet d'adresses</title>
+    <p>When composing a message, clicking on any of the colored
+    book icons next to a destination field (To, Cc, Bcc) will bring
+    up the <app>Balsa</app> address book. It helps you to select
+    recipients for your messages quickly and easily.</p>
+    <figure>
+      <title>Fenêtre du carnet d'adresses</title>
+      <media type="image" src="figures/address-book.png"/>
+    </figure>
+    <p>Le carnet d'adresses comporte deux volets, celui de gauche contient toutes les adresses disponibles, 
alors que celui de droite contient les destinataires prévus pour votre message. Pour ajouter des adresses 
dans la liste des destinataires, sélectionnez l'adresse dans le volet de gauche puis cliquez sur la flèche 
pointant vers la droite ou, plus simplement, double-cliquez sur l'adresse. L'adresse est effacée du volet de 
gauche, et ainsi ne peut pas être ajoutée plus d'une fois. Si vous décidez finalement de ne pas envoyer le 
message à un destinataire particulier déjà désigné, sélectionnez l'adresse dans le volet de droite et cliquez 
sur la flèche pointant vers la gauche, ou bien double-cliquez à nouveau pour la renvoyer dans la liste de 
gauche.</p>
+    <p>If, while selecting people to send your message to, you
+    decide to add someone new to the address book, it is a simple
+    matter to click on the
+    <gui>Run GnomeCard</gui> button. This will bring up the
+    <app>GnomeCard</app> application, allowing you to easily manipulate
+    your contact list. After any changes have been made using the
+    address book, they can be forced to show up in the left hand
+    pane by clicking on the
+    <gui>Re-Import</gui> button.</p>
+  </section>
+</page>
diff --git a/doc/fr/win-filters.page b/doc/fr/win-filters.page
new file mode 100644
index 0000000..b94a9a9
--- /dev/null
+++ b/doc/fr/win-filters.page
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-filters" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Fenêtre de Gestion des filtres</title>
+  <p>This window is divided in two parts: the left part is the list
+  of all filters. When you select one of them, the right part
+  displays its properties. The right part is a two-page notebook
+  (the
+  <link xref="win-filters#wf-match-page">match page</link>, and the
+  <link xref="win-filters#wf-action-page">action page</link>); their
+  descriptions follow.</p>
+  <p>There are two buttons under the filters list:
+  <list>
+    <item>
+      <p>The
+      <gui>New</gui> button: you click on it to create a new filter;
+      the filter is initially named "New Filter", and contains no
+      condition. Then you fill in the different fields in the
+      notebook pages (in particular remember to change the name of
+      the filter), add the conditions that will describe how this
+      filters matches a message, and to confirm the modifications
+      push the
+      <gui>Apply</gui> button on the right hand side of the Filters
+      window.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Remove</gui> button: removes the currently selected
+      filter.</p>
+    </item>
+  </list></p>
+  <section id="wf-match-page">
+    <title>The Match Page</title>
+    <p>Each filter is made of one or several conditions; each
+    condition represents a test to be applied to the messages. The
+    results of these tests is then combined following the type of
+    operation specified:
+    <list>
+      <item>
+        <p>AND: all condition tests must be true to make the
+        match.</p>
+      </item>
+      <item>
+        <p>OR: one condition test must be true to make the
+        match.</p>
+      </item>
+    </list></p>
+    <p>Then the page displays the name of the filter and the
+    conditions that describes how the filters matches a message.
+    The list displays the type of the conditions (the conditions
+    will be described later):
+    <list>
+      <item>
+        <p>
+        <gui>Simple</gui>: the match is done by a simple substring
+        test.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Regular expression</gui>: the match uses regular
+        expressions on the message headers.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Date interval</gui>: the match is done by checking if
+        the date of the message is within certain bounds.</p>
+      </item>
+      <item>
+        <p>
+        <gui>Flag condition</gui>: the match is done by checking
+        the flags of the message: unread, replied, deleted,
+        flagged.</p>
+      </item>
+    </list>The three buttons under the list allows you to edit the
+    selected condition, add a new one, or remove one. Editing or
+    creating a condition is done in the
+    <link xref="win-condition">condition window</link>, which
+    pops up when you click on the
+    <gui>Edit</gui> or the
+    <gui>New</gui> button.</p>
+    <p>The two buttons under the notebook at the right hand side of
+    the window lets you manipulate the currently selected filter.
+    The
+    <gui>Apply</gui> button is used to confirm the modifications you
+    have made on any field. If you make changes and select another
+    filter without first clicking on the
+    <gui>Apply</gui> button, all your changes will be lost.</p>
+    <p>The
+    <gui>Revert</gui> button cancels all previous changes: the
+    current filter is reverted to its state just before the last
+    click on the
+    <gui>Apply</gui> button.</p>
+  </section>
+  <section id="wf-action-page">
+    <title>The Action Page</title>
+    <p>This page describes the actions to take in case the filter
+    matches. First you specify the notification to inform you that
+    the one or several messages has matched the filter in the
+    <gui>Notification</gui> frame. Then in the
+    <gui>Action</gui> frame you tell what to do with the matching
+    messages. You can ask <app>Balsa</app> to copy or move them to any
+    mailbox, or to send them to the trash can. The other actions
+    are not yet implemented.</p>
+  </section>
+  <section id="win-condition">
+    <title>The Condition Window</title>
+    <p>This window is used to edit an existing condition or to
+    create a new one. It displays all the information needed to
+    describe the condition, it is launched when you click on the
+    <gui>Edit</gui> or
+    <gui>New</gui> buttons under the conditions list in the match
+    page of the notebook in the right part of the
+    <link xref="win-filters">filters window</link>.</p>
+    <p>This window is made of three frames:
+    <list>
+      <item>
+        <p>The
+        <gui>Match in</gui> frame: it's a set of check boxes, one
+        per match field. For example if you want to match all
+        messages that was sent by hotmail users, you just have to
+        check the
+        <gui>From</gui> box, or if you want to match all messages
+        about <app>Balsa</app>, check the
+        <gui>Subject</gui> box.</p>
+        <warning>
+          <p>Be careful with
+          <gui>Body</gui> match, this can take time for large
+          messages.</p>
+        </warning>
+        <p>For advanced use you can also specify directly the name
+        of the header to match on. A standard example the
+        "X-Mailer" is a header added to your message by the MUAs
+        with their name and versions.</p>
+        <p>The
+        <gui>All</gui> button will check all boxes, whereas the
+        <gui>Clear</gui> button will uncheck all boxes (as you might
+        have guessed).</p>
+        <p>If you specify several headers, a message will match
+        this condition if one of the header matches. For example if
+        you want to filter all messages talking about <app>Balsa</app>,
+        you should check the
+        <gui>Body</gui> and the
+        <gui>Subject</gui> boxes, so that all mails with the word
+        <quote>Balsa</quote> in its subject or its body will match.
+        You can also, if you're fed up with <app>Balsa</app> ;-), match
+        all mails that do NOT contain the word
+        <quote>Balsa</quote> in their subject and in their body
+        neither. See the description of the search types to see how
+        to do this.</p>
+      </item>
+      <item>
+        <p>The
+        <gui>Search Type</gui> frame: it's a list of the different
+        condition types. You choose
+        <gui>Simple</gui>,
+        <gui>Regular expression</gui>,
+        <gui>Date interval</gui>, or
+        <gui>flag condition</gui>. Your choice will change the
+        third frame so that it displays the fields needed by the
+        type of match chosen.</p>
+      </item>
+      <item>
+        <p>This part depends on the search type you've chosen:
+        <list>
+          <item>
+            <p>
+            <gui>Simple</gui> type: a text entry lets you input the
+            string to look for (case does not matter, the search is
+            case-insensitive). The button lets you specify if a
+            message matches when the string is or is NOT a
+            substring of the specified headers, the sentence above
+            the text entry will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Regular expression</gui>: you can input a list of
+            regular expressions. You type your regular expression
+            in the text entry, then you click on the
+            <gui>Add</gui> button to put it into the list. Of course
+            the
+            <gui>Remove</gui> button destroys the selected regular
+            expression in the list. The last button
+            <gui>One matches/None matches</gui> lets you specify
+            when a message matches the condition: when one of the
+            regular expression matches or when none matches. The
+            sentence above te list will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Date</gui> interval: you can input the interval by
+            the mean of the two text entries. A blank entry means
+            no bound. The button tells to match when the message
+            date is within the bounds or not. The sentence above
+            the text entries will be updated accordingly.</p>
+          </item>
+          <item>
+            <p>
+            <gui>Flag condition</gui>: the four check boxes let you
+            select which messages will match this condition. If you
+            want to match all replied OR unread messages, check the
+            corresponding boxes. The button let you specify that
+            the match will be done when none of the specified flags
+            are set, the sentence above the check boxes will be
+            updated accordingly. For example if you want to filter
+            all read and replied messages, check the
+            <gui>unread</gui> and
+            <gui>replied</gui> boxes, and click on the button.</p>
+          </item>
+        </list></p>
+      </item>
+    </list></p>
+  </section>
+</page>
diff --git a/doc/fr/win-main.page b/doc/fr/win-main.page
new file mode 100644
index 0000000..67ef9fe
--- /dev/null
+++ b/doc/fr/win-main.page
@@ -0,0 +1,890 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-main" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Fenêtre principale</title>
+  <figure>
+    <media type="image" src="figures/main-window.png"/>
+    <title>Fenêtre principale</title>
+  </figure>
+  <p> <app>Balsa</app> 's main window has three major areas. To the left
+  is the
+  <link xref="win-main#subwin-mblist"> mailbox list</link> . This displays all
+  the mailboxes <app>Balsa</app> knows about; it will scan for ones in
+  your local mail directory. (This means <app>Balsa</app> works well
+  with <app>procmail</app> .) It will also list <link xref="glossary#imap">IMAP</link> mailboxes that
+  you have configured. If the
+  <gui> Show Mailbox Info</gui> preference is set, two columns will
+  also be displayed next to the mailbox names containing the number
+  of unread and total messages in each mailbox that has unread
+  messages; otherwise, the number of unread messages is shown in
+  parentheses after the mailbox name. Also, any mailboxes that
+  contain unread messages will be shown in a bold font.</p>
+  <p> At the top-right is a view of the currently open mailbox,
+  called the
+  <link xref="win-main#subwin-msgindex"> message index</link> . You can browse
+  messages and manipulate them here.</p>
+  <p> At the bottom-right of <app>Balsa</app> 's main window is the
+  <link xref="win-main#subwin-msgview"> message view</link> . This displays
+  the message selected in the message index. You can save
+  attachments, view attachments, and read incoming email here.</p>
+  <section id="menu-toolbar">
+    <title>Menu et barre d'outils</title>
+    <figure>
+      <media type="image" src="figures/main-window-toolbar.png"/>
+      <title>Barre d'outils de la fenêtre principale</title>
+    </figure>
+    <p>La barre de menus, située au sommet de la fenêtre principale, donne accès aux commandes suivantes 
:</p>
+    <terms>
+      <item>
+        <title>
+          <guiseq>
+            <gui> File</gui>
+          </guiseq>
+        </title>
+        <p>Ce menu contient les commandes de base.</p>
+        <terms>
+          <item>
+            <title>
+              <guiseq>
+                <gui> File</gui>
+                <gui> New</gui>
+              </guiseq>
+            </title>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Message...</gui>
+                </guiseq>
+                <key>M</key> -- Create a new message, and
+                display a new window to type the message in.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Mailbox...</gui>
+                </guiseq> -- Open a dialog box to create a new
+                mailbox. There are various items like this,
+                corresponding to the different types of mailbox
+                that <app>Balsa</app> supports. See the
+                <link xref="mbox-formats"> discussion of different
+                mailbox formats</link> and their advantages and
+                disadvantages.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Remote IMAP folder...</gui>
+                </guiseq> -- Open a dialog box to create a
+                folder for an account on an IMAP server. This
+                <link xref="folder-config"> IMAP folder
+                properties</link> dialog can also be used to change
+                the details of the account.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> File</gui>
+                  <gui> New</gui>
+                  <gui> Remote IMAP subfolder...</gui>
+                </guiseq> -- Open a dialog box to create a new
+                subfolder in an existing IMAP folder tree. This
+                <link xref="subfolder-config"> IMAP subfolder
+                properties</link> dialog can also be used to rename
+                or move a subfolder.</p>
+              </item>
+            </list>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Continue</gui>
+            </guiseq>
+            <key>C</key> -- Continue a postponed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Get New Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>M</key></keyseq> -- 
+            This causes <app>Balsa</app> to
+            attempt to retrieve any new messages from the
+            <link xref="glossary#pop">POP3</link> server.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Send Queued Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>T</key></keyseq> --
+            Send all mail waiting in the
+            Outbox mailbox to the mail server now.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Send and Receive Mail</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>B</key></keyseq> --
+            Send all mail waiting in the
+            Outbox mailbox to the mail server now and retrieve any
+            new messages.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Page Setup</gui>
+            </guiseq> -- Set print options such as paper size
+            and print orientation.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Print</gui>
+            </guiseq> -- Print the currently selected message
+            (displayed in the message view pane.)</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Address Book</gui>
+            </guiseq>
+            <key>B</key> -- Open <app>Balsa</app> 's address
+            book.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> File</gui>
+              <gui> Quit</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>Q</key></keyseq> --
+            Exit the program.</p>
+          </item>
+        </terms>
+      </item>
+      <item>
+        <title>
+          <gui> Edit</gui>
+        </title>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Copy</gui>
+            </guiseq>
+            <keyseq><key>Ctrl&gt;</key><key>C</key></keyseq> --
+            Copy selected text to the clipboard.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Select All</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>A</key></keyseq> --
+            Select all text in the currently
+            displayed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Select Thread</gui>
+            </guiseq> -- Select all messages in the same thread
+            as the currently displayed message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find</gui>
+            </guiseq> 
+            <keyseq><key>Ctrl</key><key>F</key></keyseq> --
+            Find messages in the current mailbox
+            that match a given set of conditions, using the
+            <link xref="win-search"> search mailbox
+            window</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find Next</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>G</key></keyseq> --
+            Find the next matching message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Find in Message</gui>
+            </guiseq> <key>/</key>--
+            Selecting this option opens a "search
+            bar" at the foot of the message preview, in which you
+            can type text for which <app>Balsa</app> will search in the
+            current message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Filters</gui>
+            </guiseq> -- Open up the
+            <link xref="win-filters"> filters window</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Export filters</gui>
+            </guiseq> -- Open up a window for exporting filters
+            in the Sieve format.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Edit</gui>
+              <gui> Preferences...</gui>
+            </guiseq> -- Open the
+            <link xref="preferences"> Preferences</link> window to
+            change the settings of <app>Balsa</app> .</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> View</gui>
+        </title>
+        <p>Ce menu permet de changer le mode d'affichage des messages.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Show Mailbox Tree</gui>
+            </guiseq> <key>F9</key> --
+            Toggle the display of the mailbox tree
+            in the main window.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Show Mailbox Tabs</gui>
+            </guiseq> -- Toggle the display of tabs for all
+            open mailboxes.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Wrap</gui>
+            </guiseq> -- Toggle the display of messages using
+            word wrap. The column to which the message is wrapped
+            is set in the
+            <link xref="preferences"> Preferences</link> window.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> No Headers</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> Selected Headers</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> All Headers</gui>
+            </guiseq> -- Select the headers to display in the
+            message pane.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Flat index</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> Simple threading</gui>
+            </guiseq> ,
+            <guiseq>
+              <gui> JWZ threading</gui>
+            </guiseq> -- Select the type of threading used to
+            display the messages in the message index.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Expand All</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>E</key></keyseq> --
+            <guiseq>
+              <gui> View</gui>
+              <gui> Collapse All</gui>
+            </guiseq>
+             <keyseq><key>Ctrl</key><key>L</key></keyseq> --
+             Expand or collapse all
+             threads in the currently displayed mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> View</gui>
+              <gui> Zoom In</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>+</key></keyseq>,
+            <guiseq>
+              <gui> Zoom Out</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>-</key></keyseq>,
+            <guiseq>
+              <gui> Zoom 100%</gui>
+            </guiseq> -- Alter the font size of HTML messages.
+            Plain text messages will always use the font specified
+            in the
+            <link xref="preferences"> Preferences</link> window.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> Mailbox</gui>
+        </title>
+        <p>Ce menu permet de manipuler les boîtes aux lettres.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next</gui>
+            </guiseq> <key>N</key>--
+            Select the next message in the current
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Previous</gui>
+            </guiseq> <key> P</key> --
+            Select the previous message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next Unread</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>N</key></keyseq> --
+            Select the next unread message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Next Flagged</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>Alt</key><key>F</key></keyseq> --
+            Select the next flagged message in the
+            current mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Hide messages</gui>
+            </guiseq> -- A submenu listing all the types of
+            messages that may be hidden and unhidden in the current
+            mailbox. Types in the submenu are toggled when
+            selected. A Checkmark indicates it is currently
+            hidden.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Reset Filter</gui>
+            </guiseq> -- Resets to the mailbox filter.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Select All</gui>
+            </guiseq> -- Selects all messages in the current
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Edit...</gui>
+            </guiseq> -- Edit mailbox properties.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Delete...</gui>
+            </guiseq> -- Delete the currently selected
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Expunge Deleted Messages</gui>
+            </guiseq> -- Physically remove from the backing
+            mailstore all messages marked as deleted.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Close</gui>
+            </guiseq> -- Close the currently selected
+            mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Empty Trash</gui>
+            </guiseq> -- Delete all messages from the
+            <code> Trash</code> mailbox.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Select Filters</gui>
+            </guiseq> -- Pop up a dialog that allows you to
+            control which filters are applied to this mailbox, and
+            optionally to apply them.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Mailbox</gui>
+              <gui> Remove Duplicates</gui>
+            </guiseq> -- Remove duplicate messages; <app>Balsa</app>
+            locates all messages in the current mailbox that have
+            the same Message-ID header, and removes all but
+            one.</p>
+          </item>
+        </list>
+      </item>
+      <item id="subwin-messagemenu">
+        <title>
+          <gui> Message</gui>
+        </title>
+        <p>Ce menu permet la manipulation des messages.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <key> R</key>
+              <gui> Message</gui>
+              <gui> Reply...</gui>
+            </guiseq> <key>R</key> -- Reply to the currently selected
+            message(s).</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> A</key>
+              <gui> Message</gui>
+              <gui> Reply to All...</gui>
+            </guiseq> <key>A</key> -- Reply to the currently selected
+            message(s), sending the reply to all senders and
+            recipients of the message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> G</key>
+              <gui> Message</gui>
+              <gui> Reply to Group...</gui>
+            </guiseq> <key>G</key> -- Reply to a mailing list, instead of
+            the sender to that list.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> F</key>
+              <gui> Message</gui>
+              <gui> Forward attached...</gui>
+            </guiseq> -- Forward the currently selected
+            message(s) as an attachment.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Forward inline...</gui>
+            </guiseq> -- Forward the currently selected
+            message(s), quoted inline.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Next Part</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>.</key></keyseq>--
+            View the next part of the message (if
+            the message is multi-part).</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <shortcut>
+                <keycombo>
+                  <sys> Ctrl</sys>
+                  <sys> ,</sys>
+                </keycombo>
+              </shortcut>
+              <gui> Message</gui>
+              <gui> Previous Part</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>,</key></keyseq> --
+            View the previous part of the
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Save Current Part...</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>S</key></keyseq>--
+            Save the currently selected part of
+            the message to a file.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <shortcut>
+                <keycombo>
+                  <sys> Ctrl</sys>
+                  <sys> U</sys>
+                </keycombo>
+              </shortcut>
+              <gui> Message</gui>
+              <gui> View Source...</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>U</key></keyseq> --
+            Opens a new window that displays the
+            raw message as received from the
+            <link xref="glossary#mta">MTA</link> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Copy</gui>
+            </guiseq>
+            <keyseq><key>Ctrl</key><key>C</key></keyseq> --
+            Copies to the clipboard any text
+            selected in the message view of the current
+            message.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Select Text</gui>
+            </guiseq> -- Selects the entire text of the current
+            message in the message view.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Message</gui>
+              <gui> Move to Trash</gui>
+            </guiseq> <key>D</key> -- Moves the currently selected
+            message(s) to the Trash.</p>
+          </item>
+          <item>
+            <p>
+              <guiseq>
+                <gui> Message</gui>
+                <gui> Toggle flag</gui>
+              </guiseq>
+            </p>
+            <list>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Flagged</gui>
+                </guiseq> <key>X</key> --
+                Toggle the flag on the currently
+                selected message(s). This is shown as an
+                exclamation mark next in the message index.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <shortcut>
+                    <keycombo>
+                      <sys> Ctrl</sys>
+                      <sys> D</sys>
+                    </keycombo>
+                  </shortcut>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Deleted</gui>
+                </guiseq>
+                <keyseq><key>Ctrl</key><key>D</key></keyseq> --
+                Marks the message as set for
+                deletion. The message will be actually removed from
+                the backing mailstore when it is "expunged" either
+                manually, or as specified in the
+                <link xref="preferences">Preferences</link>.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <shortcut>
+                    <keycombo>
+                      <sys> Ctrl</sys>
+                      <sys> R</sys>
+                    </keycombo>
+                  </shortcut>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> New</gui>
+                </guiseq>
+                <keyseq><key>Ctrl</key><key>R</key></keyseq> --
+                Marks a message that has been read
+                as new, and vice-versa. The message will display
+                the standard icon and font for a new message.</p>
+              </item>
+              <item>
+                <p>
+                <guiseq>
+                  <gui> Message</gui>
+                  <gui> Toggle flag</gui>
+                  <gui> Answered</gui>
+                </guiseq> -- Toggles the reply icon for a
+                message.</p>
+              </item>
+            </list>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <key> S</key>
+              <gui> Message</gui>
+              <gui> Store Address...</gui>
+            </guiseq> <key>S</key>-- Add the sender of the currently
+            selected message to your address book.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui> Settings</gui>
+        </title>
+        <p> Menu for changing <app>Balsa</app> 's configuration.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Settings</gui>
+              <gui> Toolbars...</gui>
+            </guiseq> -- Open the
+            <link xref="toolbar-prefs"> Toolbars</link> window to
+            modify the content and arrangement of the toolbars in
+            <app>Balsa</app> .</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui> Settings</gui>
+              <gui> Identities...</gui>
+            </guiseq> -- Open the
+            <link xref="identities"> Identities</link> window to
+            customize how you present yourself to the rest of the
+            world.</p>
+          </item>
+        </list>
+      </item>
+      <item>
+        <title>
+          <gui>Help</gui>
+        </title>
+        <p>Menu for getting this help, and information about <app>Balsa</app>.</p>
+        <list>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Help</gui>
+              <gui>Contents</gui>
+            </guiseq> <key>F1</key> -- Show this help file.</p>
+          </item>
+          <item>
+            <p>
+            <guiseq>
+              <gui>Help</gui>
+              <gui>About</gui>
+            </guiseq> -- Show information about <app>Balsa</app>.</p>
+          </item>
+        </list>
+      </item>
+    </terms>
+  </section>
+  <section id="subwin-mblist">
+    <title>Liste des boîtes aux lettres</title>
+    <p> The mailbox list in the main window lists all of your
+    mailboxes. <app>Balsa</app> will automatically detect your local
+    mailboxes by searching for mailboxes under your local mail
+    directory (probably ~/mail). This lets <app>Balsa</app> coexist with
+    <app>pine</app> and <app>procmail</app> without causing problems.</p>
+    <p> Your mailboxes will be displayed as a tree view, with
+    mailboxes in subdirectories of your local mail directory
+    initially hidden but accessible by expanding the tree.
+    <link xref="glossary#imap">IMAP</link> mailboxes will also be displayed as being at the top
+    level of the tree. <link xref="glossary#pop">POP3</link> mailboxes are not displayed.</p>
+  </section>
+  <section id="subwin-msgindex">
+    <title>L'index des messages</title>
+    <p>L'index des messages affiche les messages du dossier actuel ; vous choisissez ainsi le message à 
afficher. Cliquez sur les onglets, s'ils sont affichés, ou sur un dossier dans la liste des boîtes aux 
lettres pour faire apparaître l'index au premier plan.</p>
+    <p> From the message index you can do a lot. Clicking on a
+    message will cause it to be displayed in the message view.
+    Right-clicking on it will give a pop-up menu letting you reply
+    to the message (or forward it, etc.) and move it to another
+    folder (using the
+    <gui> Move to</gui> menu item). Double-clicking on a message, or
+    pressing either the space-bar or the
+    <sys> Enter</sys> key while the keyboard focus is in the index,
+    will open the message in a separate window. Also, it is
+    possible to drag and drop messages from the index to other
+    mailboxes in the mailbox list and open mailbox tabs.</p>
+    <p>Le menu contextuel comporte les options suivantes :</p>
+    <list>
+      <item>
+        <p>
+        <guiseq>
+          <gui> Reply</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Reply To All</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Reply To Group</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Forward Attached</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Forward Inline</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Store Address</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Delete</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Undelete</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Move To Trash</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Toggle Flagged</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Toggle Unread</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> Move to</gui>
+        </guiseq> ,
+        <guiseq>
+          <gui> View Source</gui>
+        </guiseq> -- These perform the same actions as their
+        counterparts in the
+        <link xref="win-main#subwin-messagemenu"> message menu</link> .</p>
+      </item>
+      <item>
+        <p>
+        <guiseq>
+          <gui> Move to</gui>
+        </guiseq> -- Moves the currently selected message(s) to
+        another mailbox. When this menu item is selected, a list of
+        available mailboxes is displayed, from which the
+        destination may be selected.</p>
+      </item>
+    </list>
+  </section>
+  <section id="subwin-msgview">
+    <title>Vue des messages</title>
+    <p>Le message sélectionné dans l'index s'affiche ici. Les en-têtes du message, sauf s'ils ont été 
désactivés, sont affichés au dessus du corps du texte. Le texte du message est affiché sous les en-têtes.</p>
+    <p> If the message is multipart, an attachment icon will appear
+    beside the headers. Clicking this icon will display a list of
+    the parts from which you may select one. If <app>Balsa</app> is
+    unable to display it, you will be given a choice of
+    applications known to handle the part. Additionally, there is
+    always an option to save the attachment to a file.</p>
+    <note>
+      <p> <app>Balsa</app> supports viewing HTML messages only when
+      compiled with
+      <app> gtkhtml</app> or
+      <app> WebKit</app> support. Gtkhtml support will be compiled in
+      if gtkhtml-devel files are found. WebKit is currently
+      supported only on an experimental basis,</p>
+    </note>
+    <p> You are not restricted to that pane either. Double-clicking
+    on a message in the message index, or touching either the space
+    bar or the
+    <sys> Enter</sys> key, will open it in a
+    <link xref="win-message"> separate window</link> .</p>
+  </section>
+</page>
diff --git a/doc/fr/win-message.page b/doc/fr/win-message.page
new file mode 100644
index 0000000..2b0021b
--- /dev/null
+++ b/doc/fr/win-message.page
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-message" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>Fenêtre des messages</title>
+
+<p>
+  In addition to the preview pane, <app>Balsa</app> can display messages in
+  separate windows.  Simply double-click on the desired message from
+  the message index in the main window, or select the message and press
+  the space bar.  Any number of windows may be
+  opened, although only one per unique message.
+</p>
+
+<p>
+  The message window has a menu and toolbar containing commands
+  pertinent to an individual message.  Commands are as described in
+  the <link xref="win-main">main window</link>.
+  Below the menu and toolbar are the message headers in a box,
+  followed by the message body.
+</p>
+
+<figure>
+  <title>Fenêtre de message</title>
+  <media type="image" src="figures/message-window.png" format="PNG"/>
+</figure>
+
+<p>
+  If your copy of <app>Balsa</app> has cryptographic support, there will be
+  an icon in the header box depicting an envelope with a lock and a
+  check mark.  Clicking the icon will check the key used to sign the
+  message.  The message body will contain an icon and some
+  descriptive text noting whether the signing key is valid, invalid,
+  or unchecked.
+</p>
+
+<p>Si le message incorpore des pièces jointes ou comporte plusieurs parties de n'importe quel type, une 
icône de pièce jointe sera présente dans la boîte d'en-tête comme montré ci-dessous. Le fait de cliquer sur 
l'icône affiche un menu contenant toutes les pièces disponibles. Sélectionner une partie met à jour 
l'affichage du corps du message en conséquence.</p>
+
+<figure>
+  <title>Sélection d'une partie de message</title>
+  <media tyep="image" src="figures/msg-part-select.png" format="PNG"/>
+</figure>
+
+<p>
+  The <gui>complete message</gui> selection will
+  do its best to render all
+  parts at once, but some may have to be selected individually or
+  opened in an external program.  Parts which cannot be rendered
+  within <app>Balsa</app> will instead display a list of options for opening
+  external programs or saving the data.  Right-clicking on a part
+  will also provide a menu with these options.
+</p>
+
+<p>
+  Navigation between messages is possible without returning to the
+  index in the main window.  Next unread being quite useful for
+  checking all new mail.  Deleting the current message will
+  automatically display the next unread one.  This behavior can be
+  changed in the <link xref="preferences">preferences</link>.
+</p>
+</page>
diff --git a/doc/fr/win-run-filters.page b/doc/fr/win-run-filters.page
new file mode 100644
index 0000000..1fbdfb1
--- /dev/null
+++ b/doc/fr/win-run-filters.page
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-run-filters" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Fenêtre de sélection des filtres</title>
+  <p>This window is divided in two lists: the left one displays all
+  available filters, and the right part displays all filters to be
+  applied on the mailbox (the name of which is shown in the window
+  title). See the
+  <link xref="win-filters">filters window</link> section to see
+  how to set up filters.</p>
+  <p>The right list has three columns. The first one contains the
+  filters name. The two others tells you if the filter will be
+  automatically applied: e.g. if a dot is displayed in the second
+  column
+  (<gui>On reception</gui>), this tells you that whenever new
+  messages arrived in this mailbox, they will be filtered by the
+  corresponding filter (Note: the filter is applied only on the new
+  messages, not the entire mailbox; this is similar to the use of
+  procmail). In the same way, if a dot is displayed in the third
+  column
+  (<gui>On exit</gui>), the filter will be applied to the entire
+  mailbox when you exit <app>Balsa</app>.</p>
+  <p>Note: the
+  <gui>On exit</gui> feature is not yet implemented.</p>
+  <p>When you tell <app>Balsa</app> to apply several filters on the same
+  mailbox (i.e. when you put several filters in the right list),
+  only the first match counts: the filters are applied in the
+  specified order and the first that matches on the current message
+  will be applied but not the following ones.</p>
+  <p>There are two buttons between the filters lists:
+  <list>
+    <item>
+      <p>The
+      <gui>Add</gui> button: moves the selected filters from the
+      left list to the right one, adding more filters to be applied
+      to the mailbox.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Remove</gui> button: removes the currently selected
+      filter in the right list and puts it back in the left
+      list.</p>
+    </item>
+  </list></p>
+  <p>The
+  <gui>Up</gui> and
+  <gui>Down</gui> buttons under the right list serve to reorder the
+  filters that are to be applied. This is a sort of priority
+  between filters, because if several filters could match the
+  current message, only the first one will be applied. The
+  <gui>Apply Now</gui> button applies all filters of the right list
+  to the entire mailbox immediately (be patient, this can take a
+  quite a long time on big mailboxes or remote ones).</p>
+  <p>You can also use this dialog to apply a filter to a mailbox
+  without actually attaching it to the mailbox. Select one or more
+  filters in the left hand list, and click the
+  <gui>Apply Selected</gui> button below that list.</p>
+  <p>There are three buttons below the filters lists:
+  <list>
+    <item>
+      <p>The
+      <gui>OK</gui> button: saves the list of filters associated to
+      the mailbox. Note that this does not apply the filters to the
+      mailbox. It is useful only when you have set up automatic
+      filters, or when you have to manually apply a lot of filters
+      frequently to this mailbox: the next time <app>Balsa</app> will
+      reload the saved filters and you will only have to press the
+      <gui>Apply</gui> button.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Cancel</gui> button: this discards any changes and closes
+      the dialog box.</p>
+    </item>
+    <item>
+      <p>The
+      <gui>Help</gui> button: opens this help window.</p>
+    </item>
+  </list></p>
+</page>
diff --git a/doc/fr/win-search.page b/doc/fr/win-search.page
new file mode 100644
index 0000000..1409a0a
--- /dev/null
+++ b/doc/fr/win-search.page
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="win-search" xml:lang="fr">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Fenêtre de recherche dans la boîte aux lettres</title>
+  <p>You can search a mailbox to find and display messages that
+  contain a given string in the To, From, Subject, or Cc headers,
+  or in the message body. This window allows you to specify the
+  string for which you want to search and where <app>Balsa</app> should
+  look. Open the window with the
+  <guiseq>
+    <gui>Edit</gui>
+    <gui>Find</gui>
+  </guiseq>command, or
+  <keyseq>
+    <key>Ctrl</key>
+    <key>F</key>
+  </keyseq>.</p>
+  <p>You can view the matching messages in two ways:</p>
+  <terms>
+    <item>
+      <title>
+        <gui>Show only matching messages</gui>
+      </title>
+      <p>If you click the
+      <gui>Apply</gui>button, the mailbox view will be filtered to
+      show only the messages that match the conditions. If you
+      click the
+      <gui>Clear</gui>button, the filter will be cleared, and the
+      mailbox view will be restored to show all messages. You can
+      also use
+      <guiseq>
+        <gui>Mailbox</gui>
+        <gui>Reset Filter</gui>
+      </guiseq>to restore the view.</p>
+    </item>
+    <item>
+      <title>
+        <gui>Open next matching message</gui>
+      </title>
+      <p>Alternatively, you can step through the matching messages,
+      either forward or in reverse, and optionally wrapping the
+      search when it reaches the end of the mailbox. Click the
+      <gui>OK</gui>button to view the first matching message after
+      (or before) the current message. Then you can use
+      <guiseq>
+        <gui>Edit</gui>
+        <gui>Find Next</gui>
+      </guiseq>, or
+      <keyseq>
+        <key>Ctrl</key>
+        <key>G</key>
+      </keyseq>, to step through the matching messages.</p>
+    </item>
+  </terms>
+</page>
diff --git a/doc/sl/ab-conf.page b/doc/sl/ab-conf.page
new file mode 100644
index 0000000..1346b9e
--- /dev/null
+++ b/doc/sl/ab-conf.page
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="ab-conf" xml:lang="sl">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+<title>Address Book Configuration</title>
+  <p>To je potrebno izpolniti.</p>
+
+<section id="CHOICE">
+  <title>Vrsta imenika</title>
+  <p>Izbirate lahko med več vrstami imenikov.</p>
+</section>
+
+<section id="EXTERN">
+<title>Zunanji imenik</title>
+<!-- Balsa support for an external query addressbook -->
+<!-- By Jelmer Vernooij <jelmer nl linux org>        -->
+
+<p>The balsa addressbook supports input from programs. Thus, you
+can use (no importing needed!) for example your pine or mutt
+addressbook. The mutt mailer (<link href="http://www.mutt.org/";>www.mutt.org</link>) uses an identical
+system to retrieve addresses from programs.</p>
+
+  <section id="extern-existing-programs">
+   <title>Obstoječi programi</title>
+
+<p>The following programs are compatible with the mutt mail reader
+and <em>should</em> be with balsa. Submit links to more programs.</p>
+
+<list>
+<item><p>
+<link href="http://www.spinnaker.de/lbdb/"; type="http">http://www.spinnaker.de/lbdb/</link> - The little
+brother database. Read emailaddresses and names from: finger,
+/etc/passwd, incoming procmail email, NIS, fido, the abook program,
+mutt addressbook, pine addressbook, palm addressbook, gnomecard
+addressbook, big brother database, ldap database.
+</p></item>
+
+<item><p>
+<link href="http://www.fiction.net/blong/programs/mutt/";>http://www.fiction.net/blong/programs/mutt/</link>
+ - palm address database, ldapsearch wrapper, ph/qi server, UIUC, ph,
+</p></item>
+</list>
+</section>
+
+<section id="extern-load-scripts">
+<title>Pisanje lastnih skript za nalaganje</title>
+
+<p><app>Balsa</app> ignores the first line of output from your program. You
+might want to write comments or debug output on this line. The
+remaining lines should have this format:</p>
+<p><output>
+e-mail address full name       nickname
+</output></p>
+
+<p>Tri polja morajo biti ločena s tabulatorji. Tretjega polja balsa trenutno ne uporablja, vendar ga morda v 
prihodnosti bo. Polje je obdržano tudi zaradi združljivosti z mutt.</p>
+
+<p><app>Balsa</app> executes your script with one argument: the pattern to
+search for. A space (" ") is used as the first argument when creating
+a list of all users.</p>
+
+<p>Dovoljeni so vsi znaki razen tabulatorja (\t), ker je ločnica polj.</p>
+
+<p>Primer izhoda bi lahko bil:</p>
+<p><output>
+lbdbq: 3 matches
+</output></p>
+<p><output>
+balsa-list gnome org   Balsa List      balsa-list
+</output></p><p><output>
+jelmer nl linux org    Jelmer Vernooij jelmer
+</output></p><p><output>
+balsa-maintainer theochem kth se       Pawel Salek     balsa-maintainer
+</output></p>
+
+
+<note><p>Your script/program should write its output to stdout and not
+to stderr!
+</p></note>
+</section>
+
+<section id="extern-save-scripts">
+<title>Pisanje vaših lastnih skript za shranjevanje</title>
+
+<p>Dodajanje naslovov je tudi mogoče. Vaša skripta bi morala prejeti 3 argumente. Prvi je e-poštni naslov, 
drugi je polno ime, tretji je vzdevek (trenutno ni uporabljen in je zamenjan s 'TODO').</p>
+
+<p>Vedite da mutt nima podpora za dodajanje naslovov in da zato v tem primeru ni združljivosti.</p>
+
+<p>Comments are welcome:
+<link href="mailto:jelmer nl linux org">jelmer nl linux org</link></p>
+</section>
+</section> <!-- EXTERN -->
+</page>
diff --git a/doc/sl/authors.page b/doc/sl/authors.page
new file mode 100644
index 0000000..1002c98
--- /dev/null
+++ b/doc/sl/authors.page
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE page [
+<!ENTITY % balsa SYSTEM "balsa.entities">
+<!ENTITY mdash "--">
+<!-- replace with actual app  version number--><!ENTITY version "2.5">
+<!ENTITY Balsa '<app xmlns="http://projectmallard.org/1.0/";>Balsa</app>'>
+<!ENTITY Mutt '<app xmlns="http://projectmallard.org/1.0/";>Mutt</app>'>
+<!ENTITY GnomeCard '<app xmlns="http://projectmallard.org/1.0/";>GnomeCard</app>'>
+<!ENTITY Pine '<app xmlns="http://projectmallard.org/1.0/";>pine</app>'>
+<!ENTITY procmail '<app xmlns="http://projectmallard.org/1.0/";>procmail</app>'>
+<!ENTITY GnuPG '<app xmlns="http://projectmallard.org/1.0/";>GnuPG</app>'>
+<!ENTITY balsalist "http://mail.gnome.org/mailman/listinfo/balsa-list";>
+<!ENTITY IMAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#imap">IMAP</link>'>
+<!ENTITY LDAP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#ldap">LDAP</link>'>
+<!ENTITY POP3 '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#pop">POP3</link>'>
+<!ENTITY SMTP '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#smtp">SMTP</link>'>
+<!ENTITY VCARD '<link xmlns="http://projectmallard.org/1.0/";
+           xref ="glossary#vcard">VCARD</link>'>
+]>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="authors" xml:lang="sl">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>Avtorji</title>
+  <p><app>Balsa</app> is currently developed by (in alphabetical
+  order):</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Carlos Morgado (
+      <link href="mailto:chbm chbm nu">chbm chbm nu</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+  </list>
+  <p>In the past, numerous people contributed to balsa, including
+  (in alphabetical order):</p>
+  <list>
+    <item>
+      <p>Hector Garcia Alvarez (
+      <link href="mailto:hector scouts-es org">
+      hector scouts-es org</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Bruno Pires Marinho (
+      <link href="mailto:bapm camoes rnl ist utl pt">
+      bapm camoes rnl ist utl pt</link> )</p>
+    </item>
+    <item>
+      <p>Jay Painter (
+      <link href="mailto:jpaint gimp org">
+      jpaint gimp org</link> )</p>
+    </item>
+    <item>
+      <p>Stuart Parmenter (
+      <link href="mailto:pavlov pavlov net">
+      pavlov pavlov net</link> )</p>
+    </item>
+    <item>
+      <p>David Pickens (
+      <link href="mailto:dpickens iaesthetic com">
+      dpickens iaesthetic com</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>To find more information about it, please visit the
+  <app>Balsa</app>
+  <link href="http://balsa.gnome.org/";>Web page</link>. Please send
+  all comments, suggestions, and bug reports to the
+  <link href="http://bugs.gnome.org/";>GNOME bug tracking
+  database</link>. Instructions for submitting bug reports can be
+  found on-line at
+  <link href="http://balsa.gnome.org/bugs.html";>
+  http://balsa.gnome.org/bugs.html</link>. If you are using GNOME
+  1.1 or later, you can also use command
+  <cmd>bug-buddy</cmd> for submitting bug reports.</p>
+  <p>The following people contributed to this manual:</p>
+  <list>
+    <item>
+      <p>Peter Bloomfield (
+      <link href="mailto:peterbloomfield bellsouth net">
+      peterbloomfield bellsouth net</link> )</p>
+    </item>
+    <item>
+      <p>Berend De Schouwer (
+      <link href="mailto:bds jhb ucs co za">
+      bds jhb ucs co za</link> )</p>
+    </item>
+    <item>
+      <p>Matthew Guenther (
+      <link href="mailto:guentherm asme org">
+      guentherm asme org</link> )</p>
+    </item>
+    <item>
+      <p>Craig Routledge (
+      <link href="mailto:webstuff craigroutledge com">
+      webstuff craigroutledge com</link> )</p>
+    </item>
+    <item>
+      <p>Pawel Salek (
+      <link href="mailto:pawsa theochem kth se">
+      pawsa theochem kth se</link> )</p>
+    </item>
+    <item>
+      <p>Jelmer Vernooij (
+      <link href="mailto:jelmer nl linux org">
+      jelmer nl linux org</link> )</p>
+    </item>
+    <item>
+      <p>Peter Williams (
+      <link href="mailto:peter newton cx">
+      peter newton cx</link> )</p>
+    </item>
+  </list>
+  <p>Please send all comments and suggestions regarding the manual
+  to the GNOME Documentation Project at
+  <link href="mailto:docs gnome org">docs gnome org</link> and the
+  <link href="http://mail.gnome.org/mailman/listinfo/balsa-list";>
+  <app>Balsa</app> Discussion List</link>. You can also add your
+  comments online by using
+  <link href="http://library.gnome.org/devel/gdp-handbook/stable/gettingstarted.html.en";>
+  GNOME Documentation Status Table</link>.</p>
+</page>
diff --git a/doc/