Moved one step up, because section 6 has been splitted into two.

10 files changed, 543 insertions, 517 deletions

diff --git a/manual/en/syl_010.sgml b/manual/en/syl_010.sgml
index ddab533..bd43098 100644
--- a/manual/en/syl_010.sgml
+++ b/manual/en/syl_010.sgml
@@ -1,25 +1,27 @@
-<sect>Address Book
-<p>
+<sect>Composing Messages
 
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/address_book.png">
-</figure>
-
-In the address book, accessible through Alt-A, the Addressbook button, or through the tool menu, you store e-mail addresses of the people and places you want to write more often.<p>
-
-<sect1>Adding and Deleting Addresses<p>
-Adding an address to the address book is quite easy too. Rightclick the folder or group you want to add the address to, select "new address" and fill in the dialog that comes up. You can also directly click the Add button in the address book window, and the dialog comes up. In this case the address is moved into the folder/group that is selected at the moment of adding.<p>
-Deleting an address is equally simple. Find the address, click it once, and press the Delete button.<p>
+<sect1>Composing a New Message<p>
+When you start writing a new message, you are presented a nice dialog in which you can enter all kinds of information. In the From: line you find a dropdown list. In there you can select the e-mail account you want to use as the sending account.<p>
+In the To: / Cc: / Bcc: part, you write the e-mail address of the receiver. You can enter several e-mail addresses, as long as they are separated by commas. An important utility here is the button "Address". When you click that, you see the address book. You can point at an address, click the "To:", "Cc:" or "Bcc:" button, and Sylpheed will place the address in the selected line. The Bcc: may be greyed out. In order to make that accessible, you need to add the Bcc: line to the message. You do that through the Message menu, and checking the Bcc option.<p>
+In the Subject line you enter a short descriptive text what your message will be about.<p>
+You can move between these lines by pressing TAB (to skip to the next line) and SHIFT-TAB (to go back up). When you press TAB in the last line, you will be moved to the message body.<p>
+Did you select a signature file in the settings for the active account, it will be in the message text already. You can now write your message. When you are done, you can click Send, Send later or Draft in the toolbar. Send attempts to send the message immediately. Send later will place it in the Send folder, and Draft will place it in the Draft folder.
 </sect1>
-
-<sect1>Folders and Groups<p>
-The address book, like the mail folders, can be expanded into an entire tree of sections. For this you right-click on the folder where you want to add a new folder, and select "new folder". Then you can enter a descriptive name for the folder, click Ok, and your folder is created.<p>
-In this same way you can create a new group in a folder. Right-click on the folder, select "new group", enter a name for it, and that's it.<p>
+<sect1>Replying to a Message<p>
+<!-- added 2001/07/19 -->
+To reply to a message, you use the "reply" function. In Sylpheed you activate this through either the "Reply" button, or by pressing Alt-R.<p>
+A new message window will be created, with the e-mail address of the recipient and the subject already set for you. Most of the things described in Composing a new message are also applicable to this window.
+<!-- end add 2001/07/19 -->
+</sect1>
+<sect1>Replying to a Message with Quotation<p>
+<!-- added 2001/07/19 -->
+If you want to have Sylpheed quote the text you are replying to, you need to go into the Configuration menu. There you select Common preferences, go to the Compose tab, and check the "Quote message when replying" box. There you can also edit the quotation mark (the mark put in front of each quoted line in the reply mail) and the reply attribution (which is placed in front of the reply text).
+<!-- end add 2001/07/19 -->
 </sect1>
-<sect1>Combination with Message Composition Window<p>
-Open the address-book through one of the available ways (toolbar, shortcut key).
-Finding an e-mail address: enter part of the start of the name or the address you are looking for and press the TAB key. A dropdown list will appear with the selections that have been found to match. Select one and press enter. After that you can use the To:, Cc: or Bcc: buttons to add the address to an e-mail, if you are writing one. Otherwise these buttons are greyed out and not functional.
+<sect1>Forwarding Messages<p>
+<!-- added 2001/07/19 -->
+Forwarding a message means: you send the entire message, including headers (Sender address, date sent etc.) on to someone else. For this you press the "Forward" button, or you press Ctrl-F. A new message window is created, containing the text of the selected message. You can then supply the name(s) of the recipient(s) of the message as in composing a new message, perhaps add a few lines of text to the message and send it on its way.
+<!-- end add 2001/07/19 -->
 </sect1>
 </sect>
 
diff --git a/manual/en/syl_011.sgml b/manual/en/syl_011.sgml
index 5d538e0..ddab533 100644
--- a/manual/en/syl_011.sgml
+++ b/manual/en/syl_011.sgml
@@ -1,151 +1,25 @@
-<!-- add 2001/07/21 -->
-<sect>Filtering Messages<p>
-Written by Nick Selby (sylpheed@nickselby.com)<p>
-
-<sect1>Filtering Messages<p>
-Sylpheed provides powerful filters to allow users to automatically pre-sort incoming 
-mail based on a set of rules that the user defines. As a most simple example, let's 
-say you work at the Acme Grommet Company, and you want all e-mail from your co-workers 
-to be placed in one mailbox. To accomplish this, you would set up a filter that would 
-place all mail whose "From" header includes the phrase "acmegrommet.com" into a specific mailbox.<p>
-Sylpheed allows you much more control than just that simple setup; you may create 
-filters based on several variables, including an "If this AND that" or "If the message 
-contains this OR does NOT contain that" etc. It's very cool.
-<sect2>Finding The Filter Setting Dialog<p>
-The filter settings dialog is located in the Configuration menu, under the title 
-"Filter Setting". You may also use establish a keyboard shortcut (see Keyboard Shortcuts). 
+<sect>Address Book
+<p>
 
 <figure loc="here">
 <ph vspace="1cm">
-<img src="snapshots/filters.png">
+<img src="snapshots/address_book.png">
 </figure>
 
-</sect2>
-<sect2>Setting Up Filters<p>
-Operator(s) and Processing instructions combine to create a Filter Rule.
-
-* Operators
-The dialog's first setting option establishes the Operator, the variable that will 
-tell the filter what specific text to look for to trigger a filter. Each Filter Rule may have up to two operator sets.<p>
-Each Operator variable contains three sections: Header, Keyword and Predicate.<p>
-Header is a drop-down box which defines in which message header Sylpheed's filter will search. Choices range from Subject to X-Mailer. 
+In the address book, accessible through Alt-A, the Addressbook button, or through the tool menu, you store e-mail addresses of the people and places you want to write more often.<p>
 
-Keyword is a a text box in which you may enter the text for which the filter will search. 
-
-Predicate allows you to choose to filter based on whether the operator 
-contains, or does not contain, the text you enter in the Keyword field. <p>
-Example: Create an Operator in which the X-Mailer field of an incoming message contains the word 'Eudora'.
-<itemize>
-<item>Step 1. Under the Header drop-down box, select X-Mailer.
-<item>Step 2. In the Keyword text box, type 'eudora' (case insensitive)
-<item>Step 3. Determine appropriate Predicate setting. Default is "Contains".
-</itemize>
-The second Operator setting, which is set identically to the first, also allows the 
-user to select an AND/OR setting declaring the relationship between the two operators. 
-<p>
-Example: Create an Operator set which will process mail with a "From" header of 
-bob@acmegrommet.com AND a subject of "2001 Spring Grommet Collection"
-<itemize>
-<item>Step 1. Under the first Operator set's Header drop-down box, select "From".
-<item>Step 2. In the "Keyword" text box, type 'bob@acmegrommet.com' (case insensitive)
-<item>Step 3. Leave "Predicate" setting on default, "Contains"
-<item>Step 4. Leave "AND/OR" box on default setting, "AND"
-<item>Step 5.	Under the second Operator set's "Header" drop-down box, select "Subject".
-<item>Step 6. In the "Keyword" text box, type '2001 spring grommet collection' (case insensitive)
-<item>Step 7. Leave "Predicate" setting on default, "Contains"
-</itemize>
-</sect2>
-<sect2>Message Processing<p>
-Once you've established the Operator(s) that will define which messages will be 
-processed, it's time to tell Sylpheed what to do with messages that match the 
-operator(s). You may choose between two radio button-selected settings: "Destination" and "Don't Receive".
-<p>
-Selecting "Destinations" will enable you to route the mail into   
-a mailbox which you specify.
-<p>
-Selecting "Don't Receive" will instruct Sylpheed to not download messages with that 
-operator. Note that with "Don't Receive", Sylpheed merely leaves the message on your mailserver - it does not delete it. 
+<sect1>Adding and Deleting Addresses<p>
+Adding an address to the address book is quite easy too. Rightclick the folder or group you want to add the address to, select "new address" and fill in the dialog that comes up. You can also directly click the Add button in the address book window, and the dialog comes up. In this case the address is moved into the folder/group that is selected at the moment of adding.<p>
+Deleting an address is equally simple. Find the address, click it once, and press the Delete button.<p>
+</sect1>
 
