Updated for Sylpheed 0.7.5, splitted into two sections.

2 files changed, 606 insertions, 184 deletions

diff --git a/manual/en/syl_006.sgml b/manual/en/syl_006.sgml
index 8af9a88..2847709 100644
--- a/manual/en/syl_006.sgml
+++ b/manual/en/syl_006.sgml
@@ -1,8 +1,10 @@
-<sect>Going through the parts of Sylpheed
-<sect1>The menu options of Sylpheed.
+<sect>The menu options of Sylpheed.
 <p>
-The menu in Sylpheed is the primary entry to all the things you can do with Sylpheed. The menu structure gives you following options:
-<sect2>File menu
+The menu in Sylpheed is the primary entry to all the things 
+you can do with Sylpheed. The menu structure gives you following 
+options:
+
+<sect1>File menu
 <p>
 <itemize>
 	<item>
@@ -53,9 +55,9 @@ The menu in Sylpheed is the primary entry to all the things you can do with Sylp
 		Exit: also ends Sylpheed.
 	</item>
 </itemize>
-</sect2>
+</sect1>
 
-<sect2>Edit menu
+<sect1>Edit menu
 <p>
 <itemize>
 	<item>
@@ -78,210 +80,468 @@ The menu in Sylpheed is the primary entry to all the things you can do with Sylp
 		Shortcut: Shift-Ctrl-F
 	</item>
 </itemize>
-</sect2>
+</sect1>
 
-<sect2>View menu
+<sect1>View menu
 <p>
 The view menu allows you to change the way that Sylpheed appears. 
 You can set different windows separately (folder view, messages etc.), 
 enable or disable the statusbar and so on.
+It contains also the commands to toggle the display of some parts
+of the current message, or sort the messsages in the selected folder
+based on different attributes.
 <p>
 <itemize>
 	<item>
-		Folder tree: not implemented yet
+		Show or hide: let you control the parts of the Sylpheed user interface 
+		you want to display.
+		<itemize>
+			<item>
+				Folder tree: not implemented yet
+			</item>
+			<item>
+				Message view: not implemented yet
+			</item>
+			<item>
+				Toolbar: sets how you want to see the toolbar. Icons and text, 
+				or one of these.
+				<itemize>
+					<item>
+						Icon and Text: show icons and text in the toolbar.
+					</item>
+					<item>
+						Icon: only display the icons, do not display the text
+						below them.
+					</item>
+					<item>
+						Text: only the text, hide the icons.
+					</item>
+					<item>
+						None: hide the toolbar.
+					</item>
+				</itemize>
+			</item>
+			<item>
+				Status bar: show it or hide it.
+			</item>
+		</itemize>
 	</item>
 	<item>
-		Message view: not implemented yet
+		Separate folder tree: selects between having the folder tree 
+		attached to the main window, or floating separately.
 	</item>
 	<item>
-		Toolbar: sets how you want to see the toolbar. Icons and text, 
-		or one of these.
+		Separate message view: selects between having the selected 
+		message in the summary pane attached to the main window, or 
+		floating separately.
 	</item>
 	<item>
-		Status bar: show it or hide it.
+		Toggle summary view: show or hide the message pane by expanding the
+		summary view down to the bottom of the Sylpheed window.
+		Shortcut: v
 	</item>
 	<item>
-		Separate folder tree: selects between having the folder tree 
-		attached to the main window, or floating separately.
+		Sort: controls the way the messages are sorted in the selected
+		folder. Each option sorts the messages in descending order (the
+		bigger one being on the top of the summary pane), and can be
+		reversed by selecting the same menu entry a second time (each
+		time you select the same menu entry the order is reversed).
+		<itemize>
+			<item>
+				Sort by number: sort the message based on their MH number.
+			</item>
+			<item>
+				Sort by size: sort the message on their size.
+			</item>
+			<item>
+				Sort by date: sort the messages based on their date.
+			</item>
+			<item>
+				Sort by from: the messages are sorted by their sender address
+				(From field, sorted alphabetically).
+			</item>
+			<item>
+				Sort by subject: the messages are sorted by their subject
+				(sorted alphabetically).
+			</item>
+			<item>
+				Sort by color label: sort the messages based on their color.
+				Read the context menu description below to find how to assign
+				colors to messages.
+			</item>
+			<item>
+				Sort by mark: separate marked and unmarked messages. Read the 
+				context menu description below to find how to mark messages.
+			</item>
+			<item>
+				Sort by unread: separate read and unread messages.
+			</item>
+			<item>
+				Sort by attachment: separate messages with and without attachment.
+			</item>
+			<item>
+				Attract by subject: move close to each other the messages
+				having the same subject (or a close subject).
+			</item>
+		</itemize>
 	</item>
 	<item>