-To specify a mailbox to which you want the message transfered, click on the radio 
-button to the left of the word "Destination" in the dialog. (Currently, in order to 
-specify a mailbox you must have created that mailbox prior to activating the Filter 
-Setting dialog.) Clicking the "Select" button will open a pop-up window containing all 
-mail folders currently active in your copy of Sylpheed. Select the mailbox you wish by 
-either (a) double clicking on the mail folder name or (b) clicking the mail folder name and then clicking "OK".         
-<p>
-To specify that the message not be retrieved, and left on your mail server, click the 
-radio button to the left of the words "Don't Receive".
-</sect2>
-<sect2>Filter Registration<p>
-Now that you have set the Operator and the Processing Rule, all that's left to do is 
-tell Sylpheed to save the entire Filter Rule. If you skip this step, the filter won't work.
-<p>
-The "Register Rules" configuration has three options: "Register", "Substitute" and "Delete". 
-<itemize>
-<item>"Register" saves the Filter Rule.
-<item>"Substitute" modifies an existing registered Filter Rule.
-<item>"Delete" will remove a previously registered Filter Rule. 
-</itemize>
-Example of Registering A Filter Rule: Create a Filter Rule that moves all mail with 
-the subject of "Sylpheed Manual" into the (previously created) mail folder "Sylpheed Manual Mail".
-<itemize>
-<item>Step 1. Under the first Operator set's "Header" drop-down box, select "Subject".
-<item>Step 2. In the "Keyword" text box, type 'sylpheed manual' (case insensitive)
-<item>Step 3. Leave "Predicate" setting on default, "Contains". Leave second Operator set empty.
-<item>Step 4. Click "Destinations" radio button; select "Sylpheed Manual Mail" folder
-<item>Step 5. Click "Register"
-<item>Step 6. Click OK
-</itemize> 
-Example of Substituting A Filter Rule: Modify a previously created Filter Rule that 
-moves all mail with the subject of "Sylpheed Manual" to sort mail not to the 
-mail folder "Sylpheed Manual Mail" but rather the mail folder "Sylpheed Questions"  
-<itemize>
-<item>Step 1. Under the first Operator set's Header drop-down box, select Subject.
-<item>Step 2. In the Keyword text box, type 'sylpheed manual' (case insensitive)
-<item>Step 3. Leave Predicate setting on default, "Contains". Leave second Operator set empty.
-<item>Step 4. Click "Destinations" radio button; select "Sylpheed Questions" folder
-<item>Step 5. Click "Substitute"
-<item>Step 6. Click OK
-</itemize>
-Example of Deleting a Filter Rule: Remove the previously created Filter Rule which refers to Subject:Sylpheed Questions.
-<itemize>
-<item>Step 1. In the "Registered Rules" select box, highlight the filter entitled "Subject:Sylpheed Manual: :::Sylpheed Questions:1:1:m"
-<item>Step 2. Click the "Delete" Button
-<item>Step 3. Confirm the deletion by clicking "Yes" in the confirmation pop-up that asks, "Do you really want to delete this rule?
-<item>Step 4. Click "OK"
-</itemize>
-</sect2>
-<sect2>Registered Rule Order<p>
-One caveat about all this: the order in which Filter Rules are created could adversely 
-affect your intended message sorting, and one needs to consider this when creating or updating Filter Rules. 
-<p>
-For example, a Filter Rule saying, "Move anything containing 'ABC' to Mailbox X" listed above another Filter Rule saying "Move anything containing 'ABCDEF' to Mailbox Y" will cause the latter of these filters not to process. 
-<p>
-Think about the way Sylpheed goes down its list: first, it would say.."Hmm, any messages with ABC? Ah, there's one! Move it." Then it would think, "Okay, any messages with ABCDEF?" To which the answer would be "no" - that ABCDEF was already filtered because it contained "ABC".
-<p>
-Bummer.
-<p>
-In order to avoid this, you must ensure that the more complex Filter Rule is processed first, by placing it higher than a similar, conflicting Filter Rule. 
-<p>
-To move a Registered Rule higher or lower within the Registered Rule box, select the rule you would like to move, and click on the "Up" or "Down" buttons. This will "move" the rule up or down, above or below a potentially conflicting Filter Rule.   
-</sect2>
-<!-- end add 2001/07/21 -->
+<sect1>Folders and Groups<p>
+The address book, like the mail folders, can be expanded into an entire tree of sections. For this you right-click on the folder where you want to add a new folder, and select "new folder". Then you can enter a descriptive name for the folder, click Ok, and your folder is created.<p>
+In this same way you can create a new group in a folder. Right-click on the folder, select "new group", enter a name for it, and that's it.<p>
 </sect1>
-<sect1>How to Filter Messages<p>
-<!-- added 2001/07/22 -->
-Filtering messages can be done in several ways:
-<itemize>
-<item>Sylpheed automatically filters incoming mail from POP servers.
-<item>If you incorporate mail from a unix mailbox, then in the Common preferences (Configuration menu), you need to check the box called "Filter on incorporation". You find this box in the Receive tab in the space "Local spool".
-<item>You can also select the option "Filter messages" from the Summary menu.
-</itemize>
-Please note that, at time of writing, Sylpheed does -NOT YET- has filtering of IMAP messages enabled.
-<!-- end added 2001/07/22 -->
-<p>
+<sect1>Combination with Message Composition Window<p>
+Open the address-book through one of the available ways (toolbar, shortcut key).
+Finding an e-mail address: enter part of the start of the name or the address you are looking for and press the TAB key. A dropdown list will appear with the selections that have been found to match. Select one and press enter. After that you can use the To:, Cc: or Bcc: buttons to add the address to an e-mail, if you are writing one. Otherwise these buttons are greyed out and not functional.
 </sect1>
-<sect1>Filtering mail with Procmail<p>
-If you feel that Sylpheed has not enough options to perform filtering for you, then you can look at Sylpheed Claws which has more options for filtering. You can find the Claws version (the cutting edge, experimental version of Sylpheed) sylpheed-claws.sourceforge.net.<p>
-Another option, if you do not want to work with an experimental version of Sylpheed, is Procmail. Procmail is a powerful mail filtering program that is triggered from the Mail Transport Agent (i.e. Sendmail, Postfix, Qmail). Procmail is called by default from these programs after receiving e-mail.<p>
-The trick to procmail is to tell it that mail has to be filtered into MH mail folders. This is not difficult though.<p>
-Normally procmail moves mail into MBOX format, this is one large file containing all mails in a folder. MH uses separate files for each e-mail. All you need to do is point the destination of a procmail rule to &lt;destination folder&gt;/.  It is the "slash dot" that does the trick.
 </sect>
+
diff --git a/manual/en/syl_012.sgml b/manual/en/syl_012.sgml
index 47c79c6..5d538e0 100644
--- a/manual/en/syl_012.sgml
+++ b/manual/en/syl_012.sgml
@@ -1,56 +1,151 @@
-<sect>Handling MIME types
+<!-- add 2001/07/21 -->
+<sect>Filtering Messages<p>
+Written by Nick Selby (sylpheed@nickselby.com)<p>
 
-<sect1>How Sylpheed checks for Mime types<p>
+<sect1>Filtering Messages<p>
+Sylpheed provides powerful filters to allow users to automatically pre-sort incoming 
+mail based on a set of rules that the user defines. As a most simple example, let's 
+say you work at the Acme Grommet Company, and you want all e-mail from your co-workers 
+to be placed in one mailbox. To accomplish this, you would set up a filter that would 
+place all mail whose "From" header includes the phrase "acmegrommet.com" into a specific mailbox.<p>
+Sylpheed allows you much more control than just that simple setup; you may create 
+filters based on several variables, including an "If this AND that" or "If the message 
+contains this OR does NOT contain that" etc. It's very cool.
+<sect2>Finding The Filter Setting Dialog<p>
+The filter settings dialog is located in the Configuration menu, under the title 
+"Filter Setting". You may also use establish a keyboard shortcut (see Keyboard Shortcuts). 
 
-(Thanks to Adriaan Penning for writing this!)<p>
+<figure loc="here">
+<ph vspace="1cm">
+<img src="snapshots/filters.png">
+</figure>
 
-Two files, mime.types and mailcap, are involved in determining the mime type of an attachment, and the application associated with that mime type. The mime.types file is used to determine the mimetype of attachments you add when composing a message. The mime.types file consists of lines like:<p>
+</sect2>
+<sect2>Setting Up Filters<p>
+Operator(s) and Processing instructions combine to create a Filter Rule.
 
-application/pdf                    pdf<p>
+* Operators
+The dialog's first setting option establishes the Operator, the variable that will 
+tell the filter what specific text to look for to trigger a filter. Each Filter Rule may have up to two operator sets.<p>
+Each Operator variable contains three sections: Header, Keyword and Predicate.<p>
+Header is a drop-down box which defines in which message header Sylpheed's filter will search. Choices range from Subject to X-Mailer. 
 
-Sylpheed looks for this file in SYSCONFDIR (determined at compile time), /etc/ and $HOME/.sylpheed/ 
+Keyword is a a text box in which you may enter the text for which the filter will search. 
 
-If this file doesn't exist or has the wrong format, every attachment will have 	`application/octet-stream' as it's mime type, so the recipients mail client may not know what application to use to view the attachment.
-
-To change the default application that sylpheed uses to view an attachment that	somebody mailed you, look for a mailcap file like /etc/mailcap or $HOME/.mailcap
-
-For example, you can add a line like this in $HOME/.mailcap if you want to view pdf	files with xpdf:<p>
-
-application/pdf ; xpdf %s
-
-</sect1>
-</sect>
-
-<sect>Conversion of Other Mail Format into Sylpheed (MH Format)
-
-<sect1>Importing Messages of mbox Format<p>
-<!-- added 2001/07/20 -->
-Sylpheed lets you import messages of the Mbox format from the File menu. First you create 
-the mail folder where you want the messages to end up in, then you select File->import 
-Mbox file. Use the browse function to select the Mbox file and the Sylpheed mail folder, 
-and press Ok. And voila, there is your mail, imported.
-<p>
-That was easy, wasn't it?
-</sect1>
+Predicate allows you to choose to filter based on whether the operator 
+contains, or does not contain, the text you enter in the Keyword field. <p>
+Example: Create an Operator in which the X-Mailer field of an incoming message contains the word 'Eudora'.
+<itemize>
+<item>Step 1. Under the Header drop-down box, select X-Mailer.
+<item>Step 2. In the Keyword text box, type 'eudora' (case insensitive)
+<item>Step 3. Determine appropriate Predicate setting. Default is "Contains".
+</itemize>
+The second Operator setting, which is set identically to the first, also allows the 
+user to select an AND/OR setting declaring the relationship between the two operators. 
+<p>
+Example: Create an Operator set which will process mail with a "From" header of 
+bob@acmegrommet.com AND a subject of "2001 Spring Grommet Collection"
+<itemize>
+<item>Step 1. Under the first Operator set's Header drop-down box, select "From".
+<item>Step 2. In the "Keyword" text box, type 'bob@acmegrommet.com' (case insensitive)
+<item>Step 3. Leave "Predicate" setting on default, "Contains"
+<item>Step 4. Leave "AND/OR" box on default setting, "AND"
+<item>Step 5.	Under the second Operator set's "Header" drop-down box, select "Subject".
+<item>Step 6. In the "Keyword" text box, type '2001 spring grommet collection' (case insensitive)
+<item>Step 7. Leave "Predicate" setting on default, "Contains"
+</itemize>
+</sect2>
+<sect2>Message Processing<p>
+Once you've established the Operator(s) that will define which messages will be 
+processed, it's time to tell Sylpheed what to do with messages that match the 
+operator(s). You may choose between two radio button-selected settings: "Destination" and "Don't Receive".
+<p>
+Selecting "Destinations" will enable you to route the mail into   
+a mailbox which you specify.
+<p>
+Selecting "Don't Receive" will instruct Sylpheed to not download messages with that 
+operator. Note that with "Don't Receive", Sylpheed merely leaves the message on your mailserver - it does not delete it. 
 
-<sect1>Importing from Windows Mailers (Becky!, AL-Mail, Outlook Express4, etc.)
+To specify a mailbox to which you want the message transfered, click on the radio 
+button to the left of the word "Destination" in the dialog. (Currently, in order to 
+specify a mailbox you must have created that mailbox prior to activating the Filter 
+Setting dialog.) Clicking the "Select" button will open a pop-up window containing all 
+mail folders currently active in your copy of Sylpheed. Select the mailbox you wish by 
+either (a) double clicking on the mail folder name or (b) clicking the mail folder name and then clicking "OK".         
+<p>
+To specify that the message not be retrieved, and left on your mail server, click the 
+radio button to the left of the words "Don't Receive".
+</sect2>
+<sect2>Filter Registration<p>
+Now that you have set the Operator and the Processing Rule, all that's left to do is 
+tell Sylpheed to save the entire Filter Rule. If you skip this step, the filter won't work.
+<p>
+The "Register Rules" configuration has three options: "Register", "Substitute" and "Delete". 
+<itemize>
+<item>"Register" saves the Filter Rule.
+<item>"Substitute" modifies an existing registered Filter Rule.
+<item>"Delete" will remove a previously registered Filter Rule. 
+</itemize>
+Example of Registering A Filter Rule: Create a Filter Rule that moves all mail with 
+the subject of "Sylpheed Manual" into the (previously created) mail folder "Sylpheed Manual Mail".
+<itemize>
+<item>Step 1. Under the first Operator set's "Header" drop-down box, select "Subject".
+<item>Step 2. In the "Keyword" text box, type 'sylpheed manual' (case insensitive)
+<item>Step 3. Leave "Predicate" setting on default, "Contains". Leave second Operator set empty.
+<item>Step 4. Click "Destinations" radio button; select "Sylpheed Manual Mail" folder
+<item>Step 5. Click "Register"
+<item>Step 6. Click OK
+</itemize> 
+Example of Substituting A Filter Rule: Modify a previously created Filter Rule that 
+moves all mail with the subject of "Sylpheed Manual" to sort mail not to the 
+mail folder "Sylpheed Manual Mail" but rather the mail folder "Sylpheed Questions"  
+<itemize>
+<item>Step 1. Under the first Operator set's Header drop-down box, select Subject.
+<item>Step 2. In the Keyword text box, type 'sylpheed manual' (case insensitive)
+<item>Step 3. Leave Predicate setting on default, "Contains". Leave second Operator set empty.
+<item>Step 4. Click "Destinations" radio button; select "Sylpheed Questions" folder
+<item>Step 5. Click "Substitute"
+<item>Step 6. Click OK
+</itemize>
+Example of Deleting a Filter Rule: Remove the previously created Filter Rule which refers to Subject:Sylpheed Questions.
+<itemize>
+<item>Step 1. In the "Registered Rules" select box, highlight the filter entitled "Subject:Sylpheed Manual: :::Sylpheed Questions:1:1:m"
+<item>Step 2. Click the "Delete" Button
+<item>Step 3. Confirm the deletion by clicking "Yes" in the confirmation pop-up that asks, "Do you really want to delete this rule?
+<item>Step 4. Click "OK"
+</itemize>
+</sect2>
+<sect2>Registered Rule Order<p>
+One caveat about all this: the order in which Filter Rules are created could adversely 
+affect your intended message sorting, and one needs to consider this when creating or updating Filter Rules. 
+<p>
+For example, a Filter Rule saying, "Move anything containing 'ABC' to Mailbox X" listed above another Filter Rule saying "Move anything containing 'ABCDEF' to Mailbox Y" will cause the latter of these filters not to process. 
 <p>
-For import possibilities of the mail folders of these and more mail programs you 
-can download the program mbx2mbox at sourceforge.net. The project is located at 
-<url url="http://mbx2mbox.sourceforge.net" name ="http://mbx2mbox.sourceforge.net.">
+Think about the way Sylpheed goes down its list: first, it would say.."Hmm, any messages with ABC? Ah, there's one! Move it." Then it would think, "Okay, any messages with ABCDEF?" To which the answer would be "no" - that ABCDEF was already filtered because it contained "ABC".
+<p>
+Bummer.
+<p>
+In order to avoid this, you must ensure that the more complex Filter Rule is processed first, by placing it higher than a similar, conflicting Filter Rule. 
+<p>
+To move a Registered Rule higher or lower within the Registered Rule box, select the rule you would like to move, and click on the "Up" or "Down" buttons. This will "move" the rule up or down, above or below a potentially conflicting Filter Rule.   
+</sect2>
+<!-- end add 2001/07/21 -->
 </sect1>
-<sect1>Importing dbx Format of Outlook Express 5<p>
-For import possibilities of the mail folders of these and more mail programs you 
-can download the program mbx2mbox at sourceforge.net. The project is located at 
-<url url="http://mbx2mbox.sourceforge.net" name="http://mbx2mbox.sourceforge.net.">
+<sect1>How to Filter Messages<p>
+<!-- added 2001/07/22 -->
+Filtering messages can be done in several ways:
+<itemize>
+<item>Sylpheed automatically filters incoming mail from POP servers.
+<item>If you incorporate mail from a unix mailbox, then in the Common preferences (Configuration menu), you need to check the box called "Filter on incorporation". You find this box in the Receive tab in the space "Local spool".
+<item>You can also select the option "Filter messages" from the Summary menu.
+</itemize>
+Please note that, at time of writing, Sylpheed does -NOT YET- has filtering of IMAP messages enabled.
+<!-- end added 2001/07/22 -->
+<p>
 </sect1>
-<!-- End added 2001/07/21 -->
-<!-- start add 2001/09/04 -->
-<sect1>Exporting from Sylpheed MH format to mbox<p>
-Sylpheed offers a way to export a mailbox to the standard mbox format through the 
-File menu. Just select the "Export to mbox file..." option and you can select the 
-folder to export (assisted by a browse dialog) and also select or enter the name 
-of the mbox file you wish to generate.
-<!-- end add 2001/09/04 -->
+<sect1>Filtering mail with Procmail<p>
+If you feel that Sylpheed has not enough options to perform filtering for you, then you can look at Sylpheed Claws which has more options for filtering. You can find the Claws version (the cutting edge, experimental version of Sylpheed) sylpheed-claws.sourceforge.net.<p>
+Another option, if you do not want to work with an experimental version of Sylpheed, is Procmail. Procmail is a powerful mail filtering program that is triggered from the Mail Transport Agent (i.e. Sendmail, Postfix, Qmail). Procmail is called by default from these programs after receiving e-mail.<p>
+The trick to procmail is to tell it that mail has to be filtered into MH mail folders. This is not difficult though.<p>
+Normally procmail moves mail into MBOX format, this is one large file containing all mails in a folder. MH uses separate files for each e-mail. All you need to do is point the destination of a procmail rule to &lt;destination folder&gt;/.  It is the "slash dot" that does the trick.
 </sect>