-		Separate message view: selects between having the selected 
-		message in the summary pane attached to the main window, or 
-		floating separately.
+		Thread view: turn the threaded view on or off. When turned on the
+		messages of the same thread (the same discussion generated by replying
+		to each other mail) are grouped as a tree representing the discussion
+		flow. Each reply being linked to its orignal message. Each branch can
+		be open or closed by using the small plus or minus sign next to it.
+		The threads are based on the In-Reply-To and Reference fields of the
+		mail header, so never start a new conversation by replying to an
+		old message, this will add your new mail to the old unrelated thread.
+		Shortcut: Ctrl-T
+	</item>
+	<item>
+		Set display item: use it to change the list of items to display
+		in the summary view. This setting can also be changed through
+		the common preferences.
+	</item>
+	<item>
+		Go to: use it to navigate from message to message based on the
+		sub-menu criterias.
+		<itemize>
+			<item>
+				Prev. message: go to the previous message in the current
+				folder.
+				Shortcut: P
+			</item>
+			<item>
+				Next message: go to the next message in the current
+				folder.
+				Shortcut: N
+			</item>
+			<item>
+				Prev. unread: go to the previous unread message.
+				Shortcut: Shift-P
+			</item>
+			<item>
+				Next unread: go to the next unread message.
+				Shortcut: Shift-N
+			</item>
+		</itemize>
 	</item>
 	<item>
 		Code set: allows you to select what codeset you want to use 
-		for your e-mails.
+		for your e-mails. This codeset will be used when sending
+		mails. Note Sylpheed will always try to use the more compatible
+		codeset based on the characters used in your message, so unless
+		you use special latin-1 characters in your mail, the encoding
+		will be defined as 7bits ASCII even if you have selected the
+		ISO-8859-1 character set.
+		The auto-detect option let Sylpheed automatically detect the
+		character set based on the content of the messages.
+	</item>
+	<item>
+		Open in new window: open the selected message in a new window.
+		This new window can be closed by pressing the escape key.
+		Shortcut: Ctrl-Alt-N
+	</item>
+	<item>
+		Message source: opens a new window and display the complete
+		source of the message in it (without any formatting and with
+		all the header fields).
+		Shortcut: Ctrl-U
+	</item>
+	<item>
+		Show all header: toggles on and off the display of the complete
+		message header.
+		Shortcut: Ctrl-H
+	</item>
+	<item>
+		Update: update the Sylpheed window.
+		Shortcut: Ctrl-Alt-U
 	</item>
 </itemize>
-</sect2>
+</sect1>
 
-<sect2>Message menu
+<sect1>Message menu
 <p>
 Here you find the following options:
-<itemize>
-<item>Receive new mail: this will collect all new mail for your default mail-identity.
-<item>Receive from all accounts: Sylpheed will poll all defined mail-identities for new mail.
-<item>Send queued messages: all the messages that you put into the "Queue" folder will now be sent off.
-<item>Compose new message: allows you to write a new e-mail message.
-<item>Reply: an e-mail message will be created with the sender of the selected message in the summary pane as recipient. Depending on the settings, your signature will be added to the mail, and the original mail text will be quoted.
-<item>Reply to all: as Reply, but the recipients will be all e-mail addresses in the original messages (including the ones in the cc: part).
-<item>Forward: a message will be created with the original message in the summary pane as text. You can then enter a recipient e-mail address, edit the text if you want, and send it.
-<item>Forward as attachment: as Forward, but the message text will sent along as a separate textfile.
-<item>Move: lets you move the message to a different folder. You can select the destination folder from a browse-window.
-<item>Copy: as Move, only that the message is copied to the new folder, instead of moved.
-<item>Delete: lets you delete the message that is selected in the summary pane.
-<item>Mark: Gives a submenu: Mark/Unmark/Mark as read/Unmark as read. When you mark messages, you can do a specific action (e.g. move, delete) on all of the marked messages. You can unmark messages that you mistakenly marked. The other options do as they say, they mark or unmark a message as read.
-<item>Open in new window: This will open the message in the summary pane into a new window, allowing you to see more text at once.You can close this window by clicking the close button or pressing Escape.
-<item>View source: opens a new window with the message in it, including all message headers. You can close this window by clicking the close button or pressing Escape.
-<item>Show all header: opens a new window with only the message headers. You can close this window by clicking the close button or pressing Escape.
-<item>Reedit: this option is only available when you select a message in the Draft folder. You can then edit the draft message.
-</itemize>
-A note on functions like Move, Copy and Delete: if you did not specify to execute the commands immediately (in the configuration), you will have to select the "Execute" command. This is a button in the toolbar, and can also be found in the Summary menu.
-</sect2>
-<sect2>Summary menu<p>
-In the Summary menu you can perform all kinds of functions that are related to handling messages. The actions are done on the message summary pane.
-<itemize>
-<item>Delete duplicate messages: This will remove messages from the active folder that were sent twice to you. For example you received a message directly and through a mailing list at the same time.
-<item>Filter messages: you can use this option if you want to filter existing messages through a new filter you set up.
-<item>Execute: this option is needed if you did not set "execute immediately" in the preferences. "Execute" will then do the actions you want (e.g. Copy, Move, Filter etc.)
-<item>Update: refreshes the message pane view to reflect any changes.
-<item>Prev message: selects the previous message. Pine ex-users can also use "p".
-<item>Next message: select the next message. Pine ex-users can also use "n".
-<item>Next unread message: skips to the next unread message in the folder.
-<item>Go to other folder: allows you to open a new mail folder. You can use a browse window for this.
-<item>Sort: this option will allow you to sort the mail view in several ways. You can sort by date, by subject, by number (MH's internal message number is meant here) etc. Note that "Attract by subject" is different from sorting by subject. Attract by subject overlooks the "Re:" references in the subject. In that way messages are sorted in a more logical way.
-<item>Thread view: messages are linked together in a tree view, on subject.
-<item>Unthread view: undos the previous item.
-<item>Set display item: shows a dialog box in which you can check and uncheck the items you want to see in the summary pane.
-As of version 0.6.4 you can also determine the order in which the columns of the summary menu are displayed.
-</itemize>
-</sect2>
-<sect2>Tool menu<p>
-In the Tool menu you will find 2 options (upto version 0.6.4). It is the address book and the log window.<p>
-In the address book, as you may expect, you can store the e-mail addresses that you want to save. You can create folders within the address book, to keep addresses together.<p>
-In the log window, you can see what Sylpheed is doing. Keeping track of things in that way is very good when you suspect there is something wrong. You can paste the info of the log window into an e-mail and send it to the developer or the mailing list.
-</sect2>
 
-<sect2>Configuration menu<p>
-In the Configuration menu, clearly, you can set up Sylpheed the way you want it to work and react.
 <itemize>
-
-<item>Common preferences: in this option you will be presented a dialog in which you can select a number of tabs. Each tab represents a specific set of settings in Sylpheed. In the next chapter, these dialog options are explained in more detail.
-
-<item>Filtering: this option shows you a dialog in which you can set up the filtering rules that you want Sylpheed to process on receiving new e-mails. You first specify on which part(s) of the e-mail Sylpheed has to check, and then you tell Sylpheed what to do. You can move the message to a different directory (including trash to get rid of spam mail). Selecting the destination folder is possible through a browser window that comes up when you press "Select..."<p>
-You can choose not to receive the e-mail. Note that this will leave the message on the mailserver of your provider, the message will not be removed!<p>
-When you press the "Register" button, the filter rule is added to the list of rules. Do you select "Substitute", then the selected rule is replaced by the information of the setting entered. "Delete" in the end will delete the selected filtering rule.<p>
-Please note that you can set up 2 selections for a rule, which can be "OR'd" or "AND'd". OR means that one of the 2 selections will have to match for the rule to be executed. AND means that both selections have to match before an action is performed.<p>
-To the right of the selection rules you see buttons called UP and DOWN. You can move rules up and down in the list. This will often trigger different behaviour in the selections, so consider the order in which you set the rules.
-<item>Preferences per account: here you can set the specifics for the account you are currently using. Should mail be deleted after fetching, what is the server it comes from, etc. Basically it is the same dialog form as shown in setting up a new account.
-<item>Create new account: here you name the account (each account has a recognizable name), you set up your name and e-mail address etc. You set up the type of server you access (POP4, IMAP4, local mailbox, newsserver) and where the downloaded messages have to go (default folder is the inbox). In the RECEIVE tab you select or unselect options, in SEND you can set up how to send your messages. In COMPOSE you can point to a specific signature file, and in ADVANCED you can set up alternate ports for the server, if these exist. (Do not mess with these unless you are sure you have to!!)
-<item>Edit accounts: here you can select one of the accounts you created, from a list, and edit the information about them. Note that you cannot edit an account for which you are writing a message at the same time. This to ensure data integrity.
-<item>Change current account: here you can select what account you want to use, to write a message.
+	<item>
+		Get new mail: this will collect all new mail for your 
+		default mail-identity.
+		Shortcut: Ctrl-I
+	</item>
+	<item>
+		Get from all accounts: Sylpheed will poll all defined 
+		mail-identities for new mail.
+		Shortcut: Shift-Ctrl-I
+	</item>
+	<item>
+		Cancel receiving: stop the new mails reception.
+	</item>
+	<item>
+		Send queued messages: all the messages that you put into 
+		the "Queue" folder will now be sent off.
+	</item>
+	<item>
+		Compose new message: allows you to write a new e-mail 
+		message.
+		Shortcut: Ctrl-M
+	</item>
+	<item>
+		Reply: an e-mail message will be created with the sender 
+		of the selected message in the summary pane as recipient. 
+		Depending on the settings, your signature will be added 
+		to the mail, and the original mail text will be quoted.
+		If a part of the original mail is selected, only this
+		part will be quoted in the reply.
+		Shortcut: Ctrl-R
+	</item>
+	<item>
+		Reply to all: as Reply, but the recipients will be all 
+		e-mail addresses in the original messages (including 
+		the ones in the cc: part).
+		Shortcut: Shift-Ctrl-R
+	</item>
+	<item>
+		Reply to sender: as Reply, but the recipient is the address
+		defined in the Sender header field (not the Reply-To address).
+	</item>
+	<item>
+		Forward: a message will be created with the original 
+		message in the summary pane as text. You can then 
+		enter a recipient e-mail address, edit the text if 
+		you want, and send it.
+		Shortcut: Ctrl-Alt-F
+	</item>
+	<item>
+		Forward as attachment: as Forward, but the message 
+		text will sent along as a separate textfile.
+		Shortcut: Shift-Ctrl-Alt-F
+	</item>
+	<item>
+		Re-edit: lets you open all already sent message in
+		edition mode to re-send it.
+	</item>
+	<item>
+		Move: lets you move the message to a different folder. 
+		You can select the destination folder from a browse-window.
+	</item>
+	<item>
+		Copy: as Move, only that the message is copied to the 
+		new folder, instead of moved.
+		Shortcut: Shift-Ctrl-O
+	</item>
+	<item>
+		Delete: lets you delete the message that is selected 
+		in the summary pane.
+		Shortcut: Ctrl-D
+	</item>
+	<item>
+		Mark: Gives a submenu: Mark/Unmark/Mark as read/Unmark 
+		as read. When you mark messages, you can do a specific 
+		action (e.g. move, delete) on all of the marked messages. 
+		You can unmark messages that you mistakenly marked. 
+		The other options do as they say, they mark or unmark 
+		a message as read, and mark all read, marks all the messages
+		of the current folder as read.
+	</item>
 </itemize>
-</sect2>
-
-<sect2>Help menu<p>
-This menu lets you look at the (japanese for now) manual, and you can also see the "about" info, who wrote Sylpheed.
-</sect2>
 
+A note on functions like Move, Copy and Delete: if you did not 
+specify to execute the commands immediately (in the configuration), 
+you will have to select the "Execute" command. This is a button 
+in the toolbar, and can also be found in the Summary menu.
 </sect1>
 
-<sect1>Context menu
-<p>
-You can pull up context menus (through clicking button2) for the folder tree and the summary pane. (windows users: button2 is the right mouse button.)
+<sect1>Tool menu
 <p>
-In the folder view you can add, rename and remove folders through the context menu.<p>
-In the message summary you can do a host of things from the context menu, like viewing message headers, opening a message in a separate window (also possible by double clicking on a message) etc.
-</sect1>
-
-<sect>Dialogs and views<p>
-
-<figure loc="h"><ph vspace="515px"><img src="snapshots/all_with_image.png"></figure>
+In the Tool menu are grouped the filters control, address book
+access and log window control.
 
-<sect1>Folder view <p>
-The folder view shows you all the mail folders that you have created, in a tree-like structure. If you want to see the headers of the messages in a specific folder, just click the name of the folder once, and in the summary view you can see the messages in the selected mail folder.<p>
-When you see a + sign in front of a folder name, that means the folder branch of that part of the tree is 'collapsed'. You can expand that part by clicking the + sign. In that same manner you can also collapse the - sign in front of an expanded branch of the folder tree.<p>
-Special folders:<p>
-Draft: here you store messages that you want to send out more often, or you want to work on some more. Using the 'reedit' option from the message menu, you can edit the message further.<p>
-Trash: in here all your deleted messages go. Depending on the common preferences setting, this box is or is not emptied when you end Sylpheed.
-</sect1>
-
-<sect1>Summary view <p>
-The summary pane can show you many things. You can select what you want to see from the Summary menu, selecting the option "Set display item". A list of all options is:
 <itemize>
-<item>Mark: shows if the message is marked.
-<item>Unread: shows if the message is read or not
-<item>MIME: shows MIME attachments
-<item>Number: shows the MH number of the message
-<item>Size: the size of the entire message including attachments
-<item>Date: the date of sending by the sender
-<item>From: who sent the message
-<item>Subject: what the message is about
+	<item>
+		Address book: opens the address book window.
+		Shortcut: Shift-Ctrl-A
+	</item>
+	<item>
+		Add sender to address book: adds the sender of the selected
+		message to one of your address books. When selected a window
+		opens to let you select the target address book.
+	</item>
+	<item>
+		Filter messages: apply the filter rules to the messages
+		of the inbox.
+	</item>
+	<item>
+		Create filter rule: create a new filter rule based on the
+		selected message.
+		<itemize>
+			<item>
+				Automatically: open the filter rules creation window
+				to define a new rule.
+			</item>
+			<item>
+				By From: opens the filter rules creation window and
+				fills the filter settings fields to build a filter based
+				on the sender of the selected message.
+			</item>
+			<item>
+				By To: opens the filter rules creation window and
+				fills the filter settings fields to build a filter based
+				on the receiver of the selected message.
+			</item>
+			<item>
+				By Subject: opens the filter rules creation window and
+				fills the filter settings fields to build a filter based
+				on the subject of the selected message.
+			</item>
+		</itemize>
+	</item>
+	<item>
+		Execute: execute all the pending move, delete, and copy commands.
+		Only if execute immediately is off in the common preferences.
+		Shortcut: X
+	</item>
+	<item>
+		Delete duplicated messages: This will remove messages from the 
+		active folder that were sent twice to you. For example you 
+		received a message directly and through a mailing list at 
+		the same time.
+	</item>
+	<item>
+		Log window: opens the log window. In the log window, you 
+		can see what Sylpheed is doing. Keeping track of things 
+		in that way is very good when you suspect there is something 
+		wrong. You can paste the info of the log window into an 
+		e-mail and send it to the developer or the mailing list.
+	</item>
 </itemize>
-You can sort the summary view in many ways, by clicking the button that is above the column. Click once to sort going up (a-z), click once more to sort going down (z-a).<p>
-If you think the size of a column is not right, you can adjust that by placing the mouse cursor next to the button of the column you want to adjust, press mouebutton1 (left button) and drag the column to the width you want it to have.<p>
-Select a message by clicking on it with the mouse. Once the summary pane has the focus of the program, you can also move up and down in the list through the cursor keys, or pressing "p"(revious) and "n"(ext) as in Pine.
-</sect1>
 
-<sect1>Message view <p>
-In the message view you can read the message that you selected in the summary pane. If you entered the summary pane without selecting a message, the message view will be empty. At the top of the message view some info is presented about the message you are reading, as well as some statistics on the selected folder.<p>
-You can scroll up and down in the message by using the arrow keys (after clicking inside the message), or by using the scrollbar.
-</sect1>
 
-<sect1>Common preferences<p>
-The Common Preferences, found in the Configuration menu, shows you the following tabs:
-<sect2>Receive tab<p>
-In here you can set up how to receive messages.
+In the log window, you can see what Sylpheed is doing. Keeping 
+track of things in that way is very good when you suspect there 
+is something wrong. You can paste the info of the log window 
+into an e-mail and send it to the developer or the mailing list.
+</sect1>
 
-<figure loc="h"><ph vspace="479px"><img src="snapshots/pref_receive.png"></figure>
+<sect1>Configuration menu
+<p>
+In the Configuration menu, clearly, you can set up Sylpheed 
+the way you want it to work and react.
 
 <itemize>
-<item>You can define a special program to pick up messages from the default unix mailbox. Usually this is not used, but you can use it. Actually, this information may be wrong. If someone knows better, please let me know.
-<item>Local spool lets you define where your local mailbox is located. You can also tell Sylpheed whether or not to filter the incoming messages from that mail spool file.
-<item>Autocheck new mail. When you check this option, Sylpheed will check if there is new mail on the set interval.
-<item>Check new mail on startup means that Sylpheed will immediately look for new mail on all the selected accounts when it loads.
-<item>In the news section you can specify how many articles should be downloaded when opening a newsgroup.
+	<item>
+		Common preferences: in this option you will be 
+		presented a dialog in which you can select a number 
+		of tabs. Each tab represents a specific set of settings 
+		in Sylpheed. In the next chapter, these dialog options 
+		are explained in more detail.
+	</item>
+	<item>
+		Filter setting: this option shows you a dialog in which you 
+		can set up the filtering rules that you want Sylpheed 
+		to process on receiving new e-mails. You first specify 
+		on which part(s) of the e-mail Sylpheed has to check, 
+		and then you tell Sylpheed what to do. You can move the 
+		message to a different directory (including trash to get 
+		rid of spam mail). Selecting the destination folder is 
+		possible through a browser window that comes up when you 
+		press "Select..."
+		<p>
+		You can choose not to receive the e-mail. Note that 
+		this will leave the message on the mailserver of your 
+		provider, the message will not be removed!
+		<p>
+		When you press the "Register" button, the filter 
+		rule is added to the list of rules. Do you select 
+		"Substitute", then the selected rule is replaced by the 
+		information of the setting entered. "Delete" in the end 
+		will delete the selected filtering rule.
+		<p>
+		Please note that you can set up two selections for a rule, 
+		which can be "OR'd" or "AND'd". OR means that one of the 
+		two selections will have to match for the rule to be 
+		executed. AND means that both selections have to match 
+		before an action is performed.
+		<p>
+		To the right of the selection rules you see buttons 
+		called UP and DOWN. You can move rules up and down in 
+		the list. This will often trigger different behaviour 
+		in the selections, so consider the order in which 
+		you set the rules.
+	</item>
+	<item>
+		Template: let your create a new message template.
+		When composing a new message you can then used one
+		of the defined templates and insert it (or use it to
+		completely replace the content of your mail).
+		The templates can contain some special characters
+		that are replaced when the template is used in order
+		to create a dynamic text. Use the symbols button on
+		the templates definition window to see the list of
+		the available symbols.
+	</item>
+	<item>
+		Preferences for current account: here you can set the 
+		specifics for the account you are currently using. 
+		Should mail be deleted after fetching, what is the 
+		server it comes from, etc. Basically it is the same 
+		dialog form as shown in setting up a new account.
+	</item>
+	<item>
+		Create new account: here you name the account (each 
+		account has a recognizable name), you set up your name 
+		and e-mail address etc. You set up the type of server 
+		you access (POP4, IMAP4, local mailbox, newsserver) 
+		and where the downloaded messages have to go (default 
+		folder is the inbox). In the RECEIVE tab you select or 
+		unselect options, in SEND you can set up how to send 
+		your messages. In COMPOSE you can point to a specific 
+		signature file, and in ADVANCED you can set up alternate 
+		ports for the server, if these exist. (Do not mess 
+		with these unless you are sure you have to!!)
+	</item>
+	<item>
+		Edit accounts: here you can select one of the accounts 
+		you created, from a list, and edit the information about 
+		them. Note that you cannot edit an account for which 
+		you are writing a message at the same time. This to 
+		ensure data integrity.
+	</item>
+	<item>
+		Change current account: here you can select what 
+		account you want to use, to write a message.
+		If you have enabled the status bar (in the view menu),
+		the name of the current account is shown in the bottom
+		right corner of the Sylpheed window (in the status bar)
+		and can be changed by a click on it (then a menu appears
+		and lists all your accounts).
+	</item>
 </itemize>
-</sect2>
+
 </sect1>
 
-<sect1>Setting up an account/changing an account<p>
-In order to set up an account in Sylpheed, in the configuration menu you select "Create new account". If you want to change the settings of an existing account, you select the "Edit accounts..." option from the configuration menu, and there you select the account you want to change. After that you press "edit". Then a dialog appears in which you can enter or update the following areas:
+<sect1>Help menu
+<p>
+This menu lets you look at the manual and FAQ of Sylpheed, 
+and you can also see the "about" info, who wrote Sylpheed.
 <p>
-<sect2>Basic tab<label id="Basic"><p>
-
-<figure loc="h"><ph vspace="479px"><img src="snapshots/account_basic.png"></figure>
-
-In the "Basic" tab you name the account. This is to make identifying the account easier.<p>
-Choose a name that tells something about the account, like the name of the ISP, mailbox or news-server you are setting up.  You can select this account to be the default account ("Usually used").<p>
-Enter your name and e-mail address, and if you have one, the organization that you use Sylpheed for.
-In the Protocol box you select the type of service that this account will be using. The flavors you can choose are: POP3 normal, POP3 APOP auth, IMAP4, NNTP news or None (local).
-In the "inbox" field you can enter the mail folder where the mail for this account will be stored in. This option is disabled when you set up an NNTP News account.<p>
-For POP3 and IMAP services you can then specify the server where your mail is stored. Details about this name, and also the name that goes into the field for "SMPT server (send)" should be given to you by your ISP.<p>
-For a local unix mailbox, the "Server for receiving" is disabled, since the mail will be received for you.<p>
-The fields for User ID and Password will also be disabled for accounts that do no deal with POP3 or IMAP services. Otherwise you can enter the login name and password for the e-mail server with your ISP here. Usually these are the same as your login name and password to access the dial-in service, but this is not standard. If in doubt, contact the helpdesk of your ISP.  <p>
-</sect2>
-<sect2>Receive tab<label id="Receive"><p>
-
-<figure loc="h"><ph vspace="479px"><img src="snapshots/account_pop_receive.png"></figure>
-
-The "Receive" tab is only used for POP3 accounts. Here you specify if the mails that were successfully retrieved should be removed from the server. You can also tell Sylpheed to get all the messages there, not only the ones you already received (in case you leave your messages on the server). The third option enables this account to be included when mail is checked for "all accounts" (see the message menu for this), and if the incoming messages should immediately be filtered when received.
-</sect2>
-<sect2>Send tab<label id="Send"><p>
-
-<figure loc="h"><ph vspace="479px"><img src="snapshots/account_send.png"></figure>
 
-In the "Send" tab you can set up some more settings.
-</sect2>
-<sect2>Compose tab<label id="Compose"><p>
+</sect1>
 
-<figure loc="h"><ph vspace="479px"><img src="snapshots/account_compose.png"></figure>
+<sect1>Context menu
+<p>
+You can pull up context menus (through clicking button2) for 
+the folder tree and the summary pane. (windows users: button2 
+is the right mouse button.)
+<p>
+In the folder view you can add, rename and remove folders 
+through the context menu. You can also set the folder
+properties (define the selected folder as an inbox, outbox,
+trash, ...).
+<p>
+In the message summary you can do a host of things from the 
+context menu, like viewing message headers, opening a message 
+in a separate window (also possible by double clicking on a 
+message) etc...
 
-In the "Compose" tab you can define your signature file.
-</sect2>
-<sect2>Advanced tab<label id="Advanced"><p>
-In the "Advanced" tab you can edit the portnumbers for the servers you will be using. This normally will need no change.
-</sect2>
 </sect1>
-</sect>
diff --git a/manual/en/syl_007.sgml b/manual/en/syl_007.sgml
index f2eabce..3fd4b32 100644
--- a/manual/en/syl_007.sgml
+++ b/manual/en/syl_007.sgml
@@ -1,28 +1,190 @@
+<sect>Dialogs and views<p>
 
-<sect>Viewing messages
-<sect1>Reading a message<p>
-Reading a message is quite simple. If you have the message pane within view, all you need to do is once click the message you want to read and it already appears in the message view. When you double-click the message, a separate window will open, showing you the message. You can close the opened window by pressing ESCape or clicking the 'close' button.
+<figure loc="h"><ph vspace="515px"><img src="snapshots/all_with_image.png"></figure>
+
+<sect1>Folder view <p>
+The folder view shows you all the mail folders that you have created, in a tree-like structure. If you want to see the headers of the messages in a specific folder, just click the name of the folder once, and in the summary view you can see the messages in the selected mail folder.<p>
+When you see a + sign in front of a folder name, that means the folder branch of that part of the tree is 'collapsed'. You can expand that part by clicking the + sign. In that same manner you can also collapse the - sign in front of an expanded branch of the folder tree.<p>
+Special folders:<p>
+Draft: here you store messages that you want to send out more often, or you want to work on some more. Using the 'reedit' option from the message menu, you can edit the message further.<p>
+Trash: in here all your deleted messages go. Depending on the common preferences setting, this box is or is not emptied when you end Sylpheed.
 </sect1>
-<sect1>Viewing Multipart MIME (Attached Files)<p>
-When a message contains an attachment, you can have several options to view the information in that file. Sylpheed can be able, when compiled against the proper libraries, to display images "inline". This means you can click the name of the image and you can see it in the lower part of the message screen.<p>
-How do you see an attachment is in an e- mail?<p>
-This shows through an extra section that appears between the summary pane and the message view. In it you can see the separate parts of the e-mail. Sometimes you can't view the contents of an attachment directly. Then you can rightclick the name of the file and select "OPEN" from the appearing menu. If this does not work, it means that the extension of the file is not recognized through the directives in the mailcap file. In that case you can always use the "Save as..." option in the popup menu, save the file to disk and open the file with the proper program.
+
+<sect1>Summary view <p>
+The summary pane can show you many things. You can select what you want to see from the Summary menu, selecting the option "Set display item". A list of all options is:
+<itemize>
+<item>Mark: shows if the message is marked.
+<item>Unread: shows if the message is read or not
+<item>MIME: shows MIME attachments
+<item>Number: shows the MH number of the message
+<item>Size: the size of the entire message including attachments
+<item>Date: the date of sending by the sender
+<item>From: who sent the message
+<item>Subject: what the message is about
+</itemize>
+You can sort the summary view in many ways, by clicking the button that is above the column. Click once to sort going up (a-z), click once more to sort going down (z-a).<p>
+If you think the size of a column is not right, you can adjust that by placing the mouse cursor next to the button of the column you want to adjust, press mouebutton1 (left button) and drag the column to the width you want it to have.<p>
+Select a message by clicking on it with the mouse. Once the summary pane has the focus of the program, you can also move up and down in the list through the cursor keys, or pressing "p"(revious) and "n"(ext) as in Pine.
 </sect1>
-<sect1>Extending and Closing Threads
-<p>
-Sylpheed offers the option to view messages in threads. Threads are no more than series of e-mails in a logical sequence. Suppose 15 people sent you a mail called "Re: bananas". You can't easily tell which one is the first and which one is the last in that sequence.<p>
-By activating threads (summary menu), Sylpheed will attempt to show the sequence of mails as they were written/sent from first to last.<p>
-To undo the threads view, you simply select the same menu option again and the e-mails are displayed in standard order again.
+
+<sect1>Message view <p>
+In the message view you can read the message that you selected in the summary pane. If you entered the summary pane without selecting a message, the message view will be empty. At the top of the message view some info is presented about the message you are reading, as well as some statistics on the selected folder.<p>
+You can scroll up and down in the message by using the arrow keys (after clicking inside the message), or by using the scrollbar.
 </sect1>
-<sect1>Message Operations (Moving, Deleting, etc.)
-<p>
-Sylpheed gives you many ways to manage your messages. You can move them to new mailboxes, or delete them. Through the message menu (see that section for more details) plenty of options are available to do with your e-mails what you want done. The advantage of moving messages to different mailboxes (also see Filtering for that, as described in the Configuration menu section) is that you keep an overview of your inbox. Suppose you are collecting e-mails in there of 8 different subjects. And you are looking for a specific one on a specific subject. That will give you a lot of work, trying to find the right message. Creating a new mail folder for each subject, and moving the messages to that new one, lifts a lot of work afterwards from your hands.
+
+<sect1>Common preferences<p>
+The Common Preferences, found in the Configuration menu, shows you the following tabs:
+<sect2>Receive tab<p>
+In here you can set up how to receive messages.
+
+<figure loc="h"><ph vspace="479px"><img src="snapshots/pref_receive.png"></figure>
+
+<itemize>
+<item>You can define a special program to pick up messages from the default unix mailbox. Usually this is not used, but you can use it. Actually, this information may be wrong. If someone knows better, please let me know.
+<item>Local spool lets you define where your local mailbox is located. You can also tell Sylpheed whether or not to filter the incoming messages from that mail spool file.
+<item>Autocheck new mail. When you check this option, Sylpheed will check if there is new mail on the set interval.
+<item>Check new mail on startup means that Sylpheed will immediately look for new mail on all the selected accounts when it loads.
+<item>In the news section you can specify how many articles should be downloaded when opening a newsgroup.
+</itemize>
+</sect2>
 </sect1>
-<sect1>URL in a Message
+
+<sect1>Setting up an account/changing an account
+<p>
+In order to set up an account in Sylpheed, in the configuration
+menu you select "Create new account". If you want to change the 
+settings of an existing account, you select the "Edit accounts..." 
+option from the configuration menu, and there you select the account 
+you want to change. After that you press "edit". Then a dialog 
+appears in which you can enter or update the following areas:
+<p>
+
+<sect2>Basic tab<label id="Basic">
+<p>
+
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_basic.png"></figure>
+
+In the "Basic" tab you name the account. This is to make identifying 
+the account easier.
+<p>
+Choose a name that tells something about the account, like the 
+name of the ISP, mailbox or news-server you are setting up.  
+You can select this account to be the default account ("Usually used").
+<p>
+Enter your name and e-mail address, and if you have one, the 
+organization that you use Sylpheed for.
+In the Protocol box you select the type of service that this 
+account will be using. The flavors you can choose are: POP3 normal, 
+POP3 APOP auth, IMAP4, NNTP news or None (local).
+In the "inbox" field you can enter the mail folder where the mail 
+for this account will be stored in. This option is disabled when 
+you set up an NNTP News account.
+<p>
+For POP3 and IMAP services you can then specify the server where 
+your mail is stored. Details about this name, and also the name 
+that goes into the field for "SMPT server (send)" should be given 
+to you by your ISP.
+<p>
+For a local unix mailbox, the "Server for receiving" is disabled, 
+since the mail will be received for you.
+<p>
+The fields for User ID and Password will also be disabled for 
+accounts that do no deal with POP3 or IMAP services. Otherwise 
+you can enter the login name and password for the e-mail server 
+with your ISP here. Usually these are the same as your login 
+name and password to access the dial-in service, but this is 
+not standard. If in doubt, contact the helpdesk of your ISP.
+</sect2>
+
+<sect2>Receive tab<label id="Receive">
+<p>
+
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_pop_receive.png"></figure>
+
+The "Receive" tab is only used for POP3 accounts. Here you specify 
+if the mails that were successfully retrieved should be removed 
+from the server. You can also tell Sylpheed to get all the 
+messages there, not only the ones you already received (in case 
+you leave your messages on the server).
+<p>
+You can also define a limit for the size of the messages to
+download. Any message bigger than this limit will not be
+downloaded.
+<p>
+You can also choose to filter messages on receiving, if not
+set, the messages are only filtered when you use the filter
+entry of the Tools menu.
 <p>
-At times you may find a URL in a message. A URL is a link to a website. Usually it is shown in the form "http://www.somewhere.something".<p>
-If you want to visit that website, you only need to double-click the URL, and the default webbrowser you set up (usually Netscape) will activate and load the website.<p>
-In the configuration options, Sylpheed has a color setting specific for URL's so you can spot a URL easily. 
+The default inbox defines the folder that receives the incoming
+(and not filtered) messages for this account.
+You can define a different folder as inbox for each of your
+accounts.
+<p>
+If the "Get all checks for messages on this account" is turned
+off, when using the "Get all" menu entry (or toolbar button)
+this account will not be checked. To check for new mails for
+this account, you must select the account, then use the "Get"
+toolbar button (or menu entry).
+</sect2>
+
+<sect2>Send tab<label id="Send">
+<p>
+
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_send.png"></figure>
+
+In the "Send" tab you can define the settings that apply to sending mails.
+<p>
+You can choose to add the date field to the messages you send,
+generate a unique message identifier, or add custom header
+fields.
+<p>
+The user defined header field should be set up to contain your
+X-face picture.
+<p>
+If your SMTP server needs authentication, define the user ID and
+password to use in this tab.
+
+</sect2>
+
+<sect2>Compose tab<label id="Compose"><p>
+
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_compose.png"></figure>
+
+In the "Compose" tab you can define your signature file, 
+choose to always copy someone when sending mails (you can
+choose to always copy your boss, or yourself), and define the
+Reply-To field for the current account.
+</sect2>
+
+<sect2>Privacy<label id="Privacy">
+<p>
+This tab is only available when Sylpheed has been compiled
+with GPGME and GNUPG (for signature and encryption).
+
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_privacy.png"></figure>
+
+<p>
+With this tab you can choose the keys to use when signing
+or encrypting mails for this account.
+</sect2>
+
+<sect2>Advanced tab<label id="Advanced">
+
+<p>
+The Advanced tab contains some settings you normally do
+not need to change (unless you really know what you are
+doing).
+
+<figure loc="h"><ph vspace="479px"><img src="snapshots/account_advanced.png"></figure>
+
+<p>
+You can change the default SMTP or POP3 ports used when
+connecting to your mail server, define a domain name to
+use when sending a mail.
+<p>
+The default folders for the sent messages, drafts and
+trash can be defined here. If not changed the current account
+will use the default folders.
+</sect2>
 </sect1>
 </sect>
-