-
diff --git a/manual/en/syl_013.sgml b/manual/en/syl_013.sgml
index 328db0e..47c79c6 100644
--- a/manual/en/syl_013.sgml
+++ b/manual/en/syl_013.sgml
@@ -1,46 +1,56 @@
-<sect>NetNews<p>
-What is netnews?<p>
-Netnews, also called Usenet, is a collection of "news servers" that contain a great deal of information. News, as it is called in short, can be about anything. About making your own wine, about old cars or radios. You name it, and there probably is a newsgroup about it.<p>
-This is what we will set up here. Accessing newsgroups. Note that this is different from e-mails. You can almost compare it to a mailing list, but yet the concept is a bit different.
+<sect>Handling MIME types
+
+<sect1>How Sylpheed checks for Mime types<p>
+
+(Thanks to Adriaan Penning for writing this!)<p>
+
+Two files, mime.types and mailcap, are involved in determining the mime type of an attachment, and the application associated with that mime type. The mime.types file is used to determine the mimetype of attachments you add when composing a message. The mime.types file consists of lines like:<p>
+
+application/pdf                    pdf<p>
+
+Sylpheed looks for this file in SYSCONFDIR (determined at compile time), /etc/ and $HOME/.sylpheed/ 
+
+If this file doesn't exist or has the wrong format, every attachment will have 	`application/octet-stream' as it's mime type, so the recipients mail client may not know what application to use to view the attachment.
+
+To change the default application that sylpheed uses to view an attachment that	somebody mailed you, look for a mailcap file like /etc/mailcap or $HOME/.mailcap
+
+For example, you can add a line like this in $HOME/.mailcap if you want to view pdf	files with xpdf:<p>
+
+application/pdf ; xpdf %s
+
+</sect1>
+</sect>
+
+<sect>Conversion of Other Mail Format into Sylpheed (MH Format)
+
+<sect1>Importing Messages of mbox Format<p>
 <!-- added 2001/07/20 -->
-<sect1>Adding and Deleting Servers<p>
-<sect2>
-Adding a news server<p>
-To add a news server, go to the configuration menu and select the "create new account" option.
-There you can name the news-account to anything of your liking. This is important, so you can identify the account later.<p>
-In the BASIC tab, in the block 'personal information' you also can enter your own name, your e-mail address (so you can reply to news message by e-mail), optionally your organization (if you are organized at all).<p>
-In the block 'Server information' you select the "News (NNTP)" protocol. Forget about "Inbox", that does not matter in this setup. Next you enter the name of the newsserver you want to connect to. You can get that name from your ISP, if you don't already have that.<p>
-If you need to log into the news server, check the box next to "This server requires authentication", and then fill the fields for User ID and Password.<p>
-Next step is to go to the Send tab. Since Receive is only there for e-mail, there is no need to do anything there. You can't even do anything in the Receive tab, for that matter. So, in Send you can select a few options:
-<itemize>
-<item>If you want a date header field added to posts
-<item>If Sylpheed should generate a Message-ID
-<item>If you want to add user-defined headers
-</itemize>
-The next items only apply to when you reply to a news message through e-mail. You can set an automatic CC, BCC or Reply-To address here. In case your ISP requires SMTP authentication, you can select the checkbox here below.<p>
-The next tab, Compose, allows you to select a default signature file. This will be added to each post to the newsgroups you do.<p>
-Finally, in the "Advanced" tab, you can specify the port on which Sylpheed has to connect to the news server. The default is 119, and only in rare cases you should have to do something about that.<p>
-Now you click "OK" and the account is created! You can verify this by checking the folder pane in Sylpheed. There you will see a new folder created with the name of the account you entered, and (news) behind it.<p>
-</sect2>
-<sect2>
-Deleting a news-server.<p>
-If you want to delete a news-account, right-click the news-folder and select "Remove news account". After confirming that you want this to be done, the account and all files related will be removed.
-</sect2>
+Sylpheed lets you import messages of the Mbox format from the File menu. First you create 
+the mail folder where you want the messages to end up in, then you select File->import 
+Mbox file. Use the browse function to select the Mbox file and the Sylpheed mail folder, 
+and press Ok. And voila, there is your mail, imported.
+<p>
+That was easy, wasn't it?
 </sect1>
-<sect1>Subscribing and Unsubscribing to NewsGroups<p>
-Okay. Here the real stuff begins. First you have to let Sylpheed load the list of news groups that is on the news system. Right-click the new NEWS folder and select "Subscribe to newsgroups". Sylpheed will tell you that the groups need to be downloaded, so sit back and wait a while. Of course, during time, new groups are added, and dead groups are removed. For this you can click the "refresh" button in the newsgroup dialog, so a new list is downloaded and you are up to date<p>
-After a while the groups are loaded and displayed in a window. Now you can look up a group that is interesting, for example comp.os.linux.networking. Click the name once and then select OK. The group will be added to the news folder as a subfolder. When you now click the name of the new subfolder, Sylpheed will connect to the news server and download the headers (subject lines, in e-mail talk), to your computer. Some groups have -large- amounts of articles, so this may take a while!!<p>
+
+<sect1>Importing from Windows Mailers (Becky!, AL-Mail, Outlook Express4, etc.)
+<p>
+For import possibilities of the mail folders of these and more mail programs you 
+can download the program mbx2mbox at sourceforge.net. The project is located at 
+<url url="http://mbx2mbox.sourceforge.net" name ="http://mbx2mbox.sourceforge.net.">
 </sect1>
-<sect1>Reading News<p>
-When the articles are displayed, in the summary view, you can click one of them to be downloaded so you can read it. This will usually go very quickly on discussion groups.<p>
-If you want to respond to a message, press Alt-R (or press "Reply") and a message window will pop up, with the name of the newsgroup already in the "To" field. Depending on whether or not you selected quoting of the message, the original message will be in the body of the message already. Write away, then send, and soon the entire world will be able to read what you wrote on the subject.<p>
-Starting a new message in a newsgroup is equally simple: press Alt-N (or click "New"), the name of the newsgroup is in the "To" field, and you can write your question or reply.
-<sect2>A note about binary files<p>
-In newsgroups you can download binary files. These are programs, images etc. Often these are posted as so called UUencoded files. Sylpheed will as upto version 0.5.1 not decode UUencoded files. You need to save these articles to disk as separate files, and use a separate decoder program, like juju, to decode the garble of text. A UUencoded file usually looks something like this:<p>
-begin 666 sundown.jpg<p>
-after which you will find nicely formatted blocks of characters that don't seem to mean anything.
-</sect2>
+<sect1>Importing dbx Format of Outlook Express 5<p>
+For import possibilities of the mail folders of these and more mail programs you 
+can download the program mbx2mbox at sourceforge.net. The project is located at 
+<url url="http://mbx2mbox.sourceforge.net" name="http://mbx2mbox.sourceforge.net.">
 </sect1>
-<!-- end add 2001/07/20 -->
+<!-- End added 2001/07/21 -->
+<!-- start add 2001/09/04 -->
+<sect1>Exporting from Sylpheed MH format to mbox<p>
+Sylpheed offers a way to export a mailbox to the standard mbox format through the 
+File menu. Just select the "Export to mbox file..." option and you can select the 
+folder to export (assisted by a browse dialog) and also select or enter the name 
+of the mbox file you wish to generate.
+<!-- end add 2001/09/04 -->
 </sect>
 
diff --git a/manual/en/syl_014.sgml b/manual/en/syl_014.sgml
index 781495a..328db0e 100644
--- a/manual/en/syl_014.sgml
+++ b/manual/en/syl_014.sgml
@@ -1,92 +1,46 @@
-<sect>Customization (General Setup)<p>
-Sylpheed offers you several ways to customize it's interface for your personal use.<p>
-<sect1>General Setup Window<p>
-For making changes to Sylpheed's interface, you need to open the "common preferences" in the Configuration menu.<p>
-In here you will find a tabbed window that offers the following possibility to customize Sylpheed.
-</sect1>
-<sect1>Description of Each Entry<p>
-In the third tab, "Compose", the following settings can be changed:
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_compose.png">
-</figure>
-
-<itemize>
-<item>Quoting the original text of a message
-<item>Define the quoting character that is put in front of each line of text.
-<item>Define the text that is placed in front of the quoted text
-<item>An optional signature separator. This is a combination of characters that are placed in front of a signature text.
-<item>Whether or not to insert the signature automatically
-<item>Define if the account that recieved the message should automatically be used as the account from which the reply is sent. This also influences the signature to be selected.
-<item>Set the position of the line where wrapping should occur.
-<item>Select if the quoted text should be wrapped also.
-<item>Indicate if e-mail text should be wrapped or not. If you choose not to select wrapping, then the lines you wrote will not be chopped up by carriage return/line feed characters.
-</itemize>
-In the fourth tab, "Display", you can set or unset the following options:
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_display.png">
-</figure>
-
-<itemize>
-<item><tt>Font.</tt> You can set the font that is used to display the messages.
-<item><tt>Translate header name.</tt> This options changes the behaviour of the different headers.
-<item><tt>Unread number.</tt> This toggles the display of the number of unread messages next to each mailbox.
-<item><tt>Display recipient.</tt> With this option you can tell Sylpheed to show the recipient in the summary view when you are the one who sent the message.
-<item><tt>Enable horizontal scrollbar.</tt> This option enables or disables showing the horizontal toolbar beneath the summary view. With the bar disabled, you cannot scroll to the right to see extremely long message subjects.
-<item><tt>Expand threads.</tt> If you disable this options and you have enabled the Threaded view through the Summary menu, threads are shown as collapsed lines with a '+' sign in front of them. Enable this option to show all the messages in a thread.
-<item><tt>Display unread with bold font.</tt> If you enable this checkbox, messages in the summary view that have not been read yet are shown in a bold font. Unchecking this option will of course show all messages in the default font.
-<item><tt>Date format.</tt> This option puts you in charge of the way the date of an e-mail message is shown. You can click the "..." button to open a new window. In there you see the codings that you can use to format the date. As you change the codings, an example is shown beneath the coding sequence of how your date will look.
-<item><tt>Set display item.</tt> This button allows you to select the specific columns that will be shown in the summary view.
-</itemize>
-Next to these options, there is the message tab, in which you can set the following choices:
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_message.png">
-</figure>
-
+<sect>NetNews<p>
+What is netnews?<p>
+Netnews, also called Usenet, is a collection of "news servers" that contain a great deal of information. News, as it is called in short, can be about anything. About making your own wine, about old cars or radios. You name it, and there probably is a newsgroup about it.<p>
+This is what we will set up here. Accessing newsgroups. Note that this is different from e-mails. You can almost compare it to a mailing list, but yet the concept is a bit different.
+<!-- added 2001/07/20 -->
+<sect1>Adding and Deleting Servers<p>
+<sect2>
+Adding a news server<p>
+To add a news server, go to the configuration menu and select the "create new account" option.
+There you can name the news-account to anything of your liking. This is important, so you can identify the account later.<p>
+In the BASIC tab, in the block 'personal information' you also can enter your own name, your e-mail address (so you can reply to news message by e-mail), optionally your organization (if you are organized at all).<p>
+In the block 'Server information' you select the "News (NNTP)" protocol. Forget about "Inbox", that does not matter in this setup. Next you enter the name of the newsserver you want to connect to. You can get that name from your ISP, if you don't already have that.<p>
+If you need to log into the news server, check the box next to "This server requires authentication", and then fill the fields for User ID and Password.<p>
+Next step is to go to the Send tab. Since Receive is only there for e-mail, there is no need to do anything there. You can't even do anything in the Receive tab, for that matter. So, in Send you can select a few options:
 <itemize>
-<item><tt>Enable colorization.</tt> When you enable this option, you can define with what colors the message text and the quotings will be displayed.
-<item><tt>Display 2-byte alphabet and numeric with 1 character.</tt> This option is necessary for double-byte languages as Japanese and Chinese.
-<item><tt>Display header pane above message view.</tt> Enabled, this option shows the From, To and Subject headers from the selected e-mail in a separate area over the message view.
-<item><tt>Display short headers on message view.</tt> This option lets you select all the headers that will be shown in the message view window. There are options to enable all, no or selected headers.
-<item><tt>Line space.</tt> This option lets you select how many pixels of space Sylpheed has to show between the lines of text in the message view window.
-<item><tt>Leave space on head.</tt> Checking this box will make the start of new lines (unwrapped, where the writer has pressed the Enter/Return key) indent a few pixels. This can be useful to read larger e-mails.
-<item><tt>Scroll half page.</tt> When enabled, the text in the message view will only scroll half a page instead of a whole page when pressing the space bar.
-<item><tt>Smooth scroll.</tt> Enabling this box will make the text in the message view scroll in a smooth, sliding way. For the eye this can be pleasing, it is a personal preference.
-</itemize>
-The tab "Interface" allows even more customization of Sylpheed. This tab features:
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_interface.png">
-</figure>
-
-<itemize>
-<item>Opening the first unread message when you enter a folder.
-<item>Automatically move focus to the inbox after new mail was received.
-<item>Immediate execution of commands like delete, move or copy.
-<item>Influence the way the "receive" dialog box behaves when new mail is retrieved (Always, When a window is active, Never).
-<item>Double clicking an e-mail address can be used to put that address in a new e-mail.
-<item>Confirming if you want to exit Sylpheed.
-<item>Cleaning the trashbox when exiting Sylpheed.
-<item>Have Sylpheed ask you to clean the trash before it is done.
-<item>Warn you when exiting Sylpheed when there are still messages queued to be sent.
-</itemize>
-Finally there is the "Other" tab. In here you can define the programs you want as helper applications for Sylpheed.
-
-<figure loc="here">
-<ph vspace="1cm">
-<img src="snapshots/pref_other.png">
-</figure>
-
-<itemize>
-<item><tt>The web browser.</tt> Here you can enter the name of your favorite web browser (Netscape, Opera, Mozilla, Lynx etc.). Add the %s parameter to the command so Sylpheed knows it has to provide the text you clicked on as the URL that the browser has to visit.
-<item><tt>Printing.</tt> Here you can define the program that should be used to print. Default is lpr, and the %s is the name of the temporary file that Sylpheed creates for lpr to print.
-<item><tt>External editor.</tt> You can select an external editor to write your e-mails with, for example vi, emacs or gedit. Note that for text-based editors like vi, you need to define a terminal window, e.g. <tt>xterm -e vi %s</tt>. Otherwise there is no place that the editor will be able to show up. Here too, the %s parameter is the name of a temporary file that is created by Sylpheed.
+<item>If you want a date header field added to posts
+<item>If Sylpheed should generate a Message-ID
+<item>If you want to add user-defined headers
 </itemize>
+The next items only apply to when you reply to a news message through e-mail. You can set an automatic CC, BCC or Reply-To address here. In case your ISP requires SMTP authentication, you can select the checkbox here below.<p>
+The next tab, Compose, allows you to select a default signature file. This will be added to each post to the newsgroups you do.<p>
+Finally, in the "Advanced" tab, you can specify the port on which Sylpheed has to connect to the news server. The default is 119, and only in rare cases you should have to do something about that.<p>
+Now you click "OK" and the account is created! You can verify this by checking the folder pane in Sylpheed. There you will see a new folder created with the name of the account you entered, and (news) behind it.<p>
+</sect2>
+<sect2>
+Deleting a news-server.<p>
+If you want to delete a news-account, right-click the news-folder and select "Remove news account". After confirming that you want this to be done, the account and all files related will be removed.
+</sect2>
+</sect1>
+<sect1>Subscribing and Unsubscribing to NewsGroups<p>
+Okay. Here the real stuff begins. First you have to let Sylpheed load the list of news groups that is on the news system. Right-click the new NEWS folder and select "Subscribe to newsgroups". Sylpheed will tell you that the groups need to be downloaded, so sit back and wait a while. Of course, during time, new groups are added, and dead groups are removed. For this you can click the "refresh" button in the newsgroup dialog, so a new list is downloaded and you are up to date<p>
+After a while the groups are loaded and displayed in a window. Now you can look up a group that is interesting, for example comp.os.linux.networking. Click the name once and then select OK. The group will be added to the news folder as a subfolder. When you now click the name of the new subfolder, Sylpheed will connect to the news server and download the headers (subject lines, in e-mail talk), to your computer. Some groups have -large- amounts of articles, so this may take a while!!<p>
 </sect1>
+<sect1>Reading News<p>
+When the articles are displayed, in the summary view, you can click one of them to be downloaded so you can read it. This will usually go very quickly on discussion groups.<p>
+If you want to respond to a message, press Alt-R (or press "Reply") and a message window will pop up, with the name of the newsgroup already in the "To" field. Depending on whether or not you selected quoting of the message, the original message will be in the body of the message already. Write away, then send, and soon the entire world will be able to read what you wrote on the subject.<p>
+Starting a new message in a newsgroup is equally simple: press Alt-N (or click "New"), the name of the newsgroup is in the "To" field, and you can write your question or reply.
+<sect2>A note about binary files<p>
+In newsgroups you can download binary files. These are programs, images etc. Often these are posted as so called UUencoded files. Sylpheed will as upto version 0.5.1 not decode UUencoded files. You need to save these articles to disk as separate files, and use a separate decoder program, like juju, to decode the garble of text. A UUencoded file usually looks something like this:<p>
+begin 666 sundown.jpg<p>
+after which you will find nicely formatted blocks of characters that don't seem to mean anything.
+</sect2>
+</sect1>
+<!-- end add 2001/07/20 -->
 </sect>
+
diff --git a/manual/en/syl_015.sgml b/manual/en/syl_015.sgml
index 3ecdd69..781495a 100644
--- a/manual/en/syl_015.sgml
+++ b/manual/en/syl_015.sgml
@@ -1,95 +1,92 @@
-<sect>Reference<p>
-<!-- Added 2001/07/21 -->
-In this section you will find a few pieces of information that might be handy in making Sylpheed more clear for you in respect to the used shortcut keys, and a layout of the format of the address book.
-<sect1>Short-Cut Key List<label id="shortcut"><p>
-<sect2>One-key shortcuts:<p>
-<itemize>
-<item>a: create a new message
-<item>d: delete the selected message
-<item>f: forward the selected message#
-<item>g: go to a specific folder through a browsing dialog
-<item>n: jump to the next message/next part of a multipart message
-<item>p: jump to the previous message/previous part of a multipart message
-<item>v: switch on/off the message view
-<item>w: same as a
-<item>y: Opens save as... dialog
-</itemize>
-</sect2>
-<sect2>Shortcuts to the File menu:<p>
-<itemize>
-<item>Alt-F: open FILE menu
-<item>Alt-P: print
-<item>Alt-W: close
-<item>Alt-Q: exit
-</itemize>
-</sect2>
-<sect2>Shortcuts to the Edit menu<p>
-<itemize>
-<item>Alt-E: open EDIT menu
-<item>Ctrl-C: copy
-<item>Ctrl-A: select all
-<item>Ctrl-S: search
-</itemize>
-</sect2>
-<sect2>Shortcuts to the View menu<p>
+<sect>Customization (General Setup)<p>
+Sylpheed offers you several ways to customize it's interface for your personal use.<p>
+<sect1>General Setup Window<p>
+For making changes to Sylpheed's interface, you need to open the "common preferences" in the Configuration menu.<p>
+In here you will find a tabbed window that offers the following possibility to customize Sylpheed.
+</sect1>
+<sect1>Description of Each Entry<p>
+In the third tab, "Compose", the following settings can be changed:
+
+<figure loc="here">
+<ph vspace="1cm">
+<img src="snapshots/pref_compose.png">
+</figure>
+
 <itemize>
-<item>Alt-V: open VIEW menu
+<item>Quoting the original text of a message
+<item>Define the quoting character that is put in front of each line of text.
+<item>Define the text that is placed in front of the quoted text
+<item>An optional signature separator. This is a combination of characters that are placed in front of a signature text.
+<item>Whether or not to insert the signature automatically
+<item>Define if the account that recieved the message should automatically be used as the account from which the reply is sent. This also influences the signature to be selected.
+<item>Set the position of the line where wrapping should occur.
+<item>Select if the quoted text should be wrapped also.
+<item>Indicate if e-mail text should be wrapped or not. If you choose not to select wrapping, then the lines you wrote will not be chopped up by carriage return/line feed characters.
 </itemize>
-<sect2>Shortcuts to the Message menu<p>
+In the fourth tab, "Display", you can set or unset the following options:
+
+<figure loc="here">
+<ph vspace="1cm">
+<img src="snapshots/pref_display.png">
+</figure>
+
 <itemize>
-<item>Alt-M: open MESSAGE menu
-<item>Alt-I: check mail for current account
-<item>Shift-Alt-I: Check mail for all accounts
-<item>Alt-N: compose new message
-<item>Alt-R: reply to message
-<item>Ctrl-Alt-R: reply to sender (contrary to reply to e.g. mailing list)
-<item>Shift-Alt-R: reply to all (includes all addresses in To: and Cc:)
-<item>Ctrl-F: forward message
-<item>Shift-Ctrl-F: forward message as attachment
-<item>Alt-O: move message
-<item>Alt-D: delete message
-<item>Shift-Ctrl-N: open message in new window
-<item>Ctrl-U: view message source
-<item>Ctrl-H: show all message headers
+<item><tt>Font.</tt> You can set the font that is used to display the messages.
+<item><tt>Translate header name.</tt> This options changes the behaviour of the different headers.
+<item><tt>Unread number.</tt> This toggles the display of the number of unread messages next to each mailbox.
+<item><tt>Display recipient.</tt> With this option you can tell Sylpheed to show the recipient in the summary view when you are the one who sent the message.
+<item><tt>Enable horizontal scrollbar.</tt> This option enables or disables showing the horizontal toolbar beneath the summary view. With the bar disabled, you cannot scroll to the right to see extremely long message subjects.
+<item><tt>Expand threads.</tt> If you disable this options and you have enabled the Threaded view through the Summary menu, threads are shown as collapsed lines with a '+' sign in front of them. Enable this option to show all the messages in a thread.
+<item><tt>Display unread with bold font.</tt> If you enable this checkbox, messages in the summary view that have not been read yet are shown in a bold font. Unchecking this option will of course show all messages in the default font.
+<item><tt>Date format.</tt> This option puts you in charge of the way the date of an e-mail message is shown. You can click the "..." button to open a new window. In there you see the codings that you can use to format the date. As you change the codings, an example is shown beneath the coding sequence of how your date will look.
+<item><tt>Set display item.</tt> This button allows you to select the specific columns that will be shown in the summary view.
 </itemize>
-</sect2>
-<sect2>Shortcuts to the Summary menu<p>
+Next to these options, there is the message tab, in which you can set the following choices:
+
+<figure loc="here">
+<ph vspace="1cm">
+<img src="snapshots/pref_message.png">
+</figure>
+
 <itemize>
-<item>Alt-S: open SUMMARY menu<p>
-<item>Alt-X: execute (pending commands, only useful when commands are not executed immediately)
-<item>Alt-U: update view
-<item>Alt-G: go to other folder
-<item>Ctrl-T: thread view
-<item>Shift-Ctrl-T: unthread view
+<item><tt>Enable colorization.</tt> When you enable this option, you can define with what colors the message text and the quotings will be displayed.
+<item><tt>Display 2-byte alphabet and numeric with 1 character.</tt> This option is necessary for double-byte languages as Japanese and Chinese.
+<item><tt>Display header pane above message view.</tt> Enabled, this option shows the From, To and Subject headers from the selected e-mail in a separate area over the message view.
+<item><tt>Display short headers on message view.</tt> This option lets you select all the headers that will be shown in the message view window. There are options to enable all, no or selected headers.
+<item><tt>Line space.</tt> This option lets you select how many pixels of space Sylpheed has to show between the lines of text in the message view window.
+<item><tt>Leave space on head.</tt> Checking this box will make the start of new lines (unwrapped, where the writer has pressed the Enter/Return key) indent a few pixels. This can be useful to read larger e-mails.
+<item><tt>Scroll half page.</tt> When enabled, the text in the message view will only scroll half a page instead of a whole page when pressing the space bar.
+<item><tt>Smooth scroll.</tt> Enabling this box will make the text in the message view scroll in a smooth, sliding way. For the eye this can be pleasing, it is a personal preference.
 </itemize>
-</sect2>
-<sect2>Shortcuts to the Tool menu<p>
+The tab "Interface" allows even more customization of Sylpheed. This tab features:
+
+<figure loc="here">
+<ph vspace="1cm">
+<img src="snapshots/pref_interface.png">
+</figure>
+
 <itemize>
-<item>Alt-T: open tool menu
-<item>Alt-A: open addressbook
-<item>Alt-L: open logfile
+<item>Opening the first unread message when you enter a folder.
+<item>Automatically move focus to the inbox after new mail was received.
+<item>Immediate execution of commands like delete, move or copy.
+<item>Influence the way the "receive" dialog box behaves when new mail is retrieved (Always, When a window is active, Never).
+<item>Double clicking an e-mail address can be used to put that address in a new e-mail.
+<item>Confirming if you want to exit Sylpheed.
+<item>Cleaning the trashbox when exiting Sylpheed.
+<item>Have Sylpheed ask you to clean the trash before it is done.
+<item>Warn you when exiting Sylpheed when there are still messages queued to be sent.
 </itemize>
-</sect2>
-</sect1>
-
-<sect1>Data Format of Address Book<p>
-The addressbook is located in ~/.sylpheed. It is named addressbook.xml.
-The general format of the addressbook is:<p>
+Finally there is the "Other" tab. In here you can define the programs you want as helper applications for Sylpheed.
 
-<code>
-&lt addressbook &gt<p>
- &lt common_address &gt<p>
-    &lt group name="Common addresses" &gt<p>
-    &lt item &gt<p>
-     &lt name &gt Paul &lt /name &gt<p>
-     &lt address &gt paul@nlpagan.net &lt /address &gt<p>
-     &lt remarks &gt Writes Sylph. manual &lt /remarks &gt<p>
-	&lt /item &gt<p>
-    &lt /group &gt<p>
- &lt /common_address &gt<p>
-&lt /addressbook &gt
-</code>
+<figure loc="here">
+<ph vspace="1cm">
+<img src="snapshots/pref_other.png">
+</figure>
 
+<itemize>
+<item><tt>The web browser.</tt> Here you can enter the name of your favorite web browser (Netscape, Opera, Mozilla, Lynx etc.). Add the %s parameter to the command so Sylpheed knows it has to provide the text you clicked on as the URL that the browser has to visit.
+<item><tt>Printing.</tt> Here you can define the program that should be used to print. Default is lpr, and the %s is the name of the temporary file that Sylpheed creates for lpr to print.
+<item><tt>External editor.</tt> You can select an external editor to write your e-mails with, for example vi, emacs or gedit. Note that for text-based editors like vi, you need to define a terminal window, e.g. <tt>xterm -e vi %s</tt>. Otherwise there is no place that the editor will be able to show up. Here too, the %s parameter is the name of a temporary file that is created by Sylpheed.
+</itemize>
 </sect1>
-<!-- end add 2001/07/21 -->
 </sect>
diff --git a/manual/en/syl_016.sgml b/manual/en/syl_016.sgml
index 6709b9b..3ecdd69 100644
--- a/manual/en/syl_016.sgml
+++ b/manual/en/syl_016.sgml
@@ -1,24 +1,95 @@
-<sect>FAQ<p>
-You can find the latest, updated, FAQ (Frequently Asked Questions list) at 
-<url url="http://sylpheeddoc.sf.net" name="http://sylpheeddoc.sf.net">
-
-<sect1>Unread News Messages
-</sect1>
-<sect1>Using MSN Mail Accounts
-</sect1>
-<sect1>Changing Fonts on Menu, etc.<p>
-If you want to change the font that shows the menu of Sylpheed, this is controlled by the window manager that you are using. You have to go into the setup of the window manager (KDE, Gnome, XFCE) and change the font to your desired one.<p>
-Changing the font of the views of Sylpheed is done by selecting "Common preferences" in the Configuration menu. There you select the "Display" tab, and in the first section of the window you can browse the fonts available on your computer.
-</sect1>
-<sect1>Changing Key Binding of Short-Cut Key<p>
-Sylpheed's graphical interface is based on GTK. This means that it is very simple to change the key binding (shortcut key, hotkey) for menu items. If you are used to a certain key combination from another program, you can tell Sylpheed to use that same key combination.<p>
-The procedure is very simple. Suppose you want to change the key binding for getting new mail (message menu) from Alt-I to Ctrl-M.<p>
+<sect>Reference<p>
+<!-- Added 2001/07/21 -->
+In this section you will find a few pieces of information that might be handy in making Sylpheed more clear for you in respect to the used shortcut keys, and a layout of the format of the address book.
+<sect1>Short-Cut Key List<label id="shortcut"><p>
+<sect2>One-key shortcuts:<p>
+<itemize>
+<item>a: create a new message
+<item>d: delete the selected message
+<item>f: forward the selected message#
+<item>g: go to a specific folder through a browsing dialog
+<item>n: jump to the next message/next part of a multipart message
+<item>p: jump to the previous message/previous part of a multipart message
+<item>v: switch on/off the message view
+<item>w: same as a
+<item>y: Opens save as... dialog
+</itemize>
+</sect2>
+<sect2>Shortcuts to the File menu:<p>
+<itemize>
+<item>Alt-F: open FILE menu
+<item>Alt-P: print
+<item>Alt-W: close
+<item>Alt-Q: exit
+</itemize>
+</sect2>
+<sect2>Shortcuts to the Edit menu<p>
+<itemize>
+<item>Alt-E: open EDIT menu
+<item>Ctrl-C: copy
+<item>Ctrl-A: select all
+<item>Ctrl-S: search
+</itemize>
+</sect2>
+<sect2>Shortcuts to the View menu<p>
 <itemize>
-<item>Open the message menu with the mouse or by pressing Alt-M
-<item>Select the "get new mail" option (do not click it, this will activate the function!). If you use the mouse, just move the mouse cursor over the option.
-<item>Now you press Ctrl-M. You will immediately see the new key combination appear on the menu.
+<item>Alt-V: open VIEW menu
 </itemize>
-Congratulations, you have just changed a key binding. This way you can change all the options that you want. Do note that it is best to use just the alt, shift and ctrl key combinations. Several functions within Sylpheed are called up by one-key actions which are programmed in.
+<sect2>Shortcuts to the Message menu<p>
+<itemize>
+<item>Alt-M: open MESSAGE menu
+<item>Alt-I: check mail for current account
+<item>Shift-Alt-I: Check mail for all accounts
+<item>Alt-N: compose new message
+<item>Alt-R: reply to message
+<item>Ctrl-Alt-R: reply to sender (contrary to reply to e.g. mailing list)
+<item>Shift-Alt-R: reply to all (includes all addresses in To: and Cc:)
+<item>Ctrl-F: forward message
+<item>Shift-Ctrl-F: forward message as attachment
+<item>Alt-O: move message
+<item>Alt-D: delete message
+<item>Shift-Ctrl-N: open message in new window
+<item>Ctrl-U: view message source
+<item>Ctrl-H: show all message headers
+</itemize>
+</sect2>
+<sect2>Shortcuts to the Summary menu<p>
+<itemize>
+<item>Alt-S: open SUMMARY menu<p>
+<item>Alt-X: execute (pending commands, only useful when commands are not executed immediately)
+<item>Alt-U: update view
+<item>Alt-G: go to other folder
+<item>Ctrl-T: thread view
+<item>Shift-Ctrl-T: unthread view
+</itemize>
+</sect2>
+<sect2>Shortcuts to the Tool menu<p>
+<itemize>
+<item>Alt-T: open tool menu
+<item>Alt-A: open addressbook
+<item>Alt-L: open logfile
+</itemize>
+</sect2>
 </sect1>
 
+<sect1>Data Format of Address Book<p>
+The addressbook is located in ~/.sylpheed. It is named addressbook.xml.
+The general format of the addressbook is:<p>
+
+<code>
+&lt addressbook &gt<p>
+ &lt common_address &gt<p>
+    &lt group name="Common addresses" &gt<p>
+    &lt item &gt<p>
+     &lt name &gt Paul &lt /name &gt<p>
+     &lt address &gt paul@nlpagan.net &lt /address &gt<p>
+     &lt remarks &gt Writes Sylph. manual &lt /remarks &gt<p>
+	&lt /item &gt<p>
+    &lt /group &gt<p>
+ &lt /common_address &gt<p>
+&lt /addressbook &gt
+</code>
+
+</sect1>
+<!-- end add 2001/07/21 -->
 </sect>
diff --git a/manual/en/syl_017.sgml b/manual/en/syl_017.sgml
index b81f9a2..6709b9b 100644
--- a/manual/en/syl_017.sgml
+++ b/manual/en/syl_017.sgml
@@ -1,56 +1,24 @@
-<sect>Information
+<sect>FAQ<p>
+You can find the latest, updated, FAQ (Frequently Asked Questions list) at 
+<url url="http://sylpheeddoc.sf.net" name="http://sylpheeddoc.sf.net">
 
-<sect1>Websites on Sylpheed<p>
-Here are some links to the Sylpheed FAQ in other languages:<p>
-<itemize>
-<item><url url="http://sylpheeddoc.sourceforge.net/fr/faq/sylpheed-faq.html" name="http://sylpheeddoc.sourceforge.net/fr/faq/sylpheed-faq.html">, courtesy of francois Barrière
-<item><url url="http://silver.lacmhacarh.gr.jp/sylpheed/sylpheedfaq-ja.htm" name="http://silver.lacmhacarh.gr.jp/sylpheed/sylpheedfaq-ja.htm">, SYLPHEED FAQ in Japanese, courtesy of WAKAI "SilverRain" Kazunao
-<item><url url="http://beatles.cselt.it/~mau/sylpheed/sylpheedfaq.html" name="http://beatles.cselt.it/~mau/sylpheed/sylpheedfaq.html">, SYLPHEED FAQ in Italian, courtesy of Maurizio Codogno
-<item><url url="http://www.synconet.de/privhome/rs/sylpheed_faq.html" name="http://www.synconet.de/privhome/rs/sylpheed_faq.html">, SYLPHEED FAQ in German (HTML-Version)
-<item><url url="http://www.synconet.de/privhome/rs/sylpheed_faq.txt" name="http://www.synconet.de/privhome/rs/sylpheed_faq.txt">, the german text-only version, both courtesy of Ralf Schiffers.
-<item><url url="http://www.cs.uoi.gr/~csst9910/el_sylfaq.html" name="http://www.cs.uoi.gr/~csst9910/el_sylfaq.html">, SYLPHEED FAQ in Greek courtesy of Theofilos Intzoglou.
-<item><url url="http://sylpheed.republika.pl" name="http://sylpheed.republika.pl">, SYLPHEED FAQ in Polish courtesy of Przemyslaw Sulek.
-<item>A spanish version of the FAQ is written by Marcelo Ramos:
-<url url="http://www.geocities.com/hackpando/sylpheedfaq.html" name="http://www.geocities.com/hackpando/sylpheedfaq.html">, HTML version,
-<url url="http://www.geocities.com/hackpando/sylpheedfaq.txt" name="http://www.geocities.com/hackpando/sylpheedfaq.txt">, Text version
-<item>In addition, the spanish FAQ is also available from Ricardo Mones Lastra: 
-<url url="http://www.aic.uniovi.es/mones/sylpheed/faq-es/" name="http://www.aic.uniovi.es/mones/sylpheed/faq-es/">, Linked HTML
-<url url="http://www.aic.uniovi.es/mones/sylpheed/faq-es.dvi" name="http://www.aic.uniovi.es/mones/sylpheed/faq-es.dvi">,  (Device independent)
-<url url="http://www.aic.uniovi.es/mones/sylpheed/faq-es.ps" name="http://www.aic.uniovi.es/mones/sylpheed/faq-es.ps">, the Spanish FAQ as a Postscript file.
-<item><url url="http://linux.fisek.com.tr/dfisek/sylpheed-sss.html" name="http://linux.fisek.com.tr/dfisek/sylpheed-sss.html">, the turkish FAQ for Sylpheed is available, thanks to the translating of Doruk Fisek.
-<item><url url="http://hem.passagen.se/webplats/sylpheed-faq-se.html" name="http://hem.passagen.se/webplats/sylpheed-faq-se.html">, the Swedish FAQ, courtesy of Mattias Stergren
-</itemize>
+<sect1>Unread News Messages
 </sect1>
-<sect1>Mailing Lists<p>
-If you want to stay up to date on Sylpheed, and want to talk about the program with other users, you can join the mailing list.<p>
-Send a mail to sylpheed-ctl@good-day.net that says<p>
-<tt>subscribe Your Name</tt><p>
-in the body.<p>
-The server returns the mail once for the first registration request that asks the confirmation: "May I put you on this mailing list?" that includes the following phrase (this number is merely an example).<p>
-<tt>confirm 84682771 Anne Shirley</tt><p>
-This is a precaution for mischief like subscribing you to the list against your wish.<p>
-If you received the entry confirmation mail, send a mail that includes the phrase:<p>
-<tt>confirm Password(a number) Your Name</tt><p>
-to the address for registration: sylpheed-ctl@good-day.net again. Then, it is considered that you have confirmed the registration and you are registered to the server.<p>
-The address for posting to the list is sylpheed@good-day.net.<p>
-Notice: If you lost the mail that says<p>
-confirm Password(a number) Your Name<p>
-or you became confused and want to do from start, do them over from the start, in other words, send<p>
-<tt>subscribe Anne Shirley</tt><p>
-to sylpheed-ctl@good-day.net again.<p>
-<sect2>How to unsubscribe.<p>
-Send a mail to sylpheed-ctl@good-day.net that says<p>
-<tt>unsubscribe</tt><p>
-in the body.<p>
-</sect2>
-<!-- added aug. 13, 2001 -->
+<sect1>Using MSN Mail Accounts
 </sect1>
-<sect1>Anonymous CVS<p>
-This section has not been written yet.
+<sect1>Changing Fonts on Menu, etc.<p>
+If you want to change the font that shows the menu of Sylpheed, this is controlled by the window manager that you are using. You have to go into the setup of the window manager (KDE, Gnome, XFCE) and change the font to your desired one.<p>
+Changing the font of the views of Sylpheed is done by selecting "Common preferences" in the Configuration menu. There you select the "Display" tab, and in the first section of the window you can browse the fonts available on your computer.
 </sect1>
-
-<!-- added 2001/09/05 -->
-<sect1>How to tell another program to use Sylpheed as e-mail program<p>
-If you wish to use Sylpheed from within for example Netscape or Opera, then you need to go to the `preferences` section, then choose `applications` and in the email client part, you need to enter <tt>sylpheed --compose</tt>.
+<sect1>Changing Key Binding of Short-Cut Key<p>
+Sylpheed's graphical interface is based on GTK. This means that it is very simple to change the key binding (shortcut key, hotkey) for menu items. If you are used to a certain key combination from another program, you can tell Sylpheed to use that same key combination.<p>
+The procedure is very simple. Suppose you want to change the key binding for getting new mail (message menu) from Alt-I to Ctrl-M.<p>
+<itemize>
+<item>Open the message menu with the mouse or by pressing Alt-M
+<item>Select the "get new mail" option (do not click it, this will activate the function!). If you use the mouse, just move the mouse cursor over the option.
+<item>Now you press Ctrl-M. You will immediately see the new key combination appear on the menu.
+</itemize>
+Congratulations, you have just changed a key binding. This way you can change all the options that you want. Do note that it is best to use just the alt, shift and ctrl key combinations. Several functions within Sylpheed are called up by one-key actions which are programmed in.
 </sect1>
+
 </sect>
diff --git a/manual/en/syl_018.sgml b/manual/en/syl_018.sgml
index aa68663..b81f9a2 100644
--- a/manual/en/syl_018.sgml
+++ b/manual/en/syl_018.sgml
@@ -1,38 +1,56 @@
-<sect>About This Document
+<sect>Information
 
-<sect1>Copyright Notice<p>
-Copyright (C) 2001 Hiroyuki Yamamoto<p>
-This program has been placed in the GPL.
+<sect1>Websites on Sylpheed<p>
+Here are some links to the Sylpheed FAQ in other languages:<p>
+<itemize>
+<item><url url="http://sylpheeddoc.sourceforge.net/fr/faq/sylpheed-faq.html" name="http://sylpheeddoc.sourceforge.net/fr/faq/sylpheed-faq.html">, courtesy of francois Barrière
+<item><url url="http://silver.lacmhacarh.gr.jp/sylpheed/sylpheedfaq-ja.htm" name="http://silver.lacmhacarh.gr.jp/sylpheed/sylpheedfaq-ja.htm">, SYLPHEED FAQ in Japanese, courtesy of WAKAI "SilverRain" Kazunao
+<item><url url="http://beatles.cselt.it/~mau/sylpheed/sylpheedfaq.html" name="http://beatles.cselt.it/~mau/sylpheed/sylpheedfaq.html">, SYLPHEED FAQ in Italian, courtesy of Maurizio Codogno
+<item><url url="http://www.synconet.de/privhome/rs/sylpheed_faq.html" name="http://www.synconet.de/privhome/rs/sylpheed_faq.html">, SYLPHEED FAQ in German (HTML-Version)
+<item><url url="http://www.synconet.de/privhome/rs/sylpheed_faq.txt" name="http://www.synconet.de/privhome/rs/sylpheed_faq.txt">, the german text-only version, both courtesy of Ralf Schiffers.
+<item><url url="http://www.cs.uoi.gr/~csst9910/el_sylfaq.html" name="http://www.cs.uoi.gr/~csst9910/el_sylfaq.html">, SYLPHEED FAQ in Greek courtesy of Theofilos Intzoglou.
+<item><url url="http://sylpheed.republika.pl" name="http://sylpheed.republika.pl">, SYLPHEED FAQ in Polish courtesy of Przemyslaw Sulek.
+<item>A spanish version of the FAQ is written by Marcelo Ramos:
+<url url="http://www.geocities.com/hackpando/sylpheedfaq.html" name="http://www.geocities.com/hackpando/sylpheedfaq.html">, HTML version,
+<url url="http://www.geocities.com/hackpando/sylpheedfaq.txt" name="http://www.geocities.com/hackpando/sylpheedfaq.txt">, Text version
+<item>In addition, the spanish FAQ is also available from Ricardo Mones Lastra: 
+<url url="http://www.aic.uniovi.es/mones/sylpheed/faq-es/" name="http://www.aic.uniovi.es/mones/sylpheed/faq-es/">, Linked HTML
+<url url="http://www.aic.uniovi.es/mones/sylpheed/faq-es.dvi" name="http://www.aic.uniovi.es/mones/sylpheed/faq-es.dvi">,  (Device independent)
+<url url="http://www.aic.uniovi.es/mones/sylpheed/faq-es.ps" name="http://www.aic.uniovi.es/mones/sylpheed/faq-es.ps">, the Spanish FAQ as a Postscript file.
+<item><url url="http://linux.fisek.com.tr/dfisek/sylpheed-sss.html" name="http://linux.fisek.com.tr/dfisek/sylpheed-sss.html">, the turkish FAQ for Sylpheed is available, thanks to the translating of Doruk Fisek.
+<item><url url="http://hem.passagen.se/webplats/sylpheed-faq-se.html" name="http://hem.passagen.se/webplats/sylpheed-faq-se.html">, the Swedish FAQ, courtesy of Mattias Stergren
+</itemize>
 </sect1>
-<sect1>GNU General Public License<p>
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details. You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+<sect1>Mailing Lists<p>
+If you want to stay up to date on Sylpheed, and want to talk about the program with other users, you can join the mailing list.<p>
+Send a mail to sylpheed-ctl@good-day.net that says<p>
+<tt>subscribe Your Name</tt><p>
+in the body.<p>
+The server returns the mail once for the first registration request that asks the confirmation: "May I put you on this mailing list?" that includes the following phrase (this number is merely an example).<p>
+<tt>confirm 84682771 Anne Shirley</tt><p>
+This is a precaution for mischief like subscribing you to the list against your wish.<p>
+If you received the entry confirmation mail, send a mail that includes the phrase:<p>
+<tt>confirm Password(a number) Your Name</tt><p>
+to the address for registration: sylpheed-ctl@good-day.net again. Then, it is considered that you have confirmed the registration and you are registered to the server.<p>
+The address for posting to the list is sylpheed@good-day.net.<p>
+Notice: If you lost the mail that says<p>
+confirm Password(a number) Your Name<p>
+or you became confused and want to do from start, do them over from the start, in other words, send<p>
+<tt>subscribe Anne Shirley</tt><p>
+to sylpheed-ctl@good-day.net again.<p>
+<sect2>How to unsubscribe.<p>
+Send a mail to sylpheed-ctl@good-day.net that says<p>
+<tt>unsubscribe</tt><p>
+in the body.<p>
+</sect2>
+<!-- added aug. 13, 2001 -->
 </sect1>
-<!-- add 2001/07/21 -->
-<sect1>Where to Get the Latest Version of This Document<p>
-You can find the latest version of this document on the site of the Sylpheed documentation project at
-
-<url url="http://sylpheeddoc.sf.net" name="http://sylpheeddoc.sf.net">
-
-Here FAQ and manual are uploaded as HTML pages, and in form of SGML files within the CVS repository.
+<sect1>Anonymous CVS<p>
+This section has not been written yet.
 </sect1>
-<sect1>Ending Remark<p>
-I wish to thank everyone involved in the Sylpheed project.<p>
-Hiroyuki Yamamoto and all the other developers for the fabulous program they have created.<p>
-Francois Barriere who helped me become friends with the CVS system.<p>
-All the help I received from everyone on the Sylpheed mailing list while writing the FAQ and this manual.<p>
-Nick Selby, for offering his well appreciated assistance in writing along in this manual.<p>
-All the people around the world who work hard on keeping the manual and FAQ up to date<p>
-And Linus Torvald, who got us a great operating system! ;-)
-<!-- end add 2001/07/21 -->
+
+<!-- added 2001/09/05 -->
+<sect1>How to tell another program to use Sylpheed as e-mail program<p>
+If you wish to use Sylpheed from within for example Netscape or Opera, then you need to go to the `preferences` section, then choose `applications` and in the email client part, you need to enter <tt>sylpheed --compose</tt>.
 </sect1>
 </sect>
-
-</article>
diff --git a/manual/en/syl_019.sgml b/manual/en/syl_019.sgml
new file mode 100644
index 0000000..22256cc
--- /dev/null
+++ b/manual/en/syl_019.sgml
@@ -0,0 +1,37 @@
+<sect>About This Document
+
+<sect1>Copyright Notice<p>
+Copyright (C) 2001 Hiroyuki Yamamoto<p>
+This program has been placed in the GPL.
+</sect1>
+<sect1>GNU General Public License<p>
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details. You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+</sect1>
+<!-- add 2001/07/21 -->
+<sect1>Where to Get the Latest Version of This Document<p>
+You can find the latest version of this document on the site of the Sylpheed documentation project at
+
+<url url="http://sylpheeddoc.sf.net" name="http://sylpheeddoc.sf.net">
+
+Here FAQ and manual are uploaded as HTML pages, and in form of SGML files within the CVS repository.
+</sect1>
+<sect1>Ending Remark<p>
+I wish to thank everyone involved in the Sylpheed project.<p>
+Hiroyuki Yamamoto and all the other developers for the fabulous program they have created.<p>
+Francois Barriere who helped me become friends with the CVS system.<p>
+All the help I received from everyone on the Sylpheed mailing list while writing the FAQ and this manual.<p>
+Nick Selby, for offering his well appreciated assistance in writing along in this manual.<p>
+All the people around the world who work hard on keeping the manual and FAQ up to date<p>
+And Linus Torvald, who got us a great operating system! ;-)
+<!-- end add 2001/07/21 -->
+</sect1>
+</sect>
+