Put new user documentation in place

287 files changed, 8992 insertions, 7381 deletions

diff --git a/help/C/backup-restore.page b/help/C/backup-restore.page
new file mode 100644
index 0000000000..96dcab1888
--- /dev/null
+++ b/help/C/backup-restore.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="backup-restore">
+
+  <info>
+    <desc>Back up and restore your Evolution data and settings.</desc>
+
+    <link type="guide" xref="index#data-migration-and-sync"/>
+    <link type="seealso" xref="data-storage"/>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Back up and restore</title>
+
+<p>You can back up your Evolution data. The backup saves your settings, mail, contacts, tasks, memos and calendars. It will be stored in a gzip-compressed tar archive file.</p>
+
+<section id="backup">
+<title>Backing up</title>
+<list>
+<item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Choose a filename and the folder where you want to save the backup file, and click <gui style="button">Save</gui>.</p></item>
+<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+</list>
+</section>
+
+<section id="restore">
+<title>Restoring</title>
+<list>
+<item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Choose the file, and click <gui style="button">Open</gui>.</p></item>
+<item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
+</list>
+<note style="tip"><p>In the <link xref="intro-first-run">first-run assistant</link>, you can restore Evolution data from a backup file.</p></note>
+</section>
+
+</page>
diff --git a/help/C/calendar-alarms-and-reminders.page b/help/C/calendar-alarms-and-reminders.page
new file mode 100644
index 0000000000..c3433d2fe2
--- /dev/null
+++ b/help/C/calendar-alarms-and-reminders.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-alarms-and-reminders">
+
+  <info>
+    <desc>Setting up reminder notifications for appointments.</desc>
+    
+    <link type="guide" xref="index#calendar" />
+
+    <revision pkgversion="3.1.5" version="0.4" date="2011-08-02" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#CACHCGCI -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>  
+
+  </info>
+
+<title>Reminders for appointments</title>
+
+<section id="general-settings">
+<title>General Settings</title>
+
+<p>Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Reminders</gui></guiseq> you can select those calendars for which you want to receive reminder notifications. If you do not select a calendar, you will not receive reminders for any events in this calendar. You can also define whether to show a reminder for every appointment and for every birthday and anniversary.</p>
+
+</section>
+
+<section id="manual-reminders">
+<title>Manual Reminders</title>
+
+<p>Apart from the general settings you can also set up reminders in the appointment editor for certain appointments only:</p>
+<steps>
+<item><p>Click <guiseq><gui>Options</gui><gui>Reminders</gui></guiseq> or press the Reminder button in the toolbar.</p></item>
+<item><p>From the dropdown menu, choose either one of the available default options when to show a notification reminder, <!-- TODO: Test how this is in GNOME3? Displayed in Notification area, permanent? --> or choose <gui>Customize</gui>.</p></item>
+<item><p>In case of <gui>Customize</gui>, the reminder can be a popup, a sound played, or a program ran. You can also define whether the reminder should be repeated.</p></item>
+</steps>
+
+</section>
+
+</page>
diff --git a/help/C/calendar-caldav.page b/help/C/calendar-caldav.page
new file mode 100644
index 0000000000..fbf8930a1a
--- /dev/null
+++ b/help/C/calendar-caldav.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-caldav">
+
+  <info>
+    <desc>Using an online CalDAV calendar.</desc>
+    
+    <link type="guide" xref="calendar-using-several-calendars"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-multiple.html.en -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Using a CalDAV calendar</title>
+
+<p>To add such a calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>CalDAV</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter the address of the calendar in the <gui>URL</gui> field.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Enter your username and your email address.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/calendar-classifications.page b/help/C/calendar-classifications.page
new file mode 100644
index 0000000000..835e8b3f0f
--- /dev/null
+++ b/help/C/calendar-classifications.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="calendar-classifications">
+
+  <info>
+    <desc>Classifying appointments and tasks on groupware servers.</desc>
+    
+    <link type="guide" xref="index#calendar-advanced" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-31" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#bxmtbjb -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using Classifications</title>
+
+<p>If you are using a calendar on a Novell GroupWise or Microsoft Exchange server, you can select a classification to determine who can view it.</p>
+<p>To set a classification for an appointment or a task, click <guiseq><gui>Options</gui><gui>Classifications</gui></guiseq> and select a classification in the editor. <gui>Public</gui> is the default category, and a public appointment can be viewed by anyone on the calendar-sharing network. <gui>Private</gui> denotes one level of security, and <gui>Confidential</gui> an even higher level.</p>
+<p>The different levels vary depending on your server settings; check with your system administrator or adjust your delegation settings.</p>
+
+</page>
diff --git a/help/C/calendar-free-busy.page b/help/C/calendar-free-busy.page
new file mode 100644
index 0000000000..6eb4f19d39
--- /dev/null
+++ b/help/C/calendar-free-busy.page
@@ -0,0 +1,52 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-free-busy">
+
+  <info>
+    <desc>Using the Free/Busy view for setting up meetings.</desc>
+
+    <link type="guide" xref="calendar-sharing-information" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en and http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#usage-calendar-freebusy -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Free/Busy information</title>
+
+<p>You can use the Free/Busy search for meetings to determine the availability of invitees.</p>
+
+<!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655494 is fixed -->
+
+<p>In addition to the standard meeting scheduling tools, you can use the Free/Busy view to check whether people are available in advance. The Free/Busy feature is normally a function of dedicated groupware servers such as Microsoft Exchange and Novell GroupWise. However, you can also publish Free/Busy information online, and access Free/Busy information published elsewhere. If not everyone you collaborate with publishes Free/Busy data, you can still use <link xref="calendar-meetings-sending-invitation">meeting invitations</link> to coordinate schedules with other people.</p>
+
+<p>To access the free/busy view:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>.</p></item>
+<item><p>Click <gui style="button">Add</gui> to add the email addresses of people you want to invite.</p></item>
+<item><p>Click the <gui>Free/Busy</gui> button on the toolbar, or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p></item>
+<item><p>Adjust the meeting time, either by dragging the meeting borders or by using the <gui>Autopick</gui> buttons to choose a time automatically, then click <gui style="button">Close</gui>. Attendees on an Exchange server have the appointment updated automatically; others receive email notification of any change in plans.</p></item>
+</steps>
+
+<list>
+<item><p>Attendee List:</p><p>The Attendee List shows the people who have been invited to the appointment.</p></item>
+<item><p>Schedule Grid:</p><p>The Schedule Grid shows the published Free/Busy information for the people you have invited. This is where you compare schedules to find free time to schedule the appointment. Individuals have visible scheduling information only if they use the same Novell GroupWise or Microsoft Exchange server you do (that is, if they are in the same organization as you), or if they publish free/busy information at a URL you can reach and you have entered that URL into their contact cards using the contact editor.</p></item>
+</list>
+
+<p>You can publish Calendar and Free/Busy information to a WebDAV server, FTP server, a remote machine through SSH or to any other web server with HTTP PUT support.</p>
+
+<section id="no-groupware">
+<title>Accessing Free/Busy Data Without a Groupware Server</title>
+
+<p>If individuals give you a URL for Free/Busy data or for their web calendar, you can add the URL under <guiseq><gui>Personal Information</gui><gui>Web Addresses</gui></guiseq> in the <link xref="contacts-usage-edit-contact">Contact Editor</link>. Then, when you schedule a meeting with them, Evolution looks up the schedule and displays it in the Free/Busy data.</p>
+</section>
+
+</page>
diff --git a/help/C/calendar-google.page b/help/C/calendar-google.page
new file mode 100644
index 0000000000..573fb211f8
--- /dev/null
+++ b/help/C/calendar-google.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-google">
+
+  <info>
+    <desc>Using the online calendar of your Google account.</desc>
+    
+    <link type="guide" xref="calendar-using-several-calendars"/>
+    <link type="guide" xref="google-services"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en#b1a47igh -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Using a Google calendar</title>
+
+<p>To add such a calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>Google</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter your Google username.</p></item>
+<item><p>If you have more than one Google calendar, define which of them to use.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/calendar-layout-appointment-display.page b/help/C/calendar-layout-appointment-display.page
new file mode 100644
index 0000000000..bda9ff6c78
--- /dev/null
+++ b/help/C/calendar-layout-appointment-display.page
@@ -0,0 +1,54 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-layout-appointment-display">
+
+  <info>
+    <desc>Define the displaying of appointments in the calendar.</desc>
+    
+    <link type="guide" xref="calendar-layout" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bshpsxa -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Appearance of Appointments</title>
+
+<!-- TODO:POST-3-2: Just listing the partially busted UI options (also see calendar-layout-general-formatting) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
+
+<!-- TODO:ANDREKLAPPER: File bug report similar to #655666 once checked in 3.1 about General & Display tabs. This is a huge mess, e.g. time settings are split onto two tabs. -->
+
+<p>The following calendar-related options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Display</gui></guiseq>.</p>
+
+<section id="general">
+<title>General</title>
+<list>
+<item><p>Time Divisions:</p>
+<p>Sets the time increments shown as fine lines on the daily view in the calendar.</p></item>
+<item><p>Show appointment end times in week and month views:</p>
+<p>If there is space, Evolution shows the end times in the week and month views for each appointment.</p></item>
+<item><p>Compress weekends in month view:</p>
+<p>Select this option to display weekends in one box instead of two in the month view.</p></item>
+<item><p>Show week numbers:</p>
+<p>Shows the week numbers next to the respective weeks in the calendar.</p></item>
+<item><p>Show recurring events in italic in bottom left calendar</p></item>
+<item><p>Scroll Month View by a week</p></item>
+</list>
+</section>
+
+<section id="date-time">
+<title>Date/Time Format</title>
+<list>
+<p>You can change the format of the <gui>Date</gui> column by setting your prefered format.</p><p>The placeholders in the format expression are strftime variables.</p>
+</list>
+</section>
+
+</page>
diff --git a/help/C/calendar-layout-general-formatting.page b/help/C/calendar-layout-general-formatting.page
new file mode 100644
index 0000000000..b98fb22315
--- /dev/null
+++ b/help/C/calendar-layout-general-formatting.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-layout-general-formatting">
+
+  <info>
+    <desc>General formatting options for the calendar.</desc>
+    
+    <link type="guide" xref="calendar-layout" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bshpskx -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+<!-- TODO:POST-3-2: Just listing the partially busted UI options (also see calendar-layout-appointment-display) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
+
+  </info>
+
+<title>General formatting options</title>
+
+<p>The following options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui></guiseq>.</p>
+<section id="time">
+<title>Time</title>
+<list>
+<item><p>Time format:</p>
+<p>Choose between twelve-hour (AM/PM) and twenty-four-hour time formats.</p></item>
+<item><p><link xref="calendar-timezones">Time zone</link> and Second zone:</p>
+<p>The city you are located in, and optionally a second city.</p></item>
+</list>
+</section>
+
+<section id="work-week">
+<title>Work Week</title>
+<list>
+<item><p>Week starts on:</p>
+<p>Select the day to display as the first in each week.</p></item>
+<item><p>Work days:</p>
+<p>Define which week days are work days.</p></item>
+<item><p>Day begins:</p>
+<p>Define at which time your work day begins.</p></item>
+<item><p>Day ends:</p>
+<p>Define at which time your work day ends.</p></item>
+</list>
+</section>
+
+<section id="alerts">
+<title>Alerts</title>
+<p>If you want to be warned before you delete any appointment, select this option.</p>
+</section>
+
+</page>
diff --git a/help/C/calendar-layout-views.page b/help/C/calendar-layout-views.page
new file mode 100644
index 0000000000..c097ff376b
--- /dev/null
+++ b/help/C/calendar-layout-views.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-layout-views">
+
+  <info>
+    <desc>Using date ranges (day, week, month) to look at the calendar.</desc>
+    
+    <link type="guide" xref="calendar-layout" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Available views</title>
+
+<p>Evolution offers five different views of your calendar data:</p>
+<list>
+<item><p>Day (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)</p></item>
+<item><p>Work Week (<keyseq><key>Ctrl</key><key>J</key></keyseq>)</p></item>
+<item><p>Week (<keyseq><key>Ctrl</key><key>K</key></keyseq>)</p></item>
+<item><p>Month (<keyseq><key>Ctrl</key><key>M</key></keyseq>)</p></item>
+<item><p>List (<keyseq><key>Ctrl</key><key>L</key></keyseq>)</p></item>
+</list>
+
+<p>You can switch the view by either using the buttons in the toolbar, or by clicking <guiseq><gui>View</gui><gui>Current View</gui></guiseq>.</p>
+
+<p>You can also select an arbitrary range of days in the small calendar in the side bar. To do this, select the days that you want to view in your calendar.</p>
+
+<p>The Previous and Next buttons move you forward and back in your calendar pages. If you are using a week or month view, you can move by week or month. To return to today's listing, click the <gui>Select today</gui> button between the two arrow buttons in the toolbar.</p>
+
+<p>To visit calendar entries for a specific date, click the <gui>Select a specific date</gui> button in the toolbar.</p>
+
+</page>
diff --git a/help/C/calendar-layout.page b/help/C/calendar-layout.page
new file mode 100644
index 0000000000..c81d16472d
--- /dev/null
+++ b/help/C/calendar-layout.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="calendar-layout">
+
+  <info>
+    <desc>Adjusting the display and views of the calendar.</desc>
+
+    <link type="guide" xref="index#calendar"/>
+
+    <revision pkgversion="3.0.0" version="0.1" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Changing the calendar layout</title>
+
+</page>
diff --git a/help/C/calendar-local.page b/help/C/calendar-local.page
new file mode 100644
index 0000000000..105c07160f
--- /dev/null
+++ b/help/C/calendar-local.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-local">
+
+  <info>
+    <desc>Adding another local calendar.</desc>
+    
+    <link type="guide" xref="calendar-using-several-calendars"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Adding another local calendar</title>
+
+<p>To add another local calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On This Computer</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/calendar-marcus-bains-line.page b/help/C/calendar-marcus-bains-line.page
new file mode 100644
index 0000000000..c05a93924e
--- /dev/null
+++ b/help/C/calendar-marcus-bains-line.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="calendar-marcus-bains-line">
+
+  <info>
+    <desc>The red "Marcus Bains" line displays the current time.</desc>
+
+    <link type="guide" xref="calendar-layout" />
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+  </info>
+
+<title>Time display in the Day view</title>
+
+<p>The red Marcus Bains Line in the Day view of the calendar is a marker to show the current date and time.</p>
+
+</page>
diff --git a/help/C/calendar-meetings-delegating.page b/help/C/calendar-meetings-delegating.page
new file mode 100644
index 0000000000..e38ae5e0fd
--- /dev/null
+++ b/help/C/calendar-meetings-delegating.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-meetings-delegating">
+
+  <info>
+    <desc>Ask somebody else to run the meeting.</desc>
+    
+    <link type="guide" xref="calendar-meetings" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-29" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqatxt.html -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>  
+
+<!-- TODO: Check if all these steps are still correct in 3.1 -->
+
+  </info>
+
+<title>Delegating Meetings</title>
+<p>Only attendees of a meeting can delegate a meeting.</p>
+<steps>
+ <item>
+  <p>Right-click on the meeting that you want to delegate.</p>
+ </item>
+ <item>
+  <p>Click <gui>Delegate Meeting</gui>.</p>
+ </item>
+ <item>
+  <p>Select the contacts you want to delegate the meeting to.</p>
+ </item>
+ <item>
+  <p>Click <gui style="button">OK</gui>.</p>
+ </item>
+</steps>
+ <p>Each contact receives a copy of the meeting invitation.</p>
+</page>
diff --git a/help/C/calendar-meetings-replying-to-invitation.page b/help/C/calendar-meetings-replying-to-invitation.page
new file mode 100644
index 0000000000..66d3e53f51
--- /dev/null
+++ b/help/C/calendar-meetings-replying-to-invitation.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-meetings-replying-to-invitation">
+
+  <info>
+    <desc>Accepting and replying to a meeting invitation.</desc>
+    
+    <link type="guide" xref="calendar-meetings" />
+
+    <revision pkgversion="3.0.2" version="0.3" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#replying-to-rsvp -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>  
+
+<!-- TODO: Check if all these steps are still correct in 3.1 -->
+
+  </info>
+
+<title>Replying to a Meeting Request</title>
+<p>Meeting requests are sent as attachments. To view or respond to one, click the attachment icon and view it in the mail window. All the details about the event are shown, including time and dates. Then you can choose how to reply to the invitation - the options are to <gui>Accept</gui>, <gui>Tentatively Accept</gui>, or <gui>Decline</gui>.</p>
+
+<p>Click <gui style="button">OK</gui> to send your answer per email to the organizer. The event is also added automatically to your calendar if you accept.</p>
+<p>After you have added the meeting to your calendar, you can make changes to the meeting, but if the original organizer sends out an update, your changes might be overwritten.</p>
+
+<note><p>Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Calendar and Tasks</gui><gui>Conflict Search</gui></guiseq> you can define which calendars are used for warning you of meeting conflicts.</p></note>
+<!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655494 is fixed -->
+</page>
diff --git a/help/C/calendar-meetings-sending-invitation.page b/help/C/calendar-meetings-sending-invitation.page
new file mode 100644
index 0000000000..654a17205d
--- /dev/null
+++ b/help/C/calendar-meetings-sending-invitation.page
@@ -0,0 +1,52 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-meetings-sending-invitation">
+
+  <info>
+    <desc>Sending a Meeting Invitation.</desc>
+    
+    <link type="guide" xref="calendar-meetings" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-29" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+ <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#usage-calendar-rsvp -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>  
+
+  </info>
+
+<title>Sending a Meeting Invitation</title>
+
+<p>When you create a meeting (group appointment), you can specify the attendees in several categories, such as "chair" or "required". When you save the meeting listing, each attendee is sent an email with the meeting information, which also gives them the option to respond.</p>
+<p>If you do not need to collect attendance information when you're scheduling an event, and would rather just announce the event, right-click the meeting and select <gui>Forward as iCalendar</gui>. This opens a new email message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it will not automatically send you email about whether they plan to attend.</p>
+
+<p>To schedule a meeting:</p>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>.</p></item>
+<item><p>If you have multiple email accounts, select the one to use by selecting an item in the <gui>Organizer</gui> field.</p></item>
+<item><p>Select a calendar in the <gui>Calendar</gui> drop-down list.</p></item>
+<item><p>Click <gui style="button">Add</gui> to add the email addresses of people you want to invite.</p></item>
+<item><p>Click <gui>View</gui> in the menu bar to show or hide the <gui>Type</gui>, <gui>Role</gui>, <gui>Status</gui>, and <gui>RSVP</gui> fields.</p></item>
+<item><p>Enter a brief summary in the <gui>Summary</gui> field.</p></item>
+<item><p>(Optional) Type a location in the <gui>Location</gui> field.</p></item>
+<item><p>To select this appointment as an all day event, click <guiseq><gui>Options</gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> button on the toolbar.</p></item>
+<item><p>Select the date and time.</p></item>
+<item><p>If the event is not an all day event, select either <gui>For</gui> to specify the duration, or select <gui>Until</gui> to specify the ending time of the event.</p></item>
+<item><p>(Optional) Enter a description in the <gui>Description</gui> field.</p></item>
+<item><p>To query <link xref="calendar-free-busy">free/busy</link> information for the attendees, click the <gui>Free/Busy</gui> button on the toolbar, or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p></item>
+<item><p>Click <gui>Save</gui> to save the meeting.</p></item>
+</steps>
+
+<p>An email is sent out to all the recipients, inviting them to your event.</p>
+
+<note><p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, a <link xref="calendar-alarms-and-reminders">reminder</link>, a <link xref="calendar-recurrence">recurrence</link>, or a <link xref="calendar-classifications">classification</link> for the event, or add an attachment.</p></note>
+
+<note><p>In Evolution, a meeting can have only one organizer, and only the organizer can add participants to that meeting. Though it is possible to change the organizer of a meeting, this is not recommended as a means to invite additional participants to meetings. If you want to invite additional people to a meeting and are not that meeting's organizer, it is recommended that you forward the invitation message you received from the original meeting organiser to additional participants.</p></note>
+
+</page>
diff --git a/help/C/calendar-meetings.page b/help/C/calendar-meetings.page
new file mode 100644
index 0000000000..a29f58c88b
--- /dev/null
+++ b/help/C/calendar-meetings.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="calendar-meetings">
+
+  <info>
+    <desc>Using meetings in the calendar.</desc>
+
+    <link type="guide" xref="index#calendar-advanced" />
+
+    <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Meetings</title>
+
+</page>
diff --git a/help/C/calendar-organizing.page b/help/C/calendar-organizing.page
new file mode 100644
index 0000000000..b967ca3760
--- /dev/null
+++ b/help/C/calendar-organizing.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="calendar-organizing">
+
+  <info>
+    <desc>On using several calendars, searching, and categories.</desc>
+
+    <link type="guide" xref="index#calendar" />
+    <link type="guide" xref="organizing" />
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Sorting and organizing calendars</title>
+
+</page>
diff --git a/help/C/calendar-publishing.page b/help/C/calendar-publishing.page
new file mode 100644
index 0000000000..fd95a0bb45
--- /dev/null
+++ b/help/C/calendar-publishing.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-publishing">
+
+  <info>
+    <desc>Post your calendar content in public.</desc>
+
+    <link type="guide" xref="calendar-sharing-information" />
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-31" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from Reuse http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bxjng8p and http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#publishing-freebusy -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Calendar Publishing</title>
+<p>In order to make one of your calendars available to the public, you can define calendars to be uploaded to a web server under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Calendar Publishing</gui><gui style="button">Add</gui></guiseq>.</p>
+
+<p>You can specify the online location, the frequency of publishing, which calendar(s) to publish, and authentication information for uploading.</p>
+
+<p>You can publish Calendar and Free/Busy information to a WebDAV server, FTP server, a remote machine through SSH or to any other web server with HTTP PUT support.</p>
+
+<p>To immediately publish calendar information, click <guiseq><gui>Actions</gui><gui>Publish Calendar Information</gui></guiseq> in the calendar.</p>
+</page>
diff --git a/help/C/calendar-recurrence.page b/help/C/calendar-recurrence.page
new file mode 100644
index 0000000000..5b7785ae8c
--- /dev/null
+++ b/help/C/calendar-recurrence.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="calendar-recurrence">
+
+  <info>
+    <desc>Repeating appointments.</desc>
+    
+    <link type="guide" xref="index#calendar-advanced" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#bxmtcp3 -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using Recurrence</title>
+
+<p>If you have an appointment that takes place regurlarly, you can define its recurrence by clicking the <gui>Recurrence</gui> button in the <gui>Appointment Editor</gui> or by clicking <guiseq><gui>Options</gui><gui>Recurrence</gui></guiseq>. You can then choose a time and date when the appointment stops recurring, and, under <gui>Exceptions</gui>, pick individual days when the appointment does not recur. Make your selections from left to right, and you form a sentence: "Every two weeks on Monday and Friday until January 3, 2015" or "Every month on the first Friday for 12 occurrences."</p>
+
+</page>
diff --git a/help/C/calendar-searching.page b/help/C/calendar-searching.page
new file mode 100644
index 0000000000..d60066807c
--- /dev/null
+++ b/help/C/calendar-searching.page
@@ -0,0 +1,80 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"

+      type="topic" id="calendar-searching">

+

+  <info>

+    <desc>Searching appointments and meetings.</desc>

+

+    <link type="guide" xref="searching-items" />

+    <link type="guide" xref="calendar-organizing" />

+

+    <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft"/>

+    <credit type="author">

+      <name>Max Vorobuov</name>

+      <email>vmax0770@gmail.com</email>

+    </credit>

+    <credit type="author">

+      <name>Andre Klapper</name>

+      <email>ak-47@gmx.net</email>

+    </credit>

+    <credit type="author">

+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-contact-organize.html.en -->

+    </credit>

+    <license>

+      <p>Creative Commons Share Alike 3.0</p>

+    </license>    

+

+  </info>

+

+<title>Searching for Calendar Items</title>

+<section id="quick-search">

+<title>Quick Search</title>

+<p>In the Calendar view, you can quickly search for appointments and meetings either by summary or by category.</p>

+<p>Searching by summary:</p>

+<steps>

+<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>

+<item><p>Select the search condition from the list.</p></item>

+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>

+<item><p>Evolution displays the search results.</p></item>

+</steps>

+<p>Searching by category:</p>

+<steps>

+<item><p>Click the <gui>Show</gui> drop-down list.</p></item>

+<item><p>Select the category from the list.</p></item>

+<item><p>Evolution displays the search results.</p></item>

+</steps>

+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>

+</section>

+

+<section id="advanced-search">

+<title>Advanced Search</title>

+<steps>

+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>

+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>

+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>

+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>

+</steps>

+</section>

+

+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->

+<section id="clearing-search">

+<title>Clearing the Search results</title>

+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>

+</section>

+

+<section id="saved-searches">

+<title>Saved Searches</title>

+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>

+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>

+</section>

+

+<section id="editing-a-saved-search">

+<title>Editing a Saved Search</title>

+<steps>

+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>

+<item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>

+<item><p>Edit the title or search conditions from the dialog box.</p></item>

+<item><p>Click <gui>OK</gui>.</p></item>

+</steps>

+</section>

+ 

+</page>

diff --git a/help/C/calendar-sharing-information.page b/help/C/calendar-sharing-information.page
new file mode 100644
index 0000000000..55686789ee
--- /dev/null
+++ b/help/C/calendar-sharing-information.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="calendar-sharing-information">
+
+  <info>
+    <desc>Make your information (appointments and free/busy times) available to others.</desc>
+
+    <link type="guide" xref="index#calendar-advanced" />
+
+    <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Sharing your calendar information</title>
+
+</page>
diff --git a/help/C/calendar-timezones.page b/help/C/calendar-timezones.page
new file mode 100644
index 0000000000..10a10f8313
--- /dev/null
+++ b/help/C/calendar-timezones.page
@@ -0,0 +1,41 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-timezones">
+
+  <info>
+    <desc>Using time zones in the calendar.</desc>
+
+    <link type="guide" xref="index#calendar-advanced" />
+
+    <revision pkgversion="3.1.5" version="0.4" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bshlzlu.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using time zones</title>
+
+<p>Evolution supports using multiple time zones.</p>
+
+<section id="default-timezone">
+<title>Setting your global timezone(s)</title>
+
+<p>By default Evolution uses the system-wide time zone. This can be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Time zone</gui></guiseq>.</p>
+
+<p>If you deal a lot with people in another specific time zone you can display that second time zone in the day view of the calendar. You can set a second time zone under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Second zone</gui></guiseq>.</p>
+</section>
+
+<section id="appointment-timezone">
+<title>Setting a timezone for an appointment</title>
+
+<p>You can also configure time zone information specific to each appointment. To do that, <link xref="calendar-usage">add a new or edit an existing appointment</link> and click the globe button to customize the time zone that the time exists in. For example, if you live in New York but have a telephone meeting set for noon with someone in California, you need to make sure that your schedules are coordinated. Setting time zones on a per-appointment basis helps avoid that potential confusion.</p>
+</section>
+
+</page>
diff --git a/help/C/calendar-usage-add-appointment.page b/help/C/calendar-usage-add-appointment.page
new file mode 100644
index 0000000000..04d20010b7
--- /dev/null
+++ b/help/C/calendar-usage-add-appointment.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-usage-add-appointment">
+
+  <info>
+    <desc>Adding an appointment.</desc>
+    
+    <link type="guide" xref="calendar-usage" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Adding an Appointment</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Appointment</gui></guiseq>, or double-click in a blank space in the calendar to open the Appointment dialog. The particular time on the calendar view against which you have double clicked on will be suggested for the new appointment. You can also directly write in the calendar and then adjust the duration by dragging it with the mouse.</p></item>
+<item><p>If you use the Appointment dialog:</p></item>
+<item><p>Select a calendar in the <gui>Calendar</gui> drop-down list.</p></item>
+<item><p>Enter a brief summary in the <gui>Summary</gui> field.</p></item>
+<item><p>(Optional) Type a location in the <gui>Location</gui> field.</p></item>
+<item><p>To select this appointment as an all day event, click <guiseq><gui>Options</gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> button on the toolbar.</p></item>
+<item><p>Select the date and time.</p></item>
+<item><p>If the event is not an all day event, select either <gui>For</gui> to specify the duration, or select <gui>Until</gui> to specify the ending time of the event.</p></item>
+<item><p>(Optional) Enter a description in the <gui>Description</gui> field.</p></item>
+<item><p>To show the time as <link xref="calendar-free-busy">busy</link> to others, click <guiseq><gui>Options</gui><gui>Show Time as Busy</gui></guiseq>.</p></item>
+</steps>
+<note><p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, a <link xref="calendar-alarms-and-reminders">reminder</link>, a <link xref="calendar-recurrence">recurrence</link>, or a <link xref="calendar-classifications">classification</link> for the event, or add an attachment.</p></note>
+
+</page>
diff --git a/help/C/calendar-usage-delete-appointment.page b/help/C/calendar-usage-delete-appointment.page
new file mode 100644
index 0000000000..1520178c65
--- /dev/null
+++ b/help/C/calendar-usage-delete-appointment.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-usage-delete-appointment">
+
+  <info>
+    <desc>Deleting in appointment in your calendar.</desc>
+    
+    <link type="guide" xref="calendar-usage" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Deleting an Appointment</title>
+
+<p>If you want to delete an appointment in your calendars, right-click on the appointment in the calendar and select <gui>Delete Appointment</gui>, or click on the appointment and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>. If you are in the <link xref="calendar-layout-views">list view</link> you can also use <guiseq><gui>Edit</gui><gui>Delete Appointment</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/calendar-usage-edit-appointment.page b/help/C/calendar-usage-edit-appointment.page
new file mode 100644
index 0000000000..eb333e9f4d
--- /dev/null
+++ b/help/C/calendar-usage-edit-appointment.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-usage-edit-appointment">
+
+  <info>
+    <desc>Editing in appointment in your calendar.</desc>
+    
+    <link type="guide" xref="calendar-usage" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Editing an Appointment</title>
+
+<p>If you want to change an appointment that already exists in your calendars,</p>
+
+<steps>
+<item><p>Double-click on the appointment that you want to edit in the calendar.</p></item>
+<item><p>Edit the appointment (see <link xref="calendar-usage-add-appointment">Adding an Appointment</link> for the list of available options).</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/calendar-usage.page b/help/C/calendar-usage.page
new file mode 100644
index 0000000000..ed313e89a1
--- /dev/null
+++ b/help/C/calendar-usage.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="calendar-usage">
+
+  <info>
+    <desc>On adding, editing, and deleting appointments.</desc>
+    
+    <link type="guide" xref="index#calendar" />
+    <link type="seealso" xref="calendar-meetings" />
+
+    <revision pkgversion="3.1.5" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Add, Edit, and Delete Appointments</title>
+
+</page>
diff --git a/help/C/calendar-using-several-calendars.page b/help/C/calendar-using-several-calendars.page
new file mode 100644
index 0000000000..315d84aa74
--- /dev/null
+++ b/help/C/calendar-using-several-calendars.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="calendar-using-several-calendars">
+
+  <info>
+    <desc>Adding and using more than one calendar and different types.</desc>
+
+    <link type="guide" xref="calendar-organizing" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-multiple.html.en and http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using several calendars</title>
+
+<p>You can have multiple calendars and overlay them one over the next. For example, you might have a schedule of events for work, one for home, and one for your favorite sports team. The side bar lists those calendars, and you can select or deselect the boxes next to them to show and hide the appointments in your calendar view. By hiding and showing different sets of appointments, you can be sure to avoid conflicts, while keeping a minimum of clutter in your view.</p>
+
+<p>Appointments for each calendar appear as a different color.</p>
+
+<p>You can also use calendars that are not on your computer, such as on the internet or in a local network.</p>
+
+<p>For example, the <link href="http://icalshare.com">icalshare.com website</link> has an extensive list of shared online calendars, including national and religious holidays, phases of the moon, sports, and local and regional events.</p>
+
+</page>
diff --git a/help/C/calendar-weather.page b/help/C/calendar-weather.page
new file mode 100644
index 0000000000..902c03aa07
--- /dev/null
+++ b/help/C/calendar-weather.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-weather">
+
+  <info>
+    <desc>Display the weather in the calendar.</desc>
+    
+    <link type="guide" xref="calendar-using-several-calendars"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Using a weather calendar</title>
+
+<p>Calendars of this type are read-only.</p>
+
+<p>To add such a calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>Weather</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Choose a location by selecting continent, country and city.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Choose the temperature unit.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/calendar-webdav.page b/help/C/calendar-webdav.page
new file mode 100644
index 0000000000..fbce16de5e
--- /dev/null
+++ b/help/C/calendar-webdav.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="calendar-webdav">
+
+  <info>
+    <desc>Using an online Webcal/WebDAV calendar.</desc>
+    
+    <link type="guide" xref="calendar-using-several-calendars"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Using a WebDAV calendar</title>
+
+<p>Calendars of this type are read-only.</p>
+
+<p>To add such a calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On the Web</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter the address of the calendar in the <gui>URL</gui> field.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Enter your username.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/change-switcher-appearance.page b/help/C/change-switcher-appearance.page
new file mode 100644
index 0000000000..707c965b9d
--- /dev/null
+++ b/help/C/change-switcher-appearance.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="change-switcher-appearance">
+
+  <info>
+    <desc>Changing the display of the window buttons in the lower left corner.</desc>
+    <link type="guide" xref="index#common-other-problems" />
+<!-- TODO:POST-3-2: Create a general interface adjustment guide page that also includes mail-layout-changing.page -->
+    <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+  <title>Changing the Switcher appearance</title>
+
+<p>The display of the window buttons in the lower left corner (Mail, Contacts, Calendar, Tasks and Memos) can be changed via <guiseq><gui>View</gui><gui>Switcher Appearance</gui></guiseq>. This can be helpful if you have a small display. You can also completely hide them.</p>
+<p>The available options are:</p>
+<list>
+<item><p>
+Icons and Text
+</p></item>
+<item><p>
+Icons Only
+</p></item>
+<item><p>
+Text Only
+</p></item>
+<item><p>
+Toolbar Style
+</p></item>
+<item><p>
+Show Buttons
+</p></item>
+</list>
+</page>
diff --git a/help/C/contacts-add-automatically.page b/help/C/contacts-add-automatically.page
new file mode 100644
index 0000000000..f2f6561989
--- /dev/null
+++ b/help/C/contacts-add-automatically.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-add-automatically">
+
+  <info>
+    <desc>Automatically add senders of mail that you have received to your contacts.</desc>
+    
+    <link type="guide" xref="contacts-usage"/>
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-01-05" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Barbara Tobias</name>
+      <email>barbtobias09@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Adding people automatically to my contacts</title>
+
+
+<p>You can add people automatically to your contacts when you reply to received email. Enable the plugin <gui>Automatic Contacts</gui> by going to <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on "Automatic Contacts" so that it shows a check mark. Then go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Automatic Contacts</gui></guiseq> and enable the <gui>Create address book entries when sending emails</gui> option and select an address book in the drop-down field below that will receive the new contacts.</p>
+<!-- TODO: Update once https://bugzilla.gnome.org/show_bug.cgi?id=655492 is fixed -->
+<p>From now on, contacts will be automatically created for senders of received mail when you reply to that mail.</p>
+</page>
diff --git a/help/C/contacts-autocompletion.page b/help/C/contacts-autocompletion.page
new file mode 100644
index 0000000000..9b9ccba194
--- /dev/null
+++ b/help/C/contacts-autocompletion.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-autocompletion">
+
+  <info>
+    <desc>Autocompletion of names and email addresses entered in the mail composer.</desc>
+    
+    <link type="guide" xref="index#contacts"/>
+    <link type="guide" xref="index#mail-composing"/>
+    <link type="seealso" xref="mail-composer-forward"/>
+    <link type="seealso" xref="mail-composer-reply"/>
+    <link type="seealso" xref="mail-composer-write-new-message"/>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-to -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Autocompletion of mail recipients</title>
+
+<p>You can enter the first three letters of names and email addresses in the recipients text field and Evolution will present you with a list of matches from your address books.</p>
+<p>To enable autocompletion, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq> and choose the address books from the list that Evolution should look in for matches.</p>
+
+<p>Select <gui>Always show address of the autocompleted contact</gui> to also show the email address along with the name. This can be helpful to distinguish if a contact has several email addresses.</p>
+
+<p>Alternately, you can click the <gui>To:</gui>, <gui>Cc:</gui>, or <gui>Bcc:</gui> buttons to get a list of the email addresses in your contacts. Select addresses and click the arrow buttons to move them into the appropriate address columns.</p>
+
+</page>
diff --git a/help/C/contacts-google.page b/help/C/contacts-google.page
new file mode 100644
index 0000000000..62a1d38ad4
--- /dev/null
+++ b/help/C/contacts-google.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-google">
+
+  <info>
+    <desc>Use the online address book of your Google account.</desc>
+    
+    <link type="guide" xref="contacts-using-several-addressbooks"/>
+    <link type="guide" xref="google-services"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Using a Google addressbook</title>
+
+<p>To add such an adress book to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>Google</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter your Google username.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The address book will be added to the list of address books in Evolution.</p>
+
+</page>
diff --git a/help/C/contacts-ldap.page b/help/C/contacts-ldap.page
new file mode 100644
index 0000000000..119b005ddb
--- /dev/null
+++ b/help/C/contacts-ldap.page
@@ -0,0 +1,76 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-ldap">
+
+  <info>
+    <desc>Use shared address books on a local network.</desc>
+    
+    <link type="guide" xref="contacts-using-several-addressbooks"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-contact-sharing.html.en and http://library.gnome.org/users/evolution/2.32/config-prefs-contact.html.en#bxmw6w5 -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Adding LDAP access</title>
+
+<p>The LDAP protocol was created to let users share contact information over a network by sharing access to a central directory. LDAP allows a company to maintain a shared set of contact information. Many companies keep a common LDAP address book for all their employees or for client contacts.</p>
+
+<section id="add-ldap-addressbook">
+<title>Adding an LDAP address book</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
+<item><p>In the <gui>General</gui> tab, select the type <gui>On LDAP Servers</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Enter the address of the server, the port number (the default number is 389) and whether you want to connect securely.</p></item>
+<item><p>Define the login method and your user name.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+<item><p>In the <gui>Details</gui> tab you can define the following settings:</p>
+<list>
+ <item><p>Search Base: The search base is the starting point for a directory search. Contact your system administrator for information about the correct settings.</p></item>
+ <item><p>Search Scope: The search scope is the breadth of a given search. The following options are available:</p>
+  <list>
+  <item><p>One: Searches the Search Base and one entry below it.</p></item>
+  <item><p>Sub: Searches the Search Base and all entries below it.</p></item>
+  </list>
+ </item>
+ <item><p>Search Filter: The search filter can be set here for all the LDAP queries. For example:</p>
+  <list>
+  <item><p><code>ObjectClass=*</code>: Lists all the objects from the server.</p></item>
+  <item><p><code>ObjectClass=User</code>: Lists only the users.</p></item>
+  <item><p><code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: Retrieves the User and Contact List objects.</p></item>
+  <item><p><code>(&amp;(mail=*)(ObjectClass=*))</code>: Lists the objects associated with the email addresses.</p></item>
+  </list>
+ </item>
+ <item><p>Timeout (minutes): The maximum time Evolution attempts to download data from the server before giving up.</p></item>
+ <item><p>Download Limit: The maximum number of results for a given search. Most servers refuse to send more than 500 contacts, but you can set the number lower if you want to shorten downloads for very broad searches.</p></item>
+</list>
+</item>
+</steps>
+
+<note><p>If you are unsure about some settings, ask your system administrator.</p></note>
+
+</section>
+
+<section id="add-ldap-addressbook">
+<title>Differences to local address books</title>
+
+<p>LDAP address books work like local address books on your computer, with the following exceptions:</p>
+<list>
+<item><p>Network folders are only available when you are connected to the network. If you use a laptop or have a modem connection, you might want to copy or cache some of the network directory. You do this by dragging and dropping your desired contacts into the local address books.</p></item>
+<item><p>You can also mark the network folder for offline usage. To mark the folder, right-click the folder, click Properties and select Copy Folder Content Locally for Offline Operation.</p></item>
+<item><p>To prevent excess network traffic, Evolution does not normally load data from the LDAP server upon opening.</p></item>
+<item><p>Depending on your server settings, you might not be able to edit all the fields in a contact stored on an LDAP server. Some servers prohibit some or all changes, and others use a smaller set of fields than Evolution allows. Check with your system administrator if you need different settings.</p></item>
+</list>
+</section>
+
+</page>
diff --git a/help/C/contacts-local.page b/help/C/contacts-local.page
new file mode 100644
index 0000000000..c57a8ebfab
--- /dev/null
+++ b/help/C/contacts-local.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-local">
+
+  <info>
+    <desc>Adding another local address book.</desc>
+    
+    <link type="guide" xref="contacts-using-several-addressbooks"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Adding another local address book</title>
+
+<p>To add another local calendar to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On This Computer</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The address book will be added to the list of address books in Evolution.</p>
+
+</page>
diff --git a/help/C/contacts-organizing.page b/help/C/contacts-organizing.page
new file mode 100644
index 0000000000..28239138b3
--- /dev/null
+++ b/help/C/contacts-organizing.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="contacts-organizing">
+
+  <info>
+    <desc>On address books, searching, contact lists, and categories.</desc>
+
+    <link type="guide" xref="index#contacts" />
+    <link type="guide" xref="organizing" />
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Sorting, organizing and grouping contacts</title>
+
+<p>There are several ways how to organize your contacts. You can use several addressbooks and categories, and for conveniently sending messages to a group of people contact lists are available.</p>
+
+</page>
diff --git a/help/C/contacts-searching.page b/help/C/contacts-searching.page
new file mode 100644
index 0000000000..e4fbcef836
--- /dev/null
+++ b/help/C/contacts-searching.page
@@ -0,0 +1,80 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"

+      type="topic" id="contacts-searching">

+

+  <info>

+    <desc>Searching contacts.</desc>

+

+    <link type="guide" xref="searching-items" />

+    <link type="guide" xref="contacts-organizing" />

+

+    <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft"/>

+    <credit type="author">

+      <name>Max Vorobuov</name>

+      <email>vmax0770@gmail.com</email>

+    </credit>

+    <credit type="author">

+      <name>Andre Klapper</name>

+      <email>ak-47@gmx.net</email>

+    </credit>

+    <credit type="author">

+      <name>Novell, Inc</name>

+    </credit>

+    <license>

+      <p>Creative Commons Share Alike 3.0</p>

+    </license>    

+<!-- TODO: Evo 3.0.2 also has Edit > Find in contact, and I have no idea how it exactly works. Find out! -->

+  </info>

+

+<title>Searching Contacts</title>

+<section id="quick-search">

+<title>Quick Search</title>

+<p>In the Calendar view, you can quickly search for contacts either by category or by contact's info.</p>

+<p>Searching by contact's info:</p>

+<steps>

+<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>

+<item><p>Select the search condition from the list.</p></item>

+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>

+<item><p>Evolution displays the search results.</p></item>

+</steps>

+<p>Searching by category:</p>

+<steps>

+<item><p>Click the <gui>Show</gui> drop-down list.</p></item>

+<item><p>Select the category from the list.</p></item>

+<item><p>Evolution displays the search results.</p></item>

+</steps>

+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>

+</section>

+

+<section id="advanced-search">

+<title>Advanced Search</title>

+<steps>

+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>

+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>

+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>

+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>

+</steps>

+</section>

+

+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->

+<section id="clearing-search">

+<title>Clearing the Search results</title>

+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>

+</section>

+

+<section id="saved-searches">

+<title>Saved Searches</title>

+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>

+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>

+</section>

+

+<section id="editing-a-saved-search">

+<title>Editing a Saved Search</title>

+<steps>

+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>

+<item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>

+<item><p>Edit the title or search conditions from the dialog box.</p></item>

+<item><p>Click <gui>OK</gui>.</p></item>

+</steps>

+</section>

+ 

+</page>

diff --git a/help/C/contacts-usage-add-contact.page b/help/C/contacts-usage-add-contact.page
new file mode 100644
index 0000000000..846a2860d1
--- /dev/null
+++ b/help/C/contacts-usage-add-contact.page
@@ -0,0 +1,41 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-usage-add-contact">
+
+  <info>
+    <desc>Adding a contact to your address book.</desc>
+    
+    <link type="guide" xref="contacts-usage" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Adding a Contact</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or right-click in a blank space in the list of contacts and click "New Contact...", or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></keyseq>.</p></item>
+<item><p>Select the address book under <gui>Where:</gui> to which it will be added.</p></item>
+<item><p>Enter the contact information. Note that there are several tabs.</p></item>
+<item><p>You can add a photograph to the contact by clicking the large field (showing a stylized person) next to <gui>Full Name</gui> and <gui>Categories</gui>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+<section id="contact-quick-add">
+<title>Contact Quick-Add from the Email Window</title>
+
+<p>You can also add a contact directly from an email.</p>
+<steps>
+<item><p>Right-click on the email address in the message header.</p></item>
+<item><p>Select <gui>Add to Address Book...</gui>.</p></item>
+<item><p>Either press <gui style="button">Edit Full</gui> to bring up the full <gui>Contact Editor</gui>, or click <gui style="button">OK</gui> to directly add the contact to the chosen address book.</p></item>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/contacts-usage-delete-contact.page b/help/C/contacts-usage-delete-contact.page
new file mode 100644
index 0000000000..065c2e941c
--- /dev/null
+++ b/help/C/contacts-usage-delete-contact.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-usage-delete-contact">
+
+  <info>
+    <desc>Deleting a contact from your address book.</desc>
+    
+    <link type="guide" xref="contacts-usage" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Deleting a Contact</title>
+
+<p>If you want to delete a contact in your address books, right-click on the contact and select <gui>Delete</gui>, or click on the appointment and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or click <guiseq><gui>Edit</gui><gui>Delete Contact</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/contacts-usage-edit-contact.page b/help/C/contacts-usage-edit-contact.page
new file mode 100644
index 0000000000..df02afd42d
--- /dev/null
+++ b/help/C/contacts-usage-edit-contact.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-usage-edit-contact">
+
+  <info>
+    <desc>Editing a contact in your address book.</desc>
+    
+    <link type="guide" xref="contacts-usage" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Editing a Contact</title>
+
+<p>If you want to change a contact that already exists in your address books,</p>
+
+<steps>
+<item><p>Double-click on the contact that you want to edit in the list of contacts, or select the contact and press <key>Enter</key>.</p></item>
+<item><p>Edit the contact information.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/contacts-usage.page b/help/C/contacts-usage.page
new file mode 100644
index 0000000000..0e1d727010
--- /dev/null
+++ b/help/C/contacts-usage.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="contacts-usage">
+
+  <info>
+    <desc>On adding, editing, and deleting contacts in address books.</desc>
+    
+    <link type="guide" xref="index#contacts" />
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-07-21" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Add, Edit, and Delete Contacts</title>
+
+</page>
diff --git a/help/C/contacts-using-contact-lists.page b/help/C/contacts-using-contact-lists.page
new file mode 100644
index 0000000000..b538223255
--- /dev/null
+++ b/help/C/contacts-using-contact-lists.page
@@ -0,0 +1,48 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-using-contact-lists">
+
+  <info>
+    <desc>Using contact lists for grouping contacts.</desc>
+
+    <link type="guide" xref="contacts-organizing" />
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-contact-organize.html.en#usage-contact-organize-group-list -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using Contact Lists</title>
+
+<p>A contact list is a set of contacts with a single nickname that you create. When you send mail to this nickname it is actually sent to every member of the list. This differs from a "real" mailing list in that it exists only on your computer as a convenience to you, rather than as an actual email address managed by a mailing list application on a server.</p>
+
+<p>For example, you could create one contact for each family member, then add those contacts to a contact list called "Family". Then, instead of entering each person's email address individually, you can send emails to "Family" and the messages would go to all of them.</p>
+
+<section id="create-contact-list">
+<title>Creating a contact list</title>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact List</gui></guiseq>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Select the address book under <gui>Where:</gui> to which it will be added.</p></item>
+<item><p>Specify the list members by either entering the names or email addresses of contacts (the text field supports autocompletion), or by dragging contacts from the Contacts window into the list, or by using the <gui style="button">Select...</gui> button.</p></item>
+<item><p>Choose whether you want to hide the email addresses when you send a message to the list.</p><p>Unless it is a very small list, it is recommended that you leave the addresses hidden. This is the same thing as using the “Bcc:” feature discussed in <link xref="mail-composer-several-recipients">Sending a message to several recipients</link>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+<p>The contact list will be added to the chosen address book in Evolution.</p>
+</section>
+
+<section id="create-contact-list">
+<title>Sending messages to a contact list</title>
+<p>To send a message to the contact list, enter the name that you chose for the contact list as the recipient in the mail composer. You can also right-click the contact list in your address book and select <gui>Send Message to List</gui>.</p>
+</section>
+ 
+</page>
diff --git a/help/C/contacts-using-several-addressbooks.page b/help/C/contacts-using-several-addressbooks.page
new file mode 100644
index 0000000000..b6ddee814a
--- /dev/null
+++ b/help/C/contacts-using-several-addressbooks.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="contacts-using-several-addressbooks">
+
+  <info>
+    <desc>Adding and using more than one address book and different types.</desc>
+
+    <link type="guide" xref="contacts-organizing" />
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using several address books</title>
+
+<p>You can have multiple address books. For example, you might have one address book for work related contacts and one for private contacts. The side bar lists those address books, and you can select which address book is shown.</p>
+
+<p>You can also use address books that are not on your computer, such as on the internet (e.g. Google) or in a local network (e.g. LDAP).</p>
+ 
+</page>
diff --git a/help/C/credits.page b/help/C/credits.page
new file mode 100644
index 0000000000..ad14909ade
--- /dev/null
+++ b/help/C/credits.page
@@ -0,0 +1,95 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="credits">
+
+  <info>
+    <desc>Credits and Acknowledgment.</desc>
+
+    <link type="guide" xref="index#further-reading" />
+
+    <revision pkgversion="2.32.1" version="0.1" date="2010-12-12" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Credits and Acknowledgment</title>
+
+<section id="current">
+<title>Authors of the Evolution User Documentation</title>
+<list>
+<item><p>
+André Klapper
+</p></item>
+<item><p>
+April Gonzalez
+</p></item>
+<item><p>
+Barbara M. Tobias
+</p></item>
+<item><p>
+Phil Bull
+</p></item>
+</list>
+</section>
+
+<section id="previous">
+<title>Authors of the previous version</title>
+<list>
+<item><p>
+Aaron Weber
+</p></item>
+<item><p>
+Akhil Laddha
+</p></item>
+<item><p>
+André Klapper
+</p></item>
+<item><p>
+Duncan Mak
+</p></item>
+<item><p>
+Ettore Perazzoli
+</p></item>
+<item><p>
+Francisco Javier F. Serrador
+</p></item>
+<item><p>
+Jessica Prabhakar
+</p></item>
+<item><p>
+Kevin Breit
+</p></item>
+<item><p>
+Mark Moulder
+</p></item>
+<item><p>
+Novell, Inc.
+</p></item>
+<item><p>
+Radhika Nair
+</p></item>
+<item><p>
+Srinivasa Ragavan
+</p></item>
+</list>
+</section>
+
+<section id="contact">
+<title>Contact information</title>
+<p>The GNOME Documentation Project:</p>
+<list>
+<item><p>
+<link href="http://live.gnome.org/DocumentationProject">Website</link>
+</p></item>
+<item><p>
+<link href="http://mail.gnome.org/mailman/listinfo/gnome-doc-list">Mailing list</link>
+</p></item>
+</list>
+</section>
+
+</page>
diff --git a/help/C/data-storage.page b/help/C/data-storage.page
new file mode 100644
index 0000000000..8ea0af392b
--- /dev/null
+++ b/help/C/data-storage.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="data-storage">
+
+  <info>
+    <desc>Where does Evolution store my data on the harddisk?</desc>
+    
+    <link type="guide" xref="index#common-other-problems" />
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Data storage locations</title>
+
+<note style="tip">
+<p>This is only interesting for advanced users that want to debug problems.</p>
+</note>
+
+<p>If you run Evolution 2.32.0 or later, data will be stored according to the <link href="http://www.freedesktop.org/wiki/Specifications/basedir-spec">XDG Base Directory Specification</link>. By default this means:</p>
+
+<terms>
+<item>
+<title>The user's data files</title>
+<p>$HOME/.local/share/evolution</p>
+</item>
+<item>
+<title>Various configuration and state files</title>
+<p>$HOME/.config/evolution</p>
+</item>
+<item>
+<title>Disposable data caches</title>
+<p>$HOME/.cache/evolution</p>
+</item>
+<item>
+<title>Configuration settings in GConf</title>
+<p>$HOME/.gconf/apps/evolution</p>
+</item>
+</terms>
+
+</page>
diff --git a/help/C/default-browser.page b/help/C/default-browser.page
new file mode 100644
index 0000000000..8749dc5901
--- /dev/null
+++ b/help/C/default-browser.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="default-browser">
+
+  <info>
+    <desc>How to define the default browser to open links with.</desc>
+    
+    <link type="guide" xref="index#common-other-problems" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Setting the default browser</title>
+
+<!-- For GNOME2 the steps are to define the gconf keys /desktop/gnome/url-handlers/http and /https -->
+
+<p>You can set the system-wide default browser in GNOME 3 under <guiseq><gui>Activities</gui><gui>Applications</gui><gui>System Settings</gui><gui>System</gui><gui>System Info</gui><gui>Default Applications</gui></guiseq>.</p>
+<p>If the prefered browser is set as default application but still does not work correctly please contact your distribution via their forum or bug tracker.</p>
+<note><p>GNOME 3 users with a technical background can tweak these settings by defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps.list</file>.</p></note>
+</page>
diff --git a/help/C/deleting-appointments.page b/help/C/deleting-appointments.page
new file mode 100644
index 0000000000..0eff2d10e2
--- /dev/null
+++ b/help/C/deleting-appointments.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="deleting-appointments">
+
+  <info>
+    <desc>Deleting calendar entries to reduce the size of the mailbox.</desc>
+    
+    <link type="guide" xref="deleting-to-free-disk-space" />
+
+    <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="candidate"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Deleting old appointments permanently</title>
+
+<p>To Purge old entries in a calendar, go to <guiseq><gui>Actions</gui><gui>Purge</gui></guiseq> in the Calendar view. You will be asked how many days old the events to remove from the calendar should be. The action will be applied to the currently opened calendar (selected in the list of calendars on the left); other calendars remain unchanged.</p>
+
+</page>
+
diff --git a/help/C/deleting-emails.page b/help/C/deleting-emails.page
new file mode 100644
index 0000000000..e6a686526b
--- /dev/null
+++ b/help/C/deleting-emails.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="deleting-emails">
+
+  <info>
+    <desc>Deleting emails or attachments to reduce the size of the mailbox.</desc>
+    
+    <link type="guide" xref="deleting-to-free-disk-space" />
+    <link type="seealso" xref="mail-moving-emails" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Deleting emails or attachments permanently</title>
+
+<section id="emails">
+<title>Emails</title>
+<p>Evolution deletes emails on IMAP servers by <em>marking</em> the messages for deletion; space is not freed until you <em>expunge</em> the marked emails. </p>
+
+<p>To Expunge a specific folder, go to <guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>. To Expunge all folders, go to <guiseq><gui>File</gui><gui>Empty Trash</gui></guiseq>. This applies to other types of accounts as well.</p>
+</section>
+
+<section id="attachments">
+<title>Attachments</title>
+<p>To delete the attachments of an email, select the message and click <guiseq><gui>Message</gui><gui>Remove Attachments</gui></guiseq>.</p>
+</section>
+</page>
+
diff --git a/help/C/deleting-to-free-disk-space.page b/help/C/deleting-to-free-disk-space.page
new file mode 100644
index 0000000000..776dc05d73
--- /dev/null
+++ b/help/C/deleting-to-free-disk-space.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="deleting-to-free-disk-space">
+
+  <info>
+    <desc>Deleting emails and calendar entries to reduce the size of the files used by Evolution.</desc>
+    
+    <link type="guide" xref="index#common-other-problems" />
+
+    <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="candidate"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Freeing disk space by deleting items</title>
+
+</page>
+
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
deleted file mode 100644
index ef2926166e..0000000000
--- a/help/C/evolution.xml
+++ /dev/null
@@ -1,7306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-
- <!ENTITY appname "Evolution" >
- <!ENTITY appversion "2.30" >
- <!ENTITY z-3rdParty "*" >
- <!ENTITY z-SM "(SM)" >
- <!ENTITY z-CM "(CM)" >
- <!ENTITY z-CLM "(CLM)" >
-] >
-
-<book lang="en" id="index">
- <bookinfo id="Front">
-<!-- Novell staff change this as you wish -->
-   <authorgroup>
-     <author role="maintainer">
-       <firstname>Novell, Inc</firstname>
-     </author> 
-   <corpauthor>
-     Novell, Inc
-   </corpauthor>
-   </authorgroup>
-   <date>
-     2002-2009
-   </date>
-   <revhistory>
-     <revision>
-       <revnumber>&appversion;</revnumber>
-       <date>September 2009</date>
-       <revdescription>
-	 <para role="author">Akhil Laddha</para>
-	 <para role="publisher">Novell, Inc</para>
-       </revdescription>
-     </revision>
-    <revision>
-     <revnumber>2.28</revnumber>
-     <date>September 2009</date>
-     <revdescription>
-      <para role="author">Radhika PC</para>
-      <para role="publisher">Novell, Inc</para>
-     </revdescription>
-    </revision>
-     <revision>
-       <revnumber>2.26</revnumber>
-       <date>March 2009</date>
-       <revdescription>
-	 <para role="author">Radhika PC</para>
-	 <para role="publisher">Novell, Inc</para>
-       </revdescription>
-     </revision>
-     <revision>
-       <revnumber>2.12</revnumber>
-       <date>September 2007</date>
-       <revdescription>
-	 <para role="author">Radhika PC</para>
-	 <para role="publisher">Novell, Inc</para>
-       </revdescription>
-     </revision>
-     <revision>
-       <revnumber>2.10</revnumber>
-       <date>November 20, 2006</date>
-       <revdescription>
-	 <para role="author">Francisco Serrador</para>
-	 <para role="publisher">Novell, Inc</para>
-       </revdescription>
-     </revision>
-     <revision>
-       <revnumber>2.8</revnumber>
-       <date>October 5, 2006</date>	 
-       <revdescription>
-	 <para role="author">Radhika PC</para>
-	 <para role="publisher">Novell, Inc</para>
-       </revdescription>
-     </revision>
-   </revhistory>
-
-   <releaseinfo>
-     This manual describes version &appversion; of Evolution 
-   </releaseinfo>
-   <abstract role="description">
-     <para>
-       A user's guide to Evolution which explains how to use
-       its mail, calendar, address book, and task list features.
-     </para>
-   </abstract>
-   <productname class="trade">&appname;</productname>
-   <productnumber>&appversion;</productnumber>
-   <invpartnumber>February 2008</invpartnumber>
-   <title>&appname; &appversion; User Guide</title>
- </bookinfo>
-
-
- <preface id="preface">
-  <title>About This Guide</title>
-  <para>This guide describes how to use and manage <trademark>Evolution</trademark> &appversion; client software. This guide is intended for users and is divided into the following sections:</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="usage-mainwindow">Getting Started</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail">Sending and Receiving Email</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail-organize">Organizing Your Email</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-contact">Evolution Contacts: the Address Book</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-calendar">Evolution Calendar</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-exchange">Connecting to Exchange Servers</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-groupwise">Connecting to GroupWise</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="config-prefs">Advanced Configuration</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="config-sync">Synchronizing Your Handheld Device</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="outlook-migration">Migration from Outlook to Evolution</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="menuref">Quick Reference</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bugs">Known Bugs and Limitations</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="authors">Authors</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="apx-gloss">Glossary</link></para>
-   </listitem>
-  </itemizedlist>
-  <formalpara id="b17q8uz1">
-   <title>Documentation Conventions:</title>
-   <para>In Novell documentation, a greater-than symbol (&gt;) is used to separate actions within a step and items in a cross-reference path. A trademark symbol (<trademark class="registered"/>, <trademark/>, etc.) denotes a Novell trademark. An asterisk (*) denotes a third-party trademark.</para>
-  </formalpara>
- </preface>
-
- <chapter id="usage-mainwindow">
-  <title>Getting Started</title>
-  <para><trademark>Evolution</trademark> is a <link linkend="groupware">groupware</link> application that helps you work in a group by handling email, address, memos, tasks, and one or more calendars. This makes the tasks of storing, organizing, and retrieving your personal information easy, so you can work and communicate effectively with others.</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="ui-intro">Using Evolution: An Overview</link></para>
-   </listitem>
-  </itemizedlist>
-
-  <section id="usage-mainwindow-starting">
-   <title>Starting Evolution for the First Time</title>
-   <orderedlist>
-    <listitem id="bs4u1a6">
-     <para>Start the Evolution client.</para>
-     <informaltable>
-      <tgroup cols="2">
-       <colspec colwidth="1.219*" colname="1" colnum="1"/>
-       <colspec colwidth="4.188*" colname="2" colnum="2"/>
-       <tbody valign="top">
-        <row id="bsptywf">
-         <entry colname="1">
-          <para>GNOME:</para>
-         </entry>
-         <entry colname="2">
-          <para>Click Applications &gt; Office &gt; Evolution.</para>
-         </entry>
-        </row>
-        <row id="bsptywg">
-         <entry colname="1">
-          <para>KDE:</para>
-         </entry>
-         <entry colname="2">
-          <para>Click the K menu &gt; Office &gt; More Programs &gt; Evolution.</para>
-         </entry>
-        </row>
-        <row id="bsptywh">
-         <entry colname="1">
-          <para>Command Line:</para>
-         </entry>
-         <entry colname="2">
-          <para>Enter <command>evolution</command>.</para>
-         </entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-    </listitem>
-   </orderedlist>
-
-   <section id="bse54o0">
-    <title>Using the First-Run Assistant</title>
-    <para>The first time you run Evolution, it creates a directory named <emphasis>.evolution</emphasis> in your home directory, where it stores all of its local data. Then, it opens a First-Run Assistant to help you set up email accounts and import data from other applications.</para>
-    <para>Using the first-run assistant takes two to five minutes.</para>
-    <para>Later on, if you want to change this account, or if you want to create a new one, click Edit &gt; Preferences, then click Mail Accounts. Select the account you want to change, then click Edit. Alternately, add a new account by clicking Add. See <link linkend="config-prefs-mail">Mail Preferences</link> for details.</para>
-    <para>The First-Run Assistant helps you provide the information Evolution needs to get started.</para>
-    <itemizedlist>
-     <listitem>
-      <para><link linkend="first-step">Defining Your Identity</link></para>
-     </listitem>
-     <listitem>
-      <para><link linkend="second-step">Receiving Mail</link></para>
-     </listitem>
-     <listitem>
-      <para><link linkend="more-mail-options">Receiving Mail Options</link></para>
-     </listitem>
-     <listitem>
-      <para><link linkend="third-step">Sending Mail</link></para>
-     </listitem>
-     <listitem>
-      <para><link linkend="bsti1ty">Account Management</link></para>
-     </listitem>
-     <listitem>
-      <para><link linkend="step-three-b">Time Zone</link></para>
-     </listitem>
-    </itemizedlist>
-
-    <section id="first-step">
-     <title>Defining Your Identity</title>
-     <para>The Identity window is the first step in the assistant.</para>
-     <para>Here, you enter some basic personal information. You can define multiple identities later by clicking Edit &gt; Preferences, then clicking Mail Accounts.</para>
-     <para>When the First-Run Assistant starts, the Welcome page is displayed. Click Forward to proceed to the Identity window.</para>
-     <orderedlist>
-      <listitem id="bstfhex">
-       <para>Type your full name in the Full Name field.</para>
-      </listitem>
-      <listitem id="bstfipr">
-       <para>Type your email address in the Email Address field.</para>
-      </listitem>
-      <listitem id="bstfj3i">
-       <para>(Optional) Select if this account is your default account.</para>
-      </listitem>
-      <listitem id="bstfjgc">
-       <para>(Optional) Type a reply to address in the Reply-To field.</para>
-       <para>Use this field if you want replies to messages sent to a different address.</para>
-      </listitem>
-      <listitem id="bstfkcz">
-       <para>(Optional) Type your organization name in the Organization field.</para>
-       <para>This is the company where you work, or the organization you represent when you send email.</para>
-      </listitem>
-      <listitem id="bstfl19">
-       <para>Click Forward.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-
-    <section id="second-step">
-     <title>Receiving Mail</title>
-     <para>The Receiving Email option lets you determine where you get your email.</para>
-     <para>You need to specify the type of server you want to receive mail with. If you are unsure about the type of server to choose, ask your system administrator or ISP.</para>
-     <orderedlist>
-      <listitem id="bstflia">
-       <para>Select a server type in the Server Type list.</para>
-       <para>The following is a list of server types that are available:</para>
-       <formalpara id="bsj74dr">
-        <title>Novell GroupWise:</title>
-        <para>Select this option if you connect to a Novell <trademark class="registered">GroupWise</trademark> server.</para>
-       </formalpara>
-        <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
-       <formalpara id="bsj74ds">
-        <title>Microsoft Exchange:</title>
-        <para>Available only if the evolution-exchange package is installed. Select this option if you connect to a Microsoft Exchange 2000 or 2003 server.</para>
-       </formalpara>
-        <para>Email, calendar, and contact information are stored on the server.</para>
-        <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
-       <formalpara id="mapi">
-        <title>MAPI Exchange:</title>
-        <para>Available only if you have installed the evolution-mapi package and if the Exchange MAPI plugin from the Edit &gt; Plugins menu is enabled. It allows you to connect to a Microsoft Exchange 2007 server.</para>
-       </formalpara>
-       <para>Email, calendar, and contact information are stored on the server.</para>
-       <formalpara id="bsj74dt">
-        <title>IMAP:</title>
-        <para>Keeps the email on your server so you can access your email from multiple systems.</para>
-       </formalpara>
-       <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
-       <formalpara id="bsj74du">
-        <title>POP:</title>
-        <para>Downloads your email to your hard disk for permanent storage, freeing up space on the email server.</para>
-       </formalpara>
-       <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
-       <formalpara id="bstgdhu">
-        <title>USENET News:</title>
-        <para>Connects to a news server and downloads a list of available news digests.</para>
-       </formalpara>
-       <para>For configuration instructions, see <link linkend="bstfw13">Remote Configuration Options</link>.</para>
-       <formalpara id="bsj74dv">
-        <title>Local Delivery:</title>
-        <para>Choose this option if you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the Standard Unix Mbox Spool option instead.</para>
-       </formalpara>
-       <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
-       <formalpara id="bsj74dw">
-        <title>MH Format Mail Directories:</title>
-        <para>If you download your email using MH or another MH-style program, you should use this option.</para>
-       </formalpara>
-       <para>You need to provide the path to the mail directory you want to use.</para>
-       <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
-       <formalpara id="bsj74dx">
-        <title>Maildir Format Mail Directories:</title>
-        <para>If you download your email using Qmail or another Maildir-style program, you should use this option.</para>
-       </formalpara>
-       <para>You need to provide the path to the mail directory you want to use.</para>
-       <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
-       <formalpara id="bsj74dy">
-        <title>Standard Unix mbox Spool File:</title>
-        <para>If you want to read and store email in the mail spool file on your local system, choose this option. You need to provide the path to the mail spool file you want to use.</para>
-       </formalpara>
-       <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
-       <formalpara id="b185ajx5">
-        <title>Standard Unix mbox Spool Directory:</title>
-        <para>If you want to read and store email in the mail spool directory on your local system, choose this option. You need to provide the path to the mail spool directory you want to use.</para>
-       </formalpara>
-       <para>For configuration instructions, see <link linkend="bstgbqn">Local Configuration Options</link>.</para>
-       <formalpara id="bsj74dz">
-        <title>None:</title>
-        <para>Select this if you do not plan to check email with this account. If you select this, there are no configuration options.</para>
-       </formalpara>
-      </listitem>
-     </orderedlist>
-
-     <section id="bstfw13">
-      <title>Remote Configuration Options</title>
-      <para>If you selected Novell GroupWise, IMAP, POP, or USENET News as your server, you need to specify additional information.</para>
-      <orderedlist>
-       <listitem id="bstg8f2">
-        <para>Type the server name of your email server in the Server field.</para>
-        <para>If you are unsure what your server address is, contact your system administrator.</para>
-       </listitem>
-       <listitem id="bstg8sr">
-        <para>Type your username in the Username field.</para>
-       </listitem>
-       <listitem id="bstg8yn">
-        <para>Select if you want to use a secure connection (SSL or TLS).</para>
-        <para>You should enable this option if your server supports it.</para>
-        <para>Free webmail providers usually supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</para>
-       </listitem>
-       <listitem id="bstg9rc">
-        <para>Select your authentication type in the Authentication list.</para>
-        <para>or</para>
-        <para>Click Check for Supported Types to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</para>
-        <para>Free webmail providers usually supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</para>
-       </listitem>
-       <listitem id="bstgaxb">
-        <para>Select if you want Evolution to remember your password.</para>
-       </listitem>
-       <listitem id="bstgb80">
-        <para>Click Forward.</para>
-       </listitem>
-      </orderedlist>
-      <para>(Conditional) If you chose Microsoft Exchange as the server type, provide your username in the Username field and your Outlook Web Access (OWA) URL in the OWA URL field. The URL and the usernames should use the Outlook format. If the mailbox path is different from the username, the OWA path should also include mailbox path, for example http://<varname>server name</varname>/exchange/<varname>mail box path</varname>.</para>
-      <para>When you have finished, continue with <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
-     </section>
-
-     <section id="bstgbqn">
-      <title>Local Configuration Options</title>
-      <para>If you selected Local Delivery, MH-Format Mail Directories, Maildir-Format Mail Directories, Standard Unix mbox spool file or Standard Unix mbox spool directory, you must specify the path to the local files in the path field. Continue with <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
-     </section>
-    </section>
-
-    <section id="more-mail-options">
-     <title>Receiving Mail Options</title>
-     <para>After you have selected a mail delivery mechanism, you can set some preferences for its behavior.</para>
-     <itemizedlist>
-      <listitem>
-       <para><link linkend="bsthktw">Novell GroupWise Receiving Options</link></para>
-      </listitem>
-      <listitem>
-       <para><link linkend="bstgjve">Microsoft Exchange Receiving Options</link></para>
-      </listitem>
-      <listitem>
-       <para><link linkend="bstggh0">IMAP Receiving Options</link></para>
-      </listitem>
-      <listitem>
-       <para><link linkend="bspcfg3">POP Receiving Options</link></para>
-      </listitem>
-      <listitem>
-       <para><link linkend="bsthqql">USENET News Receiving Options</link></para>
-      </listitem>
-      <listitem>
-       <para><link linkend="bsthseo">Local Delivery Receiving Options</link></para>
-      </listitem>
-      <listitem>
-       <para><link linkend="bsthszn">MH-Format Mail Directories Receiving Options</link></para>
-      </listitem>
-      <listitem>
-       <para><link linkend="bsthu34">Maildir-Format Mail Directories Receiving Options</link></para>
-      </listitem>
-      <listitem>
-       <para><link linkend="bsthukq">Standard Unix mbox spool file Receiving Options</link></para>
-      </listitem>
-     </itemizedlist>
-
-     <section id="bsthktw">
-      <title>Novell GroupWise Receiving Options</title>
-      <para>You need to specify the following options for this server type:</para>
-      <orderedlist>
-       <listitem id="bv7wblf">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="bsthlfd">
-        <para>Select if you want to check for new messages in all folders.</para>
-       </listitem>
-       <listitem id="bsthlol">
-        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
-        <para>For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
-       </listitem>
-       <listitem id="bsthlvl">
-        <para>Select if you want to check new messages for junk content.</para>
-        <para>For additional information on junk content, see <link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link> and <link linkend="mail-prefs-junk">Junk</link>.</para>
-       </listitem>
-       <listitem id="bsthm9q">
-        <para>Select if you want to only check for junk messages in the Inbox folder.</para>
-       </listitem>
-       <listitem id="bsthmhx">
-        <para>Select Automatically synchronize remote mail locally to download the messages to your local system.</para>
-        <para>Evolution, by default, downloads only the header information such as From, Subject, and Date. The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive.</para>
-        <para>If you check this option, Evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition, you can download the mail for reading them offline, when you have checked this option.</para>
-       </listitem>
-       <listitem id="bsthnab">
-        <para>Type your Post Office Agent SOAP port in the Post Office Agent SOAP Port field.</para>
-        <para>If you are unsure what your Post Office Agent SOAP port is, contact your system administrator.</para>
-       </listitem>
-       <listitem id="bstho1w">
-        <para>Click Forward.</para>
-        <mediaobject id="b13sbacj"><imageobject><imagedata format="PNG" fileref="figures/evo_gwreceive_a.png"/></imageobject></mediaobject>
-        
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-
-     <section id="bstgjve">
-      <title>Microsoft Exchange Receiving Options</title>
-      <para>You need to specify the following options for this server type:</para>
-      <orderedlist>
-       <listitem id="bstgk36">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="b15fwsm1">
-        <para>Select if you want to check for new messages in all folders.</para>
-       </listitem>
-       <listitem id="bstgkvm">
-        <para>Specify the Global Catalog server name in the Global Catalog Server Name field.</para>
-        <para>The Global Catalog Server contains the user information for users. If you are unsure what your Global Catalog server name is, contact your system administrator.</para>
-       </listitem>
-       <listitem id="bstglhn">
-        <para>Select if you want to limit the number of Global Address List (GAL) responses.</para>
-        <para>The GAL contains a list of all email addresses. If you select this option, you need to specify the maximum number of responses.</para>
-       </listitem>
-       <listitem id="bstgsrp">
-        <para>Select if you want to use a password expiry warning time period.</para>
-        <para>If you select this option, you need to specify how often Evolution should send the password expire message.</para>
-       </listitem>
-       <listitem id="bv6uqm7">
-        <para>Select Automatically synchronize remote mail locally to download the messages to your local system.</para>
-       </listitem>
-       <listitem id="b13sbpg5">
-        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
-       </listitem>
-       <listitem id="b13sbqmb">
-        <para>Select if you want to check new messages for junk content.</para>
-        <para>For additional information on junk content, see <link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link> and <link linkend="mail-prefs-junk">Junk</link>.</para>
-       </listitem>
-       <listitem id="bstgtoj">
-        <para>Click Forward.</para>
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-
-     <section id="exchange_mapi">
-      <title>Exchange MAPI Receiving Options</title>
-      <para>If you select Microsoft Exchange MAPI as your receiving server type, you need to specify the following options:</para>
-      <orderedlist>
-       <listitem id="step_1">
-        <para>Select the desired options as given in the following table, then click Forward.</para>
-        <informaltable>
-         <tgroup cols="2">
-          <colspec colwidth="2.844*" colname="1" colnum="1"/>
-          <colspec colwidth="2.844*" colname="2" colnum="2"/>
-          <thead valign="top">
-           <row id="raw1">
-            <entry colname="1">
-             <para>Options</para>
-            </entry>
-            <entry colname="2">
-             <para>Description</para>
-            </entry>
-           </row>
-          </thead>
-          <tbody valign="top">
-           <row id="raw2">
-            <entry colname="1">
-             <para>Check for new messages every x minutes</para>
-            </entry>
-            <entry colname="2">
-             <para>Select this option if you want Evolution to automatically check for new mail. If you select this option, you need to specify how often Evolution should check for new messages.</para>
-            </entry>
-           </row>
-           <row id="raw3">
-            <entry colname="1">
-             <para>Check for new messages in all folders</para>
-            </entry>
-            <entry colname="2">
-             <para>Select if you want to check for new messages in all folders.</para>
-            </entry>
-           </row>
-           <row id="raw4">
-            <entry colname="1">
-             <para>Global Catalog server name</para>
-            </entry>
-            <entry colname="2">
-             <para>Specify the Global Catalog server name in the Global Catalog Server Name field.</para>
-             <para>The Global Catalog Server contains the user information for users. If you are unsure what your Global Catalog server name is, contact your system administrator.</para>
-            </entry>
-           </row>
-           <row id="raw5">
-            <entry colname="1">
-             <para>Limit number of GAL responses</para>
-            </entry>
-            <entry colname="2">
-             <para>Select if you want to limit the number of Global Address List (GAL) responses.</para>
-             <para>The GAL contains a list of all email addresses. If you select this option, you need to specify the maximum number of responses.</para>
-            </entry>
-           </row>
-           <row id="raw6">
-            <entry colname="1">
-             <para>Automatically synchronize account locally</para>
-            </entry>
-            <entry colname="2">
-             <para>Select Automatically synchronize remote mail locally to download the messages to your local system.</para>
-            </entry>
-           </row>
-           <row id="raw7">
-            <entry colname="1">
-             <para>Apply filters to new messages in Inbox on this server</para>
-            </entry>
-            <entry colname="2">
-             <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
-            </entry>
-           </row>
-           <row id="raw8">
-            <entry colname="1">
-             <para>Check new messages for Junk contents</para>
-            </entry>
-            <entry colname="2">
-             <para>Select if you want to check new messages for junk content.</para>
-             <para>For additional information on junk content, see <link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link> and <link linkend="mail-prefs-junk">Junk</link>.</para>
-            </entry>
-           </row>
-          </tbody>
-         </tgroup>
-        </informaltable>
-        <mediaobject id="evo_mapi"><imageobject><imagedata format="PNG" fileref="figures/evo_exchng_mapi.png"/></imageobject></mediaobject>
-       </listitem>
-       <listitem id="step_2">
-        <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-       </listitem>
-      </orderedlist>
-     </section>
-
-     <section id="bstggh0">
-      <title>IMAP Receiving Options</title>
-      <para>You need to specify the following options for this server type:</para>
-      <mediaobject id="bsu2dp4"><imageobject><imagedata format="PNG" fileref="figures/evo_imapreceive_a.png"/></imageobject></mediaobject>
-      <orderedlist>
-       <listitem id="bstggly">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="bstgh57">
-        <para>Select if you want Evolution to use custom commands to connect to the IMAP server.</para>
-        <para>If you select this option, specify the custom command you want Evolution to use.</para>
-       </listitem>
-       <listitem id="bstgi0r">
-        <para>Select if you want Evolution to show only subscribed folders.</para>
-        <para>Subscribed folders are folders that you have chosen to receive mail from by subscribing to them.</para>
-       </listitem>
-       <listitem id="bstgi8n">
-        <para>Select if you want Evolution to override server-supplied folder namespaces.</para>
-        <para>By choosing this option you can rename the folders that the server provides. If you select this option, you need to specify the namespace to use.</para>
-       </listitem>
-       <listitem id="bstgip8">
-        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
-        <para>For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
-       </listitem>
-       <listitem id="bstgiv6">
-        <para>Select if you want to check new messages for junk content.</para>
-        <para>For additional information on junk content, see <link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link> and <link linkend="mail-prefs-junk">Junk</link>.</para>
-       </listitem>
-       <listitem id="bstgj0g">
-        <para>Select if you want to check for junk messages in the Inbox folder.</para>
-       </listitem>
-       <listitem id="bstgje2">
-        <para>Select Automatically synchronize remote mail locally to download the messages to your local system.</para>
-        <para>Evolution, by default, downloads only the header information such as From, Subject, and Date. The body of the message and the attachments are downloaded only when you click the message. Thus you can save time and network usage. This is useful when you don't read all the messages you receive.</para>
-        <para>If you check this option, Evolution fetches the headers as well as the body of the message simultaneously. In this case, the time taken to open a message is comparatively less. In addition, you can download the mail for reading them offline, when you have checked this option.</para>
-       </listitem>
-       <listitem id="bstgjlq">
-        <para>Click Forward.</para>
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-
-     <section id="bspcfg3">
-      <title>POP Receiving Options</title>
-      <mediaobject id="bsu2e8x"><imageobject><imagedata format="PNG" fileref="figures/evo_popreceive_a.png"/></imageobject></mediaobject>
-      <para>You need to specify the following options for this server type:</para>
-      <orderedlist>
-       <listitem id="bsthozk">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="bsthpck">
-        <para>Select if you want to leave messages on the server.</para>
-       </listitem>
-       <listitem id="bsthpn9">
-        <para>Select if you want to disable support for all <ulink url="http://www.ietf.org/rfc/rfc2449.txt">POP3 extensions</ulink>.</para>
-       </listitem>
-       <listitem id="bsthpur">
-        <para>Click Forward.</para>
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-
-     <section id="bsthqql">
-      <title>USENET News Receiving Options</title>
-      <mediaobject id="bsu2evz"><imageobject><imagedata format="PNG" fileref="figures/evo_usereceive_a.png"/></imageobject></mediaobject>
-      <para>You need to specify the following options for this server type:</para>
-      <orderedlist>
-       <listitem id="bsthqws">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="bsthr47">
-        <para>Select if you want to show folders in short notation.</para>
-        <para>For example, comp.os.linux would appear as c.o.linux.</para>
-       </listitem>
-       <listitem id="bsthr8t">
-        <para>Select if you want to show relative folder names in the subscription dialog box.</para>
-        <para>If you select to show relative folder names in the subscription page, only the name of the folder is displayed. For example the folder evolution.mail would appear as evolution.</para>
-       </listitem>
-       <listitem id="bsthrut">
-        <para>Click Forward.</para>
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-
-     <section id="bsthseo">
-      <title>Local Delivery Receiving Options</title>
-      <para>You need to specify the following options for this server type:</para>
-      <orderedlist>
-       <listitem id="bsthsnr">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="bsthsv1">
-        <para>Click Forward.</para>
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-
-     <section id="bsthszn">
-      <title>MH-Format Mail Directories Receiving Options</title>
-      <para>You need to specify the following options for this server type:</para>
-      <orderedlist>
-       <listitem id="bsthtg0">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="bsthth2">
-        <para>Select if you want to use the <emphasis>.folders</emphasis> summary file.</para>
-       </listitem>
-       <listitem id="bsthtwt">
-        <para>Click Forward.</para>
-        <mediaobject id="bsu2gk6"><imageobject><imagedata format="PNG" fileref="figures/evo_mhreceive_a.png"/></imageobject></mediaobject>
-        
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-
-     <section id="bsthu34">
-      <title>Maildir-Format Mail Directories Receiving Options</title>
-      <para>You need to specify the following options for this server type:</para>
-      <orderedlist>
-       <listitem id="bsthu9o">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="bsthuah">
-        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
-        <para>For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
-       </listitem>
-       <listitem id="bsthuhd">
-        <para>Click Forward.</para>
-        <mediaobject id="bsu2had"><imageobject><imagedata format="PNG" fileref="figures/evo_maildirreceive_a.png"/></imageobject></mediaobject>
-        
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-
-     <section id="bsthukq">
-      <title>Standard Unix mbox Spool File Receiving Options</title>
-      <orderedlist>
-       <listitem id="bsthuto">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="bsthuv9">
-        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
-       </listitem>
-       <listitem id="bsthv0m">
-        <para>Select if you want to store status headers in Elm, Pine, and Mutt formats.</para>
-       </listitem>
-       <listitem id="bsthv90">
-        <para>Click Forward.</para>
-        <mediaobject id="bsu2i12"><imageobject><imagedata format="PNG" fileref="figures/evo_mboxreceive_a.png"/></imageobject></mediaobject>
-        
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-
-     <section id="b185akx6">
-      <title>Standard Unix mbox Spool Directory Receiving Options</title>
-      <para>You need to specify the following options for this server type:</para>
-      <orderedlist>
-       <listitem id="b185aln9">
-        <para>Select if you want Evolution to automatically check for new mail.</para>
-        <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-       </listitem>
-       <listitem id="b185alna">
-        <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
-       </listitem>
-       <listitem id="b185alnb">
-        <para>Select if you want to store status headers in Elm, Pine, and Mutt formats.</para>
-       </listitem>
-       <listitem id="b185alnc">
-        <para>Click Forward.</para>
-        <mediaobject id="b185alnd"><imageobject><imagedata format="PNG" fileref="figures/evo_mboxreceive_a.png"/></imageobject></mediaobject>
-        
-       </listitem>
-      </orderedlist>
-      <para>When you have finished, continue with <link linkend="third-step">Sending Mail</link>.</para>
-     </section>
-    </section>
-
-    <section id="third-step">
-     <title>Sending Mail</title>
-     <para>Now that you have entered information about how you plan to get mail, Evolution needs to know about how you want to send it.</para>
-     <orderedlist>
-      <listitem id="bsthwcj">
-       <para>Select a server type from the Server Type list.</para>
-       <para>The following server types are available:</para>
-       <formalpara id="bsj6zap">
-        <title>Sendmail:</title>
-        <para>Uses the Sendmail program to send mail from your system. Sendmail is more flexible, but is not as easy to configure, so you should select this option only if you know how to set up a Sendmail service.</para>
-       </formalpara>
-       <formalpara id="bsj6zao">
-        <title>SMTP:</title>
-        <para>Sends mail using an outbound mail server. This is the most common choice for sending mail. If you choose SMTP, there are additional configuration options. See <link linkend="bsthwzo">SMTP Configuration</link> for more information.</para>
-       </formalpara>
-      </listitem>
-     </orderedlist>
-
-     <section id="bsthwzo">
-      <title>SMTP Configuration</title>
-      <mediaobject id="bsj8ujq"><imageobject><imagedata format="PNG" fileref="figures/evo_send_setup_a.png"/></imageobject></mediaobject>
-      <orderedlist>
-       <listitem id="bsthxta">
-        <para>Type the server name of your email server in the Server field.</para>
-        <para>If you are unsure what your server address is, contact your system administrator.</para>
-       </listitem>
-       <listitem id="bsthy6f">
-        <para>Select if your server requires authentication.</para>
-        <para>If you selected that your server requires authentication, you need to provide the following information:</para>
-        <orderedlist>
-         <listitem id="bsw0acl">
-          <para>Select your authentication type in the Authentication list.</para>
-          <para>or</para>
-          <para>Click Check for Supported Types to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</para>
-         </listitem>
-         <listitem id="bsw0aqr">
-          <para>Type your username in the Username field.</para>
-         </listitem>
-         <listitem id="bsw0ato">
-          <para>Select if you want Evolution to remember your password.</para>
-         </listitem>
-        </orderedlist>
-       </listitem>
-       <listitem id="bsthypm">
-        <para>Select if you want to use a secure connection (SSL or TLS).</para>
-       </listitem>
-       <listitem id="bsti1a0">
-        <para>Click Forward.</para>
-       </listitem>
-      </orderedlist>
-      <para>Continue with <link linkend="bsti1ty">Account Management</link>.</para>
-     </section>
-    </section>
-
-    <section id="bsti1ty">
-     <title>Account Management</title>
-     <para>Now that you have finished the email configuration process you need to give the account a name. The name can be any name you prefer. Type your account name on the Name field, then click Forward.</para>
-     <para>Continue with <link linkend="step-three-b">Time Zone</link><link linkend="step-three-b"/>.</para>
-    </section>
-
-    <section id="step-three-b">
-     <title>Time Zone</title>
-     <orderedlist>
-      <listitem id="b10fn8ch">
-       <para>Select your time zone on the map.</para>
-       <para>or</para>
-       <para>Select from the time zone drop-down list.</para>
-        
-      </listitem>
-      <listitem id="b10fn8up">
-       <para>Click OK, then click Apply.</para>
-       <para>Evolution opens with your new account created.</para>
-      </listitem>
-     </orderedlist>
-     <para>If you want to import email from another email client, continue with <link linkend="fourth-step">Importing Mail (Optional)</link>. If not, skip to <link linkend="ui-intro">Using Evolution: An Overview</link>.</para>
-    </section>
-
-    <section id="fourth-step">
-     <title>Importing Mail (Optional)</title>
-     <para>After selecting your time zone, if Evolution finds email or address files from another application, it offers to import them. For a full description of the import feature, see <link linkend="importing-mail">Importing Single Files</link>.</para>
-     <para>Microsoft Outlook&z-3rdParty; and versions of Outlook Express after version 4 use proprietary formats that Evolution cannot read or import.</para>
-     <para>To import information, you might want to use the Export tool under Windows&z-3rdParty;. See the instructions in <link linkend="outlook-migration-mail">Migrating Local Outlook Mail Folders</link>.</para>
-     <para>Before importing email from Netscape&z-3rdParty;, Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports and undeletes the messages in your Trash folders.</para>
-     <tip>
-      <para>Evolution uses standard file types for email and calendar information, so you can copy those files from your <command>~/.evolution</command> directory. The file formats used are <emphasis>mbox</emphasis> for email and <emphasis>iCal</emphasis> for calendar information.</para>
-      <para>Contacts files are stored in a database, but can be saved as a standard vCard&z-3rdParty;. To export an address book, click File &gt; Save Address Book As VCard". If you want to export only one contact, click File &gt; Save Contact as VCard.</para>
-     </tip>
-    </section>
-   </section>
-  </section>
-
-  <section id="ui-intro">
-   <title>Using Evolution: An Overview</title>
-   <para>Now that the first-run configuration has finished, you're ready to begin using Evolution. Here's a quick explanation of what's happening in your main Evolution window.</para>
-   <mediaobject id="b159qfov"><imageobject><imagedata format="PNG" fileref="figures/evo_mail_callout_a.png"/></imageobject></mediaobject>
-   <formalpara id="b17s9kwg">
-    <title>Menu Bar:</title>
-    <para>The menu bar gives you access to most Evolution features. For additional information, see <link linkend="usage-mainwindow-menubar">The Menu Bar</link>.</para>
-   </formalpara>
-   <formalpara id="b17s9n8w">
-    <title>Folder List:</title>
-    <para>The folder list gives you a list of the available folders for each account. To see the contents of a folder, click the folder name and the contents are displayed in the message list.</para>
-   </formalpara>
-   <formalpara id="b17s9nvy">
-    <title>Toolbar:</title>
-    <para>The toolbar gives you fast and easy access to the frequently used features in each component.</para>
-   </formalpara>
-   <formalpara id="b17s9o2z">
-    <title>Search Tool:</title>
-    <para>The search tool lets you search your email, contacts, calendar, and tasks to easily find what you're looking for.</para>
-   </formalpara>
-   <formalpara id="b17s9o9p">
-    <title>Message List:</title>
-    <para>The message list displays all the read and unread messages that you have. To view an email in the preview pane, click the message in the message list.</para>
-   </formalpara>
-   <formalpara id="b17s9of0">
-    <title>Side Bar:</title>
-    <para>The side bar lets you switch between folders and between Evolution tools. At the bottom of the side bar is the switcher that lets you switch Evolution tools, and above that is a list of all the available folders for the current tool. For additional information, see <link linkend="usage-mainwindow-shortcutbar">The Side Bar</link>.</para>
-   </formalpara>
-   <formalpara id="b17xycio">
-    <title>Switcher:</title>
-    <para>The switcher at the bottom of the side bar lets you switch between the Evolution tools - Mail, Contacts, Calendars, Memos and Tasks.</para>
-   </formalpara>
-   <formalpara id="b17s9ol7">
-    <title>Status Bar:</title>
-    <para>The status bar periodically displays a message, or tells you the progress of a task. This most often happens when you're checking or sending email. These progress queues are shown in the previous figure. The Online/Offline indicator is here, too, in the lower left of the window.</para>
-   </formalpara>
-   <formalpara id="b17s9or8">
-    <title>Preview Pane:</title>
-    <para>The preview pane displays the message that is currently chosen in the message list.</para>
-   </formalpara>
-
-   <section id="usage-mainwindow-menubar">
-    <title>The Menu Bar</title>
-    <para>The menu bar's contents always provide all the possible actions for any given view of your data. If you're looking at your Inbox, most of the menu items relate to email. Some content relates to other components of Evolution and some, especially in the File menu, relates to the application as a whole.</para>
-    <formalpara id="bs7g1fu">
-     <title>File:</title>
-     <para>Anything related to a file or to the operations of the application is listed in this menu, such as creating things, saving them to disk, printing them, and quitting the program itself.</para>
-    </formalpara>
-    <formalpara id="bs7g25f">
-     <title>Edit:</title>
-     <para>Holds useful tools that help you edit text and move it around. Also lets you access the settings and configuration options.</para>
-    </formalpara>
-    <formalpara id="bs7g2ew">
-     <title>View:</title>
-     <para>Lets you decide how Evolution should look. Some of the features control the appearance of Evolution as a whole, and others the way a particular kind of information appears.</para>
-    </formalpara>
-    <formalpara id="bxmejss">
-     <title>Folder:</title>
-     <para>Holds actions that can be performed on folders. You can find things like copy, rename, delete, and so on.</para>
-    </formalpara>
-    <formalpara id="bs7g2jk">
-     <title>Message:</title>
-     <para>Holds actions that can be applied to a message. If there is only one target for the action, such as replying to a message, you can normally find it in the Message menu.</para>
-    </formalpara>
-    <formalpara id="bs7g3bu">
-     <title>Search:</title>
-     <para>Lets you search for messages, or for phrases within a message. You can also see previous searches you have made. In addition to the Search menu, there is a text entry box in the toolbar that you can use to search for messages. You can also create a search folder from a search.</para>
-    </formalpara>
-    <formalpara id="bs7g3gq">
-     <title>Help:</title>
-     <para>Opens the Evolution help files.</para>
-    </formalpara>
-   </section>
-
-   <section id="usage-mainwindow-shortcutbar">
-    <title>The Sidebar</title>
-    <para>The Sidebar is the vertical panel on the left side of the Evolution main window. At the bottom of the Sidebar is the Switcher. This lets you switch between different Evolution tools like Mail, Memo, Tasks, and Contacts. Above the Switcher is a list of folders related to the current Evolution tool.</para>
-    <para>The folder list organizes your email, calendars, address books, task lists and memo lists in a tree, similar to a <link linkend="filetree">file tree</link>. Most people find one to four folders at the base of the tree, depending on the tool and their system configuration. Each Evolution tool has at least one folder, called On This Computer, for local information. For example, the folder list for the email tool shows any remote email storage you have set up, plus local folders and search folders, which are discussed in <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>.</para>
-    <para>If you get large amounts of email, you might want more folders than just your Inbox. You can also create multiple calendar, task, or contacts folders.</para>
-    <para>To create a new folder:</para>
-    <orderedlist>
-     <listitem id="bs7fael">
-      <para>Click Folder &gt; New.</para>
-     </listitem>
-     <listitem id="bs7faof">
-      <para>Type the name of the folder in the Folder Name field.</para>
-     </listitem>
-     <listitem id="bs7faud">
-      <para>Select the location of the new folder.</para>
-     </listitem>
-     <listitem id="bspunvq">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-
-    <section id="b17s9pb0">
-     <title>Changing Switcher Appearance:</title>
-     <para>To change the appearance of your switcher click <emphasis>View &gt; Switcher Appearance</emphasis> from the Menu Bar. Under Switcher Appearance you can select:</para>
-     <formalpara id="b13cep2o">
-      <title>Icons and Text:</title>
-      <para>Displays buttons with the label and the icon corresponding to it.</para>
-     </formalpara>
-     <formalpara id="b13ceqsq">
-      <title>Icons Only:</title>
-      <para>Shows only the icons.</para>
-     </formalpara>
-     <formalpara id="b13ceqv1">
-      <title>Texts Only:</title>
-      <para> Displays buttons with the label, not the icons.</para>
-     </formalpara>
-     <formalpara id="b13cfibm">
-      <title>Toolbar Style:</title>
-      <para>Shows buttons using the desktop toolbar settings.</para>
-    </formalpara>
-    <formalpara id="b13cfifx">
-     <title>Hide Buttons:</title>
-     <para>This option hides all the shortcut buttons of switcher.</para>
-    </formalpara>
-    </section>
-
-    <section id="subfolders">
-     <title>Folder Management</title>
-     <para>Right-click a folder or subfolder to display a menu with the following options:</para>
-     <formalpara id="bs7fblp">
-      <title>Copy:</title>
-      <para>Copies the folder to a different location. When you select this item, Evolution offers a choice of locations to copy the folder to.</para>
-     </formalpara>
-     <formalpara id="bs7fc7y">
-      <title>Move:</title>
-      <para>Moves the folder to another location. When you select this item, Evolution offers a choice of locations to move the folder to.</para>
-     </formalpara>
-     <formalpara id="bxmemdh">
-      <title>Mark Messages As Read:</title>
-      <para>Marks all the messages in the folder as read.</para>
-     </formalpara>
-     <formalpara id="bs7fcsr">
-      <title>New Folder:</title>
-      <para>Creates another folder in the same location.</para>
-     </formalpara>
-     <formalpara id="bs7fcl4">
-      <title>Delete:</title>
-      <para>Deletes the folder and all its contents.</para>
-     </formalpara>
-     <formalpara id="bs7fd3u">
-      <title>Rename:</title>
-      <para>Lets you change the name of the folder.</para>
-     </formalpara>
-     <formalpara id="bs7fdb9">
-      <title>Disable:</title>
-      <para>Disables the account.</para>
-     </formalpara>
-     <formalpara id="bs7fdja">
-      <title>Properties:</title>
-      <para>Checks the number of total and unread messages in a folder, and, for remote folders, lets you select whether to copy the folder to your local system for offline operation.</para>
-     </formalpara>
-     <para>You can also rearrange folders and messages by dragging and dropping them.</para>
-     <para>Any time new email arrives in a email folder, that folder label is displayed in bold text, along with the number of new messages in that folder.</para>
-    </section>
-   </section>
-
-   <section id="basics-mail">
-    <title>Email</title>
-    <para>Evolution email is like other email programs in several ways:</para>
-    <itemizedlist>
-     <listitem>
-      <para>It can send and receive email in HTML or as plain text, and makes it easy to send and receive multiple file attachments.</para>
-     </listitem>
-     <listitem>
-      <para>It supports multiple email sources, including <link linkend="imap">IMAP</link>, <link linkend="pop">POP3</link>, and local mbox or MH spools and files created by other email programs.</para>
-     </listitem>
-     <listitem>
-      <para>It can sort and organize your email in a wide variety of ways with folders, searches, and filters.</para>
-     </listitem>
-     <listitem>
-      <para>It lets you guard your privacy with encryption.</para>
-     </listitem>
-    </itemizedlist>
-    <para>However, Evolution has some important differences from other email programs. First, it is built to handle very large amounts of email. The <link linkend="usage-mail-organize-spam">junk email</link>, message <link linkend="usage-mail-organize-filters">filtering</link> and <link linkend="usage-mail-organize-search">searching</link> functions were built for speed and efficiency. There's also the <link linkend="usage-mail-organize-vfolders">search folder</link>, an advanced organizational feature not found in some email clients. If you get a lot of email, or if you keep every message you get in case you need to refer to it later, you will find this feature especially useful. Here's a quick explanation of what's happening in your main Evolution email window.</para>
-    <mediaobject id="b159qi3q"><imageobject><imagedata format="PNG" fileref="figures/evo_mail_a.png"/></imageobject></mediaobject>
-    <formalpara id="b17sa4um">
-     <title>Message List:</title>
-     <para>The message list displays all the read and unread messages that you have. To view an email in the preview pane, click the message in the message list.</para>
-    </formalpara>
-    <formalpara id="b17sa500">
-     <title>Preview Pane:</title>
-     <para>The preview pane displays the message that is currently chosen in the message list.</para>
-    </formalpara>
-    <para>If you find the preview pane too small, you can resize the pane, enlarge the whole window, or double-click the message in the message list to have it open in a new window. To change the size of a pane, drag the divider between the two panes.</para>
-    <para>As with folders, you can right-click messages in the message list and get a menu of possible actions, including moving or deleting them, creating filters or search folders based on them, and marking them as junk mail.</para>
-    <para>Most of the email-related actions you want to perform are listed in the Message menu and Folder menu in the menu bar. The most frequently used ones, like Reply and Forward, also appear as buttons in the toolbar. Most of them are also located in the right-click menu and as keyboard shortcuts.</para>
-    <para>For an in-depth guide to the email capabilities of Evolution, read <link linkend="usage-mail">Sending and Receiving Email</link>.</para>
-   </section>
-
-   <section id="basics-calendar">
-    <title>The Calendar</title>
-    <para>To begin using the calendar, click Calendar in the Switcher. By default, the calendar shows today's schedule on a ruled background. At the left bottom, there is a monthly calendar you can use to switch days. At the upper right, there is a task list, where you can keep a list of tasks separate from your calendar appointments. Below that, there is a memo list.</para>
-    <mediaobject id="usage-calendar-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_cal_callout_a.png"/></imageobject></mediaobject>
-    <formalpara id="b17sa5gu">
-     <title>Appointment List:</title>
-     <para>The appointment list displays all your scheduled appointments.</para>
-    </formalpara>
-    <formalpara id="b17sa5lt">
-     <title>Month Pane:</title>
-     <para>The month pane is a small view of a calendar month. To display additional months, drag the column border to the right. You can also select a range of days in the month pane to display a custom range of days in the appointment list.</para>
-    </formalpara>
-    <formalpara id="b17sa5qs">
-     <title>Task List:</title>
-     <para>Tasks are distinct from appointments because they generally don't have times associated with them. You can use the list in a larger window by clicking the Tasks button in the side bar.</para>
-    </formalpara>
-    <para>For more information about the calendar, see <link linkend="usage-calendar">Evolution Calendar</link>.</para>
-   </section>
-
-   <section id="basics-contacts">
-    <title>The Contacts</title>
-    <para>The Evolution contacts can handle all of the functions of an address book or phone book. However, it is easier to update Evolution than it is to change an actual paper book, in part because Evolution can synchronize with Palm OS&z-3rdParty; devices and use <link linkend="ldap">LDAP</link> directories on a network.</para>
-    <para>To use the contacts tool, click Contacts in the Switcher. By default, the display shows all your contacts in alphabetical order, in a minicard view. You can select other views from the View menu, and adjust the width of the columns by clicking and dragging the gray column dividers.</para>
-    <mediaobject id="usage-contact-fig"><imageobject><imagedata format="PNG" fileref="figures/contacts_mainwindow_a.png"/></imageobject></mediaobject>
-    <para>Another advantage of the Evolution contacts is its integration with the rest of the application. For example, you can right-click an email address in Evolution mail to instantly create a contact entry.</para>
-    <para>The largest section of the contacts display shows a list of individual contacts. You can also search the contacts in the same way that you search email folders, using the search tool on the right side of the toolbar.</para>
-    <para>For detailed instructions on how to use the address book, read <link linkend="usage-contact">Evolution Contacts: the Address Book</link>.</para>
-   </section>
-  </section>
-
-  <section id="b17qy921">
-   <title>Backing Up and Restoring Evolution</title>
-   <para>With the Backup and Restore plugin enabled, you can successfully back up Evolution to your machine and restore it whenever it is required. The backup saves your Evolution settings, mail, contacts, tasks, memos, and calendars and creates an archive.</para>
-   <orderedlist>
-    <listitem id="b17qydgx">
-     <para>Select File &gt; Backup Settings to select the folder where you want to save the backup.</para>
-     <para>The backup file to be created will be called evolution-backup.tar.gz.</para>
-     <para>Before the backup process starts a warning will be shown asking you to close Evolution.</para>
-    </listitem>
-    <listitem id="b17qygt2">
-     <para>Select Restart Evolution to restart Evolution immediately after finishing the backup.</para>
-    </listitem>
-    <listitem id="b17qykwp">
-     <para>Click Yes to close Evolution and start the backup.</para>
-    </listitem>
-   </orderedlist>
-
-   <section id="b17qymxs">
-    <title>Restoring Evolution</title>
-    <para>This feature restores your settings from the archive.</para>
-    <orderedlist>
-     <listitem id="b17rbrfm">
-      <para>Select File &gt; Restore Settings to open the available evolution-backup.tar.gz files.</para>
-     </listitem>
-     <listitem id="b17rbry6">
-      <para>Select the file and click Open.</para>
-      <para>Before the process starts, a pop-up window appears and asks you to close Evolution. Close all the windows and then click Restore in the pop-up window.</para>
-      <tip>
-       <para> If you are creating your first account via the Startup Wizard, you can use the option to restore from the archive if it is available locally.</para>
-      </tip>
-      <para>Evolution will auto-restart after the process.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-  </section>
-
-  <section id="bsekq8r">
-   <title>Command Line Options</title>
-   <para>Evolution has a number of command line options that you can use. For more information about command line options, open a terminal window and type <command>evolution --help</command>.</para>
-  </section>
- </chapter>
-
- <chapter id="usage-mail">
-  <title>Sending and Receiving Email</title>
-  <para>This section, and <link linkend="usage-mail-organize">Organizing Your Email</link>, provide you with an in-depth guide to the capabilities of <trademark>Evolution</trademark> as a mail client. For information about how to customize your mail account, see <link linkend="config-prefs-mail">Mail Preferences</link>.</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="usage-mail-getnsend-read">Reading Mail</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail-getnsend-send">Composing New Email Messages</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="b1dlaazl">Templates</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="rsvp-stuff">Sending Invitations by Mail</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail-subscriptions">IMAP Subscriptions Manager</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="encryption">Encryption</link></para>
-   </listitem>
-  </itemizedlist>
-
-  <section id="usage-mail-getnsend-read">
-   <title>Reading Mail</title>
-   <para>If you are not already viewing mail, switch to the mail tool by clicking the Mail shortcut button, or press Ctrl+1. To read a message, select it in the message list; if you'd like to see it in its own window, either double-click it, press Enter, or press Ctrl+O.</para>
-   <tip>
-    <para>To read mail with the keyboard, you can click the Spacebar to page down and press Backspace to page up while reading an email. Ensure that you use the keys when the message list is enabled.</para>
-    <para>Navigate the message list by using the arrow keys on the keyboard. To go to the next and previous unread messages, press the period (.) or comma (,) keys. On some keyboards, these keys are also marked with the &gt; and &lt; symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (]) for the next unread message, and the left square bracket ([) for the previous unread message.</para>
-   </tip>
-
-   <section id="b17rgdac">
-    <title>Magic Spacebar for Reading Mail</title>
-    <para>With Magic Spacebar, you can easily read the unread messages in all the mail folders. You can read mail, scroll through mail and switch folders by using the Spacebar on your keyboard.</para>
-    <para>To enable Magic Spacebar:</para>
-    <orderedlist>
-     <listitem id="b1axmc7p">
-      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-     </listitem>
-     <listitem id="b1axmc7q">
-      <para>Select the Enable Magic Spacebar check box.</para>
-     </listitem>
-    </orderedlist>
-    <para>When you are in the Mail view, the Spacebar has the following behavior:</para>
-    <itemizedlist>
-     <listitem>
-      <para>When you press the Spacebar for the first time, it takes you to the next unread message.</para>
-     </listitem>
-     <listitem>
-      <para>If the message is more than one screen long, the Spacebar works as Page Down key.</para>
-     </listitem>
-     <listitem>
-      <para>If you press the Spacebar after you reach the bottom of the page, it takes you to the next unread message.</para>
-     </listitem>
-     <listitem>
-      <para>If there are no more unread messages in the mailbox, pressing the Spacebar takes you to the next unread message in the next folder.</para>
-     </listitem>
-     <listitem>
-      <para>If new messages arrive in a number of folders, the Spacebar toggles between those folders. This feature allows you to switch to the next unread message in a different folder without clicking the folder.</para>
-     </listitem>
-    </itemizedlist>
-   </section>
-
-   <section id="b13qb7i4">
-    <title>Checking for New Mail</title>
-    <para>To check your mail, click Send/Receive in the toolbar. If you haven&apos;t created any mail accounts yet, the setup assistant asks you for the information it needs to check your email. For information on creating mail accounts, see <link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link>.</para>
-    <para>If this is your first time checking mail, or you haven&apos;t asked Evolution to store your password, you are prompted for the password. Enter your password to download your email.</para>
-    <para>If you get an error message instead of mail, you probably need to check your network settings. To learn how to do that, see <link linkend="mail-prefs-headers">Mail Header Preferences</link>, or ask your system administrator.</para>
-   </section>
-
-   <section id="b17qh4uo">
-    <title>New Mail Notification</title>
-    <para>Evolution can notify you of new messages. When you receive a new message in your inbox, a blinking icon appears on the Switcher.</para>
-    <para>You can also view a blinking icon (<inlinegraphic format="PNG" fileref="figures/evo_blink.png"/>) in the notification area that disappears when you open the new message. Mouse over the icon to view the notification message.</para>
-    <mediaobject id="b1a5asi6"><imageobject><imagedata format="PNG" fileref="figures/evo_newmail.png"/></imageobject></mediaobject>
-    <para>To enable this feature, select Edit &gt; Plugins, then select the Mail Notification check box. You can configure the plugin by specifing the following in the Plugin Manager.</para>
-    <formalpara id="b1dl8zqx">
-     <title>Notify new messages for Inbox only:</title>
-     <para>Select this option to restrict the mail notification to Inbox. With this option enabled, you are notified of each new message arrival in the Inbox.</para>
-    </formalpara>
-    <formalpara>
-     <title>New Message Notification For Folders</title>
-     <para>This feature notifies you of new message arrival in any folder. A folder with new mail is identified by the unread icon.The icon is displayed as long as the folder is accessed.</para>
-    </formalpara>
-    <para>In a collapsed folder tree, if a new message arrives in the parent folder, the folder name is displayed with a '+' plus sign beside the unread mail count. When a new message arrives in any child folders, the parent folder name turns bold.</para>
-    <mediaobject><imageobject><imagedata format="PNG" fileref="figures/folder_plus.png"/></imageobject></mediaobject>
-    <formalpara id="b1dl93cp">
-     <title>Generate D-Bus message:</title>
-     <para>D-Bus is a fast, lightweight message bus system that allows applications to communicate with each other. Select this option to generate a D-Bus message on the session bus whenever a new message arrives.</para>
-    </formalpara>
-    <formalpara id="b1dl94v1">
-     <title>Show icon in the notification area:</title>
-     <para>Select this option to display a new mail icon in the notification area when a new message arrives. You have two options to select from:</para>
-    </formalpara>
-    <itemizedlist>
-     <listitem>
-      <formalpara id="b1dl95ux">
-       <title>Blinking icon in the notification area:</title>
-       <para>Select this option to make the new mail icon blink in the notification area on arrival of a new message.</para>
-      </formalpara>
-     </listitem>
-     <listitem>
-      <formalpara id="b1dl998a">
-       <title>Popup message together with the icon:</title>
-       <para>Select this option to make the new message pop up along with the new mail icon.</para>
-      </formalpara>
-     </listitem>
-    </itemizedlist>
-    <formalpara id="b1dl986k">
-     <title>Play sound when new messages arrive:</title>
-     <para>You have two options to select from:</para>
-    </formalpara>
-    <itemizedlist>
-     <listitem>
-      <formalpara id="b1dl9b9h">
-       <title>Beep:</title>
-       <para>Select this option to play a beep sound on the arrival of a new message.</para>
-      </formalpara>
-     </listitem>
-     <listitem>
-      <formalpara id="b1dl9bbt">
-       <title>Play sound file:</title>
-       <para>Select this option to play a sound file of your choice on the arrival of a new message.</para>
-      </formalpara>
-     </listitem>
-    </itemizedlist>
-    <para>To specify the sound file you want to play: </para>
-    <orderedlist>
-     <listitem id="b1dl9dx3">
-      <para>Click None to open the Select Sound File browser window.</para>
-     </listitem>
-     <listitem id="b1dl9p3d">
-      <para>Browse to find the sound file of your choice.</para>
-     </listitem>
-     <listitem id="b1dl9qm3">
-      <para>Click Open to select the sound file.</para>
-     </listitem>
-     <listitem id="b1dl9qrp">
-      <para>Click Play to listen to the file.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="b131ni8g">
-    <title>Vertical View Versus Classical View</title>
-    <para>Evolution provides a vertical view in addition to the classical view. In the vertical view, the message preview pane is located at the right side of the message list when compared to the classical view where the message preview pane is placed below the message list. Vertical view enables you to use the extra width of wide screen monitors.</para>
-    <formalpara id="b131nl11">
-     <title>Vertical View:</title>
-     <para>To switch to vertical view, click View &gt; Preview &gt; Vertical View.</para>
-    </formalpara>
-    <para>In vertical view, the message list contains double lines of compressed headers, which enables you to consume the extra width in the preview column. The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line.</para>
-    <mediaobject id="b159qju3"><imageobject><imagedata format="PNG" fileref="figures/ver_view_a.png"/></imageobject></mediaobject>
-    <formalpara id="b131nkqr">
-     <title>Classical View:</title>
-     <para>To switch to classical view, click View &gt; Preview &gt; Classical View.</para>
-    </formalpara>
-   </section>
-
-   <section id="b131oj36">
-    <title>Collapsible Message Headers</title>
-    <para>Evolution compresses the TO, CC and BCC headers of received mail and shows only limited addresses. You can set the limit of the number of addresses to be displayed in the preview pane.</para>
-    <para>Use the following procedure to set the limit of addresses to be displayed:</para>
-    <orderedlist>
-     <listitem id="b131onkl">
-      <para>Select Edit &gt; Preferences.</para>
-     </listitem>
-     <listitem id="b131onsx">
-      <para>Select Mail Preferences.</para>
-     </listitem>
-     <listitem id="b131onvr">
-      <para>Check <guilabel>Shrink To/CC/Bcc headers to column</guilabel> to limit the address.</para>
-     </listitem>
-     <listitem id="b131oo0c">
-      <para>Enter the limit in the field.</para>
-     </listitem>
-    </orderedlist>
-    <para>You can expand the message headers by clicking the <inlinegraphic format="PNG" fileref="figures/plus.png"/> icon or the ellipsis (<guilabel>...</guilabel>) in the message preview pane. To collapse the message headers, click the <inlinegraphic format="PNG" fileref="figures/minus.png"/> icon in the  preview pane.</para>
-   </section>
-
-   <section id="bsempjs">
-    <title>Sharing Mailboxes with Other Mail Programs</title>
-    <para>If you want to use Evolution and another email client, such as Mutt, at the same time, use the following procedure:</para>
-    <orderedlist>
-     <listitem id="bsen3rq">
-      <para>Download your mail in the other application as you would normally.</para>
-     </listitem>
-     <listitem id="bsen3u8">
-      <para>In Evolution:</para>
-      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-      <para>Select the account you want to use to share mail and click Edit. Instead of Edit, you might want to create a new account just for this source of mail by clicking New.</para>
-     </listitem>
-     <listitem id="bsen3wh">
-      <para>Under the Receiving Mail tab, select the type of mail file that your other mail application uses, then specify the full path to that location. A typical choice would be mbox files, with the path /home/<varname>username</varname>/Mail/.</para>
-     </listitem>
-     <listitem id="bsen3yh">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>You can only use one mail client at a time. The mail files are locked by the mail program that is currently using them, so the mail files can't be accessed by any other mail program.</para>
-   </section>
-
-   <section id="usage-mail-getnsend-get-attach">
-    <title>Working with Attachments and HTML Mail</title>
-    <para>If someone sends you an <link linkend="attachment">attachment</link>, Evolution displays a file icon at the end of the message to which it is attached. Text, including HTML formatting, and embedded images appears as part of the message, rather than as a separate attachment. Attachments are also listed under the address list. To view the attachments, click the arrow to expand the attachment window. To open an attachment, double-click it. Click the Save All button to save all the attachments.</para>
-
-    <section id="usage-mail-getnsend-get-attach-actions">
-     <title>Saving or Opening Attachments</title>
-     <para>If you get an email message with an attachment, Evolution can help you save the attachment or open it with the appropriate applications.</para>
-     <para>Evolution shows a right-arrow icon, the number of attachments, and a Save or Save All button to save all the attachments. Click the right-arrow icon to show the attachment bar.</para>
-     <para>To save an attachment to disk:</para>
-     <orderedlist>
-      <listitem id="bsen45z">
-       <para>Click the down-arrow on the attachment icon or right-click the attachment icon in the attachment bar.</para> 
-      </listitem>
-      <listitem id="bsen45d">
-       <para>Click Save As.</para>
-      </listitem>
-      <listitem id="bsen4bg">
-       <para>Select a location and name for the file.</para>
-      </listitem>
-      <listitem id="bsen4do">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-     <para>To open an attachment using another application:</para>
-     <orderedlist>
-      <listitem id="bsen4ia">
-       <para>Click the down-arrow on the attachment icon or right-click the attachment icon in the attachment bar.</para>
-      </listitem>
-      <listitem id="bsen4kb">
-       <para>Select the application to open the attachment.</para>
-      </listitem>
-      <listitem id="bspur27">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-     <para>The options available for an attachment vary depending on the type of attachment and the applications your system has installed. For example, attached word processor files can be opened in OpenOffice.org or another word processor, and compressed archive files can be opened in the File Roller application.</para>
-    </section>
-
-    <section id="usage-mail-getnsend-get-attach-html">
-     <title>Inline Images in HTML Mail</title>
-     <para>When someone sends you HTML mail that includes an image in the body of the message (for example, the welcome message in your Inbox), Evolution displays the image inside the message. You can create messages like this by using the Insert Image tool in the message composer. Alternately, just drag an image into the message composition area.</para>
-     <para>Some images are links in a message, rather than being part of the message. Evolution can download those images from the Internet, but does not do so unless you request it. This is because remotely hosted images can be slow to load and display, and can even be used by spammers to track who reads the email. Not automatically loading images helps protect your privacy.</para>
-     <para>To load the images for one message, click View &gt; Load Images.</para>
-     <para>To set the default action for loading images:</para>
-     <orderedlist>
-      <listitem id="bsenabn">
-       <para>Select Edit &gt; Preferences, then select Mail Preferences.</para>
-      </listitem>
-      <listitem id="bsenajw">
-       <para>Click the HTML Mail tab.</para>
-      </listitem>
-      <listitem id="bsenaou">
-       <para>Select one of the items: Never Load Images Off the Net, Load Images in Mail From Contacts, or Always Load Images Off the Net.</para>
-      </listitem>
-      <listitem id="bsenb3x">
-       <para>Click Close.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-   </section>
-
-   <section id="usage-mail-getnsend-get-news">
-    <title>Using Evolution for News</title>
-    <para>USENET newsgroups are similar to mail, so it is often convenient to read news and mail side by side. You can add a news source, called an NNTP server, the same way you would add <link linkend="bse54o0">new email account</link>, selecting USENET News as the server type. The news server appear as a remote mail server, and each newsgroup works like an IMAP folder. When you click Send/Receive, Evolution also checks for news messages.</para>
-    <para>When you create a newsgroup account, you are not subscribed to any groups. To subscribe to a newsgroup:</para>
-    <orderedlist>
-     <listitem id="bsx1euy">
-      <para>Click Folder &gt; Subscriptions.</para>
-     </listitem>
-     <listitem id="bsx1ezk">
-      <para>Select your NNTP account, select the groups you want to subscribe to, then click Subscribe.</para>
-     </listitem>
-     <listitem id="bsx1g1g">
-      <para>Click Close.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="usage-mail-getnsend-delete">
-    <title>Deleting Mail</title>
-    <para>Evolution allows you to delete unwanted messages. To delete a message, select it and press the Delete key, or click the Delete button in the toolbar, or press Ctrl+D, or right-click the message, then click Delete.</para>
-    <para>When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for deletion. Your email is recoverable until you have expunged your mail. When you expunge a folder, you remove all the mail that you have marked for deletion. To show deleted messages, uncheck Hide Deleted Messages option from the View menu. You can view the messages striken off for later deletion. You can also find deleted messages in your Trash folder.</para>
-    <para>To permanently erase all the deleted messages in a folder, click Folder &gt; Expunge or press Ctrl+E.</para>
-    <para>Trash folders in GroupWise, local and IMAP accounts are actually virtual search folders that display all messages you have marked for later deletion. Hence, emptying Trash is nothing but expunging deleted mail from all your folders in the account.</para>
-    <para>However, this is not true for the Trash folder on Exchange servers, which behaves just the same as it does in Outlook. It is a normal folder with actual messages in it. For more information about search folders, see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link>.</para>
-   </section>
-
-   <section id="usage-mail-getnsend-undelete">
-    <title>Undeleting Messages</title>
-    <para>You can undelete a message that has been deleted but not expunged. To undelete a message, select the message, click Edit &gt; Undelete. Note that View &gt; Hide Deleted messages in the menubar must be disabled for this.</para>
-    <para>If you have marked a message for deletion, undeleting it unmarks it, and the message is removed from the Trash folder.</para>
-   </section>
-  </section>
-
-  <section id="usage-mail-getnsend-send">
-   <title>Composing New Email Messages</title>
-   <para>You can start writing a new email message by clicking File &gt; New &gt; Mail Message, by pressing Ctrl+N when in the mail tool, or by clicking New in the toolbar.</para>
-   <para>Enter an address in the To field. If you want to enter multiple email addresses, type in the addresses separated by comma. You can also use a contact list to send messages to multiple recipients. Enter a subject in the Subject field, and a message in the box at the bottom of the window. After you have written your message, click Send.</para>
-   <para>New mail message window look like this:</para>
-   <mediaobject id="usage-mail-newmsg-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_newmess_a.png"/></imageobject></mediaobject>
-   <para>This section contains the following topics:</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-send-charsets">Unicode, ASCII, and Non-Latin Alphabets</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-send-delay">Sending Composed Messages Later</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-offline">Working Offline</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-send-compose">Attachments</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-send-to-types">Specifying Additional Recipients for Email</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-send-to">Choosing Recipients Quickly</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-send-reply">Replying to Email Messages</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-send-find">Searching and Replacing with the Composer</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-send-html">Enhancing Your Email with HTML</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="BJEHCDFA">Mail Send Options</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-mail-getnsend-fwd">Forwarding Mail</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="usage-mail-getnsend-send-charsets">
-    <title>Unicode, ASCII, and Non-Latin Alphabets</title>
-    <para>If you want to write in a non-Latin alphabet while using a Latin keyboard, try selecting a different input method in the message composer. Right-click in the message composition area and select an input method from the Input Methods menu, then begin typing. The actual keys vary by language and input style. For example, the Cyrillic input method uses transliterated Latin keyboard combinations to get the Cyrillic alphabet, combining letters where necessary. <quote>Zh</quote> and <quote>ya</quote> produce the appropriate single Cyrillic letters, and the single-quote (') produces a soft sign character.</para>
-    <para>For greater language display capabilities, click Edit &gt; Preferences, then select the character set choices in the Mail Preferences and Composer Preferences sections. If you aren't sure which one to use, select UTF-8, which offers the greatest range of character displays for the greatest range of languages.</para>
-
-    <section id="bsfnqkj">
-     <title>Using Character Sets</title>
-     <para>A character set is a computer's version of an alphabet. In the past, the ASCII character set was used almost universally. However, it contains only 128 characters, meaning it is unable to display characters in Cyrillic, Kanjii, or other non-Latin alphabets. To work around language display problems, programmers developed a variety of methods, so many human languages now have their own specific character sets, and items written in other character sets display incorrectly. Eventually, standards organizations developed the UTF-8 Unicode&z-3rdParty; character set to provide a single compatible set of codes for everyone.</para>
-     <para>Most email messages state in advance which character set they use, so Evolution usually can display those messages correctly. However, if you find that messages are displayed as rows of incomprehensible characters, try selecting a different character set in the mail settings screen. If your recipients can't read your messages, try selecting a different character set in the composer options dialog box. For some languages, such as Turkish or Korean, it might work best for you to select the language-specific character set. However, the best choice for most users is UTF-8, which offers the widest range of characters for the widest range of languages.</para>
-    </section>
-   </section>
-
-   <section id="b1a5azam">
-    <title>Custom Header</title>
-    <para>To enable the Custom Header plugin:</para>
-    <para>Select Edit &gt; Plugins.</para>
-     <para>Then select  Custom Header. You can configure custom headers to set sensitivity and caveats to the outgoing messages.</para>
-    <para>In the Plugin Manager, select the Configuration tab to customize your header fields. You can add, edit, or remove the header fields. For every header field you add, you can specify the keys and values. The key is used as the title of the Custom Header. You can enter multiple values for the keys. You must use a semicolon to separate every value you enter.</para>
-    <orderedlist>
-     <listitem id="b1a5c4iy">
-      <para>Select New &gt; Mail Message or Shift+Ctrl+M to open a Compose Message window.</para>
-     </listitem>
-     <listitem id="b1a5c6rw">
-      <para>Select Insert &gt; Custom Header to open the Email Custom Header window.</para>
-      <para>In the Email Custom Header window, you can view all the header fields and values you add.</para>
-     </listitem>
-     <listitem id="b1a5c7re">
-      <para>Set the values for the header fields by using the respective drop-down list.</para>
-     </listitem>
-     <listitem id="b1a5c8q9">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-   <section id="usage-mail-getnsend-send-delay">
-    <title>Sending Composed Messages Later</title>
-    <para>Evolution normally sends mail as soon as you click Send. However, can save a message to be sent later:</para>
-    <itemizedlist>
-     <listitem>
-      <para>If you are offline when you click Send, Evolution adds your message to the Outbox queue. The next time you connect to the Internet and send or receive mail, that message is sent.</para>
-     </listitem>
-     <listitem>
-      <para>Click File &gt; Save Draft to store your messages in the Drafts folder for later revision.</para>
-     </listitem>
-     <listitem>
-      <para>If you prefer to save your message as a text file, click File &gt; Save As, then specify a filename.</para>
-     </listitem>
-    </itemizedlist>
-   </section>
-
-   <section id="usage-mail-getnsend-offline">
-    <title>Working Offline</title>
-    <para>Offline mode helps you communicate with remote mail storage systems like <trademark class="registered">GroupWise</trademark>, IMAP or Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time you connect.</para>
-    <para>POP mail downloads all messages to your local system, but other connections usually download just the headers, and get the rest only when you want to read the message. Before you go offline, Evolution downloads the unread messages from the folders you have chosen to store.</para>
-    <para>To mark a folder for offline use,</para>
-    <orderedlist>
-     <listitem id="b17rcycf">
-      <para>Right-click the folder, then click Properties.</para>
-     </listitem>
-     <listitem id="b17rcygo">
-      <para>Click Copy Folder Content Locally for Offline Operation.</para>
-     </listitem>
-    </orderedlist>
-    <para>Your connection status is shown by the small icon in the lower left corner of the Evolution main window. When you are online, it displays two connected cables. When you go offline, the cables separate.</para>
-    <para>To cache your selected folders and disconnect from the network,</para>
-    <orderedlist>
-     <listitem id="b17rcz0t">
-      <para>Click File &gt; Work Offline, or click the connection status icon in the lower left of the screen.</para>
-      <para>A message pops up and asks you whether you want to go offline immediately or synchronize folders locally before you go offline.</para>
-      <mediaobject id="b17rd4gb"><imageobject><imagedata format="PNG" fileref="figures/evo_offline.png"/></imageobject></mediaobject>
-      
-     </listitem>
-     <listitem id="b17rd4pa">
-      <para>Click Synchronize to download all the messages to the folders marked for offline.</para>
-      <para>Or</para>
-      <para>Click Do not synchronize to go offline immediately, without downloading the messages locally for offline operations.</para>
-      <para>Select Do not show this message again to switch off this popup. The default is to not synchronize while going offline.</para>
-     </listitem>
-    </orderedlist>
-    <para>When you want to reconnect, click File &gt; Work Online, or click the connection status icon again.</para>
-
-    <section id="b17rczm1">
-     <title>Download Messages for Offline Operations</title>
-     <para>This features prepares you for going offline and for offline operations. It helps you download all the messages locally before you go offline. If otherwise, by default, it goes offline when you click the offline button without downloading the message.</para>
-     <para>To download messages for offline operations, select File &gt; Download messages for offline.</para>
-    </section>
-
-    <section id="b101llnc">
-     <title>Automatic Network State Handling</title>
-     <para>Evolution automatically understands the network state and acts accordingly. For instance, Evolution switches to offline mode when the network goes down and automatically switches on when the network is up again. Ensure that your system has Network Manager installed on to enable this feature.</para>
-    </section>
-   </section>
-
-   <section id="usage-mail-getnsend-send-compose">
-    <title>Attachments</title>
-    <para>To attach a file to your email:</para>
-    <orderedlist>
-     <listitem id="bsfnwxr">
-      <para>Click the Attach button in the composer.</para>
-     </listitem>
-     <listitem id="bsfnx41">
-      <para>Select the file you want to attach.</para>
-     </listitem>
-     <listitem id="bsfnx93">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>You can also drag a file to the attachment bar of the composer window. If you want to send it as an inline attachment, right-click the attachment and click Properties, then select Automatic Display of Attachments.</para>
-    <para>When you send the message, a copy of the attached file goes with it. Be aware that large attachments can take a long time to send and receive.</para>
-   </section>
-   <section id="b17rcxmf">
-    <title>Attachment Reminder</title>
-    <para>Evolution has an Attachment Reminder plugin you can use to remind yourself to attach a file to an email. If it determines that you have not attached the file, it displays the following message:</para>
-    <mediaobject id="b17rcrvr"><imageobject><imagedata format="PNG" fileref="figures/attach_reminder_a.png"/></imageobject></mediaobject>
-    <orderedlist>
-     <listitem id="b17rctav">
-      <para>Click Continue Editing to attach the missing file, or click Send to send the message without any attachment.</para>
-     </listitem>
-    </orderedlist>
-    <para>To enable the Attachment Reminder:</para>
-    <orderedlist>
-     <listitem id="b17rclym">
-      <para>Select Edit &gt; Plugins &gt; Attachment Reminder.</para>
-     </listitem>
-     <listitem id="b17rcma2">
-      <para>Click Configuration, then make sure that Remind Missing Attachments is selected.</para>
-      <mediaobject id="b17rcni6"><imageobject><imagedata format="PNG" fileref="figures/evo_attachreminder_plugin.png"/></imageobject></mediaobject>
-     </listitem>
-     <listitem id="b17rcq0r">
-      <para>Click Add, then enter keywords such as <quote>Attach</quote> or <quote>Attachment</quote>.</para>
-      <para>Based on the keywords you have added here, it searches every mail you are sending. If it finds the keywords such as <quote>attach</quote> in your mail and there is no actual attached file, you are reminded of missing attachments.</para>
-     </listitem>
-     <listitem id="b1a57zh3">
-      <para>To edit any of the existing keywords, select the keyword, click Edit, then modify the word as desired.</para>
-     </listitem>
-     <listitem id="b1a57zh4">
-      <para>Click Close.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-   <section id="usage-mail-getnsend-send-to-types">
-    <title>Specifying Additional Recipients for Email</title>
-    <para><trademark>Evolution</trademark>, like most email programs, recognizes three types of addresses: primary recipients, secondary recipients, and hidden (blind) recipients. The simplest way to direct a message is to put the email address or addresses in the To: field, which denotes primary recipients. Use the Cc: field to send a message to secondary recipients.</para>
-    <para>Addresses on the Bcc: list are hidden from the other recipients of the message. You can use it to send mail to large groups of people, especially if they don't know each other or if privacy is a concern. If your Bcc: field is absent, click View &gt; Bcc Field.</para>
-    <para>If you frequently write email to the same groups of people, you can create address lists in the contacts tool, and then send them mail as though they have a single address. To learn how to do that, see <link linkend="usage-contact-organize-group-list">Creating a List of Contacts</link>.</para>
-    <para>Evolution allows you to specify the Reply-To header in an email. To do this:</para>
-    <orderedlist>
-     <listitem id="bsfnz55">
-      <para>Open a compose window.</para>
-     </listitem>
-     <listitem id="bsfnz7w">
-      <para>Open the Reply-To field by clicking View &gt; Reply To.</para>
-     </listitem>
-     <listitem id="bsfnziz">
-      <para>Specify the address you want as the Reply-To address in the new Reply-To field.</para>
-     </listitem>
-     <listitem id="bsfnzsp">
-      <para>Complete the rest of your message.</para>
-     </listitem>
-     <listitem id="bsfo0mh">
-      <para>Click Send.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="usage-mail-getnsend-send-to">
-    <title>Choosing Recipients Quickly</title>
-    <para>Address auto-completion is enabled in Evolution by default when you create contacts. Evolution makes it easy for you to quickly fill in the address field without having to remember the email address of recipients. You can type nicknames or other portions of address data in the address field and Evolution will display a drop-down list of possible address completions from your contacts. If you type a name or nickname that can go with more than one card, Evolution opens a dialog box to ask you which person you meant.</para>
-    <para>If Evolution does not complete addresses automatically, click Edit &gt; Preferences, then click Autocompletion. Then, select the address book you want to use for address autocompletion in the mailer.</para>
-    <para>Alternately, you can click the To:, Cc:, or Bcc: buttons to get a list of the email addresses in your contacts. Select addresses and click the arrows to move them into the appropriate address columns.</para>
-    <para>For more information about using email with the contact manager and the calendar, see <link linkend="contact-automation-basic">Send Me a Card: Adding New Cards Quickly</link> and <link linkend="usage-calendar-apts">Scheduling With the Evolution Calendar</link>.</para>
-   </section>
-
-   <section id="usage-mail-getnsend-send-reply">
-    <title>Replying to Email Messages</title>
-    <para>To reply to a message, select the message to reply to in the message list and click the Reply button in the toolbar, or right-click within the message and select Reply to Sender. This opens the message composer. The To: and Subject: fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the &gt; character before each line (in plain text mode), to indicate that it is part of the previous message.</para>
-    <para>If you're reading a message with several recipients, you can use Reply to All instead of Reply. If there are large numbers of people in the Cc: or To: fields, this can save substantial amounts of time.</para>
-
-    <section id="bsfo4jl">
-     <title>Using the Reply To All Feature</title>
-     <para>Susan sends an email to a client and sends copies to Tim and to an internal company mailing list of co-workers. If Tim wants to make a comment for all of them to read, he uses Reply to All, but if he just wants to tell Susan that he agrees with her, he uses Reply. His reply does not reach anyone that Susan put on her Bcc list, because that list is not shared with anyone.</para>
-     <para>If you subscribe to a mailing list, and want your reply to go just to the list rather than to the sender, select Reply to List instead of Reply or Reply to All.</para>
-    </section>
-
-    <section id="b13e1i15">
-     <title>Keyboard shortcuts</title>
-     <informaltable>
-      <tgroup cols="2">
-       <colspec colwidth="2.844*" colname="1" colnum="1"/>
-       <colspec colwidth="2.844*" colname="2" colnum="2"/>
-       <thead valign="top">
-        <row id="b13e1iwr">
-         <entry colname="1">
-          <para>Tools</para>
-         </entry>
-         <entry colname="2">
-          <para>Shortcuts</para>
-         </entry>
-        </row>
-       </thead>
-       <tbody valign="top">
-        <row id="b13e1iws">
-         <entry colname="1">
-          <para>Reply to Sender</para>
-         </entry>
-         <entry colname="2">
-          <para>Ctrl+R</para>
-         </entry>
-        </row>
-        <row id="b13e1l5y">
-         <entry colname="1">
-          <para>Reply to List</para>
-         </entry>
-         <entry colname="2">
-          <para>Clrl+L</para>
-         </entry>
-        </row>
-        <row id="b13e1kd3">
-         <entry colname="1">
-          <para>Reply to All</para>
-         </entry>
-         <entry colname="2">
-          <para>Shift+Ctrl+R</para>
-         </entry>
-        </row>
-        <row id="b13e1iwt">
-         <entry colname="1">
-          <para>Forward</para>
-         </entry>
-         <entry colname="2">
-          <para>Ctrl+F</para>
-         </entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-    </section>
-   </section>
-
-   <section id="usage-mail-getnsend-send-find">
-    <title>Searching and Replacing with the Composer</title>
-    <para>The message composer makes several text searching features available to you.</para>
-    <formalpara id="bsai5b0">
-     <title>Find:</title>
-     <para>Enter a word or phrase, and Evolution finds it in your message.</para>
-    </formalpara>
-    <formalpara id="bsai5pj">
-     <title>Find Regex:</title>
-     <para>You can search for a complex pattern of characters, called a <link linkend="regular-expression">regular expression</link> or <quote>regex</quote> in your composer window. If you're not sure what a regular expression is, you should ignore this feature.</para>
-    </formalpara>
-    <formalpara id="bsai5wk">
-     <title>Find Again:</title>
-     <para>Select this item to repeat the last search you performed.</para>
-    </formalpara>
-    <formalpara id="bsai646">
-     <title>Replace:</title>
-     <para>Find a word or phrase, and replace it with something else.</para>
-    </formalpara>
-    <para>For all of these menu items, you can choose whether to search backwards in the document from the point where your cursor is. You can also determine whether the search is to be case sensitive in determining a match.</para>
-   </section>
-
-   <section id="usage-mail-getnsend-send-html">
-    <title>Enhancing Your Email with HTML</title>
-    <para>Normally, you can't set text styles or insert pictures in email. However, most newer email programs can display images and text styles in addition to basic alignment and paragraph formatting. They do this with <link linkend="html">HTML</link>, just like Web pages do.</para>
-    <para>Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, Evolution sends plain text unless you explicitly ask for HTML.</para>
-
-    <section id="bsait28">
-     <title>Basic HTML Formatting</title>
-     <para>You can change the format of an email message from plain text to HTML by choosing Format &gt; HTML from the menu bar.</para>
-     <para>To send all your mail as HTML by default, set your mail format preferences in the mail configuration dialog box. See <link linkend="config-prefs-mail-composer">Composer Preferences</link> for more information.</para>
-     <para>HTML formatting tools are located in the toolbar just above the space where you actually compose the message. They also appear in the Insert and Format menus.</para>
-     <para>The icons in the toolbar are explained in <link linkend="tooltip">tool-tips</link>, which appear when you hold your mouse pointer over the buttons. The buttons fall into five categories:</para>
-     <formalpara id="bsai70c">
-      <title>Headers and Lists:</title>
-      <para>At the left edge of the toolbar, you can choose Normal for a default text style or Header 1 through Header 6 for varying sizes of header from large (1) to tiny (6). Other styles include preformat, to use the HTML tag for preformatted blocks of text, and three types of bullet points for lists.</para>
-     </formalpara>
-     <para>For instance, instead of using asterisks to mark a bulleted list, you can use the Bulleted List style from the style drop-down list. Evolution uses different bullet styles, and handles word wrap and multiple levels of indentation.</para>
-     <formalpara id="bsai86c">
-      <title>Text Styles:</title>
-      <para>Use these buttons to determine the way your email looks. If you have text selected, the style applies to the selected text. If you do not have text selected, the style applies to whatever you type next.</para>
-     </formalpara>
-     <informaltable>
-      <tgroup cols="2">
-       <colspec colwidth="1.208*" colname="1" colnum="1"/>
-       <colspec colwidth="4.459*" colname="2" colnum="2"/>
-       <thead valign="top">
-        <row id="bslahtr">
-         <entry colname="1">
-          <para>Button</para>
-         </entry>
-         <entry colname="2">
-          <para>Description</para>
-         </entry>
-        </row>
-       </thead>
-       <tbody valign="top">
-        <row id="bslahts">
-         <entry colname="1">
-          <para>TT</para>
-         </entry>
-         <entry colname="2">
-          <para>Typewriter text, which is approximately the same as the Courier monospace font.</para>
-         </entry>
-        </row>
-        <row id="bslaiy5">
-         <entry colname="1">
-          <para>Bold A</para>
-         </entry>
-         <entry colname="2">
-          <para>Bolds the text.</para>
-         </entry>
-        </row>
-        <row id="bslaiw4">
-         <entry colname="1">
-          <para>Italic A</para>
-         </entry>
-         <entry colname="2">
-          <para>Italicizes the text.</para>
-         </entry>
-        </row>
-        <row id="bslaium">
-         <entry colname="1">
-          <para>Underlined A</para>
-         </entry>
-         <entry colname="2">
-          <para>Underlines the text.</para>
-         </entry>
-        </row>
-        <row id="bslahtt">
-         <entry colname="1">
-          <para>Strike through A</para>
-         </entry>
-         <entry colname="2">
-          <para>Marks a line through the text.</para>
-         </entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-     <formalpara id="bsaia7u">
-      <title>Alignment:</title>
-      <para>Located next to the text style buttons, the three paragraph icons should be familiar to users of most word processing software. The left-most button aligns your text to the left, the center button centers text, and the right button aligns the text to the right.</para>
-     </formalpara>
-     <formalpara id="bsaiagc">
-      <title>Indentation Rules:</title>
-      <para>The button with the arrow pointing left decreases a paragraph's indentation, and the right arrow increases its indentation.</para>
-     </formalpara>
-     <formalpara id="bsaialx">
-      <title>Color Selection:</title>
-      <para>At the far right is the color section tool, where a box displays the current text color. To choose a new color, click the arrow button to the right. If you have text selected, the color applies to the selected text. If you do not have text selected, the color applies to whatever you type next. You can select a background color or image by right-clicking the message background, then selecting Style &gt; Page Style.</para>
-     </formalpara>
-    </section>
-
-    <section id="bsait29">
-     <title>Advanced HTML Formatting</title>
-     <para>Under the Insert menu, there are several more items you can use to style your email. To use these and other HTML formatting tools, make sure you have enabled HTML mode by using Format &gt; HTML from the menu bar.</para>
-
-     <section id="bsait2a">
-      <title>Inserting a Link</title>
-      <para>Use the Insert a Link tool to put hyperlinks in your HTML messages. If you don't want special link text, you can just enter the address directly, and Evolution recognizes it as a link.</para>
-      <orderedlist>
-       <listitem id="bsaimfe">
-        <para>Select the text you want to link from.</para>
-       </listitem>
-       <listitem id="bsaimoh">
-        <para>Right-click in the text, then click Insert Link.</para>
-       </listitem>
-       <listitem id="bsaims2">
-        <para>Type the URL in the URL field.</para>
-       </listitem>
-       <listitem id="bsaimvh">
-        <para>Click Close.</para>
-       </listitem>
-      </orderedlist>
-     </section>
-
-     <section id="bsait2b">
-      <title>Inserting an Image</title>
-      <orderedlist>
-       <listitem id="bsainv6">
-        <para>Click Insert &gt; Image in the menubar.</para>
-       </listitem>
-       <listitem id="bsaio4q">
-        <para>Browse to and select the image file.</para>
-       </listitem>
-       <listitem id="bsaioah">
-        <para>Click OK.</para>
-       </listitem>
-      </orderedlist>
-     </section>
-
-     <section id="bsait2c">
-      <title>Inserting a Rule</title>
-      <para>You can insert a horizontal line into the text to help divide two sections:</para>
-      <orderedlist>
-       <listitem id="bsaiotf">
-        <para>Click Insert &gt; Rule in the menubar.</para>
-       </listitem>
-       <listitem id="bsaioxz">
-        <para>Select the width, size, and alignment.</para>
-       </listitem>
-       <listitem id="bsaipio">
-        <para>Select Shade if necessary.</para>
-       </listitem>
-       <listitem id="bsaiplo">
-        <para>Click Close.</para>
-       </listitem>
-      </orderedlist>
-     </section>
-
-     <section id="bsait2d">
-      <title>Inserting a Table</title>
-      <para>You can insert a table into the text:</para>
-      <orderedlist>
-       <listitem id="bsaiq2x">
-        <para>Click Insert &gt; Table in the menubar.</para>
-       </listitem>
-       <listitem id="bsaiq6r">
-        <para>Select the number of rows and columns.</para>
-       </listitem>
-       <listitem id="bsaiqkl">
-        <para>Select the type of layout for the table.</para>
-       </listitem>
-       <listitem id="bsaiqp8">
-        <para>Select a background for the table.</para>
-        <para>To insert a picture for the background, click the filechooser button and select the desired image.</para>
-       </listitem>
-       <listitem id="bsaiqs5">
-        <para>Click Close.</para>
-       </listitem>
-      </orderedlist>
-     </section>
-    </section>
-   </section>
-
-   <section id="BJEHCDFA">
-    <title>Mail Send Options</title>
-    <para>You can set the following options when sending mail in Evolution.</para>
-    <formalpara id="b101lleg">
-     <title>Read Receipts:</title>
-     <para>Evolution allows you to request a receipt for your sent messages to indicate when your message is being viewed by the recipient. Receipts are useful when sending email that is time-sensitive. To request a receipt, click Insert &gt; Request Read Receipt in the composer window.</para>
-    </formalpara>
-    <formalpara id="b101llei">
-     <title>Prioritize Message:</title>
-     <para>You can prioritize a message to be sent, so that the recipient sees its relative importance.To prioritize a message, click Insert &gt; Prioritize Message in the composer window.</para>
-    </formalpara>
-    <note>
-     <para>Evolution will ignore the message priority, because it assumes that the recipient should decide whether the message is important or not.</para>
-    </note>
-   </section>
-
-   <section id="b13uhy6r">
-    <title>Default Settings</title>
-    <para>Evolution allows you to change the default settings. You can organize your Draft folder and Sent folder, set the addresses to which you want to sent carbon copies and blind carbon copies to. You can also change the settings for message receipts.</para>
-    <para>To change your default settings,</para>
-    <orderedlist>
-     <listitem id="b13uu17q">
-      <para>Select Edit &gt; Preferences.</para>
-     </listitem>
-     <listitem id="b13uu2g0">
-      <para>Select the mail account whose settings you want to change.</para>
-     </listitem>
-     <listitem id="b13uu7dv">
-      <para>Click Edit to open the Account Editor.</para>
-     </listitem>
-     <listitem id="b13uu7rw">
-      <para>Click the Default tab.</para>
-     </listitem>
-     <listitem id="b13uuba1">
-      <para>Click the respective check boxes and enter the email addresses you want to always CC and BCC.</para>
-     </listitem>
-     <listitem id="b13uuhrf">
-      <para>Select the desired option for send message receipts from the drop-down list.</para>
-     </listitem>
-    </orderedlist>
-
-    <section id="b17s9qmz">
-     <title>Changing Default Folder for Sent and Draft Items</title>
-     <para>By default, all the sent messages directly go to the Sent folder and those messages marked as drafts are saved in the Drafts folder. To change the default setting for draft items,</para>
-     <orderedlist>
-      <listitem id="b13uuu4v">
-       <para>Click the Drafts button to open the folder selection window.</para>
-      </listitem>
-      <listitem id="b13uuutt">
-       <para>Select the folder you want to save drafts to.</para>
-      </listitem>
-      <listitem id="b13uuvee">
-       <para>Click OK.</para>
-      </listitem>
-      <listitem id="b13uuvlq">
-       <para>Click the Revert button to revert back to previous settings.</para>
-      </listitem>
-     </orderedlist>
-     <para>To change the default folder for sent items,</para>
-     <orderedlist>
-      <listitem id="b13uuylj">
-       <para>Click the Sent button to open the folder selection window.</para>
-      </listitem>
-      <listitem id="b13uuylk">
-       <para>Select the desired folder for sent items.</para>
-      </listitem>
-      <listitem id="b13uuyll">
-       <para>Click OK.</para>
-      </listitem>
-      <listitem id="b13uuylm">
-       <para>Click the Revert button to revert back to previous settings.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-   </section>
-
-   <section id="usage-mail-getnsend-fwd">
-    <title>Forwarding Mail</title>
-    <para>When you receive an email, you can forward it to other individuals or groups that might be interested. You can forward a message as an attachment to a new message (this is the default) or you can send it <link linkend="inline">in	line</link> as a quoted portion of the message you are sending. Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding. Remember to note from whom the message came, and whether you have removed or altered content.</para>
-    <para>To forward a message you are reading:</para>
-    <orderedlist>
-     <listitem id="b10fnnjq">
-      <para>Click Forward on the toolbar.</para>
-      <para>or</para>
-      <para>If you prefer to forward the message <link linkend="inline">inline</link> instead of attached, click Message &gt; Forward As &gt; Inline from the menu.</para>
-     </listitem>
-     <listitem id="b10fnnnk">
-      <para>Select an addressee as you would when sending a new message; the subject is already entered, although you can alter it if you want.</para>
-     </listitem>
-     <listitem id="b10fnop8">
-      <para>Add your comments on the message in the composition frame</para>
-      <para>Click Send.</para>
-     </listitem>
-    </orderedlist>
-    <para>Attachments to a message you are forwarding are forwarded only when you send the original message as an attachment. Inline messages do not forward any attachments.</para>
-   </section>
-  </section>
-
-  <section id="b1dlaazl">
-   <title>Templates</title>
-   <para>A message template is a standard message that you can use at any time to send mail with the same pattern. Evolution allows you to create and edit message templates.</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="b1dlbad4">Creating a Message Template from an Existing Message</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="b1dlbckm">Saving a New Message as a Template</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="b1dlbec6">Using a Message Template as a Reply</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="b1dlbgwb">Configuring Message Templates</link></para>
-    </listitem>
-   </itemizedlist>
-   <para>To enable the Message Template Plugin:</para>
-   <orderedlist>
-    <listitem id="b1dlb9w8">
-     <para>Select Edit &gt; Plugins, then select Templates.</para>
-    </listitem>
-   </orderedlist>
-   
-   <section id="b1dlbad4">
-    <title>Creating a Message Template from an Existing Message</title>
-    <orderedlist>
-     <listitem id="b1dlbakg">
-      <para>Select the message.</para>
-     </listitem>
-     <listitem id="b1dlbbvc">
-      <para>Right-click &gt; Move to folder / Copy to folder.</para>
-     </listitem>
-     <listitem id="b1dlbc28">
-      <para>Select the Template local folder.</para>
-     </listitem>
-    </orderedlist>
-    <para>You can also edit an existing message and save it as a template.</para>
-    <orderedlist>
-     <listitem id="b1dlbczb">
-      <para>Open the message and click Reply.</para>
-     </listitem>
-     <listitem id="b1dlbd4s">
-      <para>Edit the message body or the addresses according to your requirements.</para>
-     </listitem>
-     <listitem id="b1dlbdbq">
-      <para>Select File &gt; Save as Template.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-   
-   <section id="b1dlbckm">
-    <title>Saving a New Message as a Template</title>
-    <orderedlist>
-     <listitem id="b1dlbe1w">
-      <para>Click New and enter the information in the New Message window, according to your requirements.</para>
-     </listitem>
-     <listitem id="b1dlbe2y">
-      <para>Select File &gt; Save as Template.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-   
-   <section id="b1dlbec6">
-    <title>Using a Message Template as a Reply</title>
-    <orderedlist>
-     <listitem id="b1dlbf4b">
-      <para>Right-click the message you are replying to, then click Templates.</para>
-      <para>This option lists all the message templates in the Template folder.</para>
-     </listitem>
-     <listitem id="b1dlbf5a">
-      <para>Select the message template of your choice. Make changes if required in the email composer window that will open.</para>
-     </listitem>
-     <listitem id="b1dlbgaq">
-      <para>Click Send.</para>
-      <para>When you select a message template for replying, the subject of the reply is preserved.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-   
-   <section id="b1dlbgwb">
-    <title>Configuring Message Templates</title>
-    <para>In the Plugin Manager, select the Configuration tab to customize your message templates. You can add, edit or remove the key-value pairs. You can specify any number of key-value pairs.</para>
-    <para>In any template, the occurrence of every $key is replaced by the value it has in the configuration. For example, if you set the key to Manager and the value to Harry, any occurrence of $Manager is replaced by Harry in the message.</para>
-    <para>Assume that you have 1000 message templates with your current manager&apos;s name in them. When the current manager is replaced by a new one, it&apos;s not easy for you to manually replace the manager&apos;s name in all the 1000 messages. If the messages have a $Manager key value, you can reset the value in the Configuration tab of this plugin.</para>
-    <para>By default, the entire environment variables are used as a key-value pair. An occurrence of $env_variable is replaced by the value it carries. For example, an occurrence of $PATH in your template is replaced by its value when the template is used.</para>
-    <para>The replacement process uses the following order of precedence:</para>
-    <itemizedlist>
-     <listitem>
-      <para>$key is replaced by the value set for it in the Configuration tab of the Templates plugin.</para>
-     </listitem>
-     <listitem>
-      <para>If the key is not found, it is then replaced with the value of its environment variable.</para>
-     </listitem>
-     <listitem>
-      <para>If key is neither a configuration option nor an environment variable, no changes are made.</para>
-     </listitem>
-    </itemizedlist>
-   </section>
-  </section>
-  
-  <section id="rsvp-stuff">
-   <title>Sending Invitations by Mail</title>
-   <para>If you create an event in the calendar component, you can then send invitations to the attendee list through the Evolution email tool. The invitation card is sent as an attachment in iCal format.</para>
-   <para>To send an invitation, right-click on the calendar item and click Forward as iCalendar.</para>
-   <para>When you receive an invitation, you have several options:</para>
-   <formalpara id="bsaizt9">
-    <title>Accept:</title>
-    <para>Indicates you will attend the meeting. When you click the OK button, the meeting is entered into your calendar.</para>
-   </formalpara>
-   <formalpara id="bsaj000">
-    <title>Tentatively Accept:</title>
-    <para>Indicates you will probably attend the meeting. When you click the OK button, the meeting is entered into your calendar, but is marked as tentative.</para>
-   </formalpara>
-   <formalpara id="bsaj06a">
-    <title>Decline:</title>
-    <para>Indicates you are unable to attend the meeting. The meeting is not entered into your calendar when you click OK, although your response is sent to the meeting host if you have selected the Send reply to sender option.</para>
-   </formalpara>
-   <formalpara id="bsaj0dc">
-    <title>Send reply to sender:</title>
-    <para>Select this option if you want your response sent to the meeting organizers.</para>
-   </formalpara>
-  </section>
-
-  <section id="usage-mail-subscriptions">
-   <title>IMAP Subscriptions Manager</title>
-   <para>Because IMAP folders exist on the server, and opening them or checking them takes time, you need fine-grained control over the way that you use IMAP folders. You use the IMAP subscriptions manager to do this. If you prefer to have every mail folder displayed, you can select that option as well. However, if you want to choose specific items in your mailbox, and exclude others, you can use the subscription management tool to do that.</para>
-   <orderedlist>
-    <listitem id="bsmqyfs">
-     <para>Select Folder &gt; Subscriptions.</para>
-    </listitem>
-    <listitem id="bsmqyid">
-     <para>If you have accounts on multiple IMAP servers, select the server where you want to manage your subscriptions.</para>
-     <para>Evolution displays a list of available files and folders.</para>
-    </listitem>
-    <listitem id="bsmqyky">
-     <para>Select a file or folder by clicking it.</para>
-     <para>You should select at least the Inbox folder. Depending upon the way your IMAP server is configured, the list of available files might include non-mail folders. If it does, you can ignore them.</para>
-    </listitem>
-    <listitem id="bsmqz9t">
-     <para>Enable the corresponding checkbox to add a folder to the subscribed list.</para>
-    </listitem>
-    <listitem id="bsmqzlz">
-     <para>When you have subscribed to the folders you want, close the window.</para>
-    </listitem>
-   </orderedlist>
-  </section>
-
-  <section id="encryption">
-   <title>Encryption</title>
-   <para>To protect and encode your email transmissions, Evolution offers two encryption methods:</para>
-   <itemizedlist>
-    <listitem>
-     <para>GPG Encryption</para>
-    </listitem>
-    <listitem>
-     <para>S/MIME Encryption</para>
-    </listitem>
-   </itemizedlist>
-   <para>Evolution helps you protect your privacy by using GNU Privacy Guard (GPG), an implementation of strong <link linkend="public-key-encryption">Public Key Encryption.</link></para>
-   <para>In order to send and receive encrypted emails using GPG, it is necessary to use two kinds of encryption keys: public and private. Public keys are used to encrypt messages and private keys to decrypt them. To send encrypted email, you must have the recepient's public key, which is used to encrypt the message. The recipient then uses his/her private key to decrypt (and read) the encrypted message.</para>
-   <para>Those who wish to send you encrypted email must first have a copy of your public key on your keyring. To this end, public keys can be shared with those who want to send encrypted messages to you. In order to do this, you may place your public key on a public key server. Private keys should not be shared with others.</para>
-   <para>Evolution does not support older versions of PGP, such as OpenPGP and Inline PGP.</para>
-   <para>You can use encryption in two different ways:</para>
-   <itemizedlist>
-    <listitem>
-     <para>You can encrypt the entire message, so that nobody but the recipient can read it.</para>
-    </listitem>
-    <listitem>
-     <para>You can attach an encrypted signature to a plain text message, so that the recipient can read the message without decrypting it, and needs decrypting only to verify the sender's identity.</para>
-    </listitem>
-   </itemizedlist>
-   <para>For example, suppose that Kevin wants to send an encrypted message to his friend Rachel. He looks up her public key on a general key server, and then tells Evolution to encrypt the message. The message now reads <quote>@#$23ui7yr87#@!48970fsd.</quote> When the information gets to Rachel, she decrypts it using her private key, and it appears as plain text for her to read.</para>
-
-   <section id="encryption-keygen">
-    <title>Making a GPG Encryption Key</title>
-    <para>Before you can get or send encrypted mail, you need to generate your public and private keys with GPG. This procedure covers version 1.2.4 of GPG. If your version is different, these steps might vary slightly. You can find out your version number by entering <command>gpg --version</command>.</para>
-    <orderedlist>
-     <listitem id="bsg2zuv">
-      <para>Open a terminal and enter <command>gpg --gen-key</command>.</para>
-     </listitem>
-     <listitem id="bsg2zxw">
-      <para>Select an algorithm, then press Enter.</para>
-      <para>or</para>
-      <para>To accept the default algorithm of DSA and ElGamal, press Enter (recommended).</para>
-     </listitem>
-     <listitem id="bsg3011">
-      <para>Select a key length, then press Enter. To accept the default, 1024 bits, press Enter.</para>
-     </listitem>
-     <listitem id="bsg3034">
-      <para>Enter how long your key should be valid for.</para>
-      <para>or</para>
-      <para>To accept the default of no expiration, press Enter, then press Y when you are prompted to verify the selection.</para>
-     </listitem>
-     <listitem id="bsg305l">
-      <para>Type your real name, then press Enter.</para>
-     </listitem>
-     <listitem id="bsg30bg">
-      <para>Type your email address, then press Enter.</para>
-     </listitem>
-     <listitem id="bsg30ec">
-      <para>(Optional) Type a comment, then press Enter.</para>
-     </listitem>
-     <listitem id="bsg30lp">
-      <para>Review your selected user ID. If it is correct, press O.</para>
-     </listitem>
-     <listitem id="bsg317u">
-      <para>Type a passphrase, then press Enter.</para>
-     </listitem>
-     <listitem id="bsg31c5">
-      <para>Move your mouse randomly to generate the keys.</para>
-     </listitem>
-    </orderedlist>
-    <para>After the keys are generated, you can view your key information by entering <command>gpg --list-keys</command>. You should see something similar to this:  <computeroutput> /home/you/.gnupg/pubring.gpg ----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]  </computeroutput></para>
-    <para>GPG creates one list, or keyring, for your public keys and one for your private keys. All the public keys you know are stored in the file ~/.gnupg/pubring.gpg. If you want to give other people your key, send them that file.</para>
-    <para>If you want, you can upload your keys to a key server.</para>
-    <orderedlist>
-     <listitem id="bsg3379">
-      <para>Check your public key ID with gpg--list-keys. It is the string after <quote>1024D</quote> on the line beginning with <quote>pub</quote>. In the example above, it is <quote>32j38dk2</quote>.</para>
-     </listitem>
-     <listitem id="bsg347p">
-      <para>Enter the command <command>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></command>. Substitute your key ID for <quote>32j38dk2</quote>. You need your password to do this.</para>
-     </listitem>
-    </orderedlist>
-    <para>Key servers store your public keys for you so that your friends can decrypt your messages. If you choose not to use a key server, you can manually send your public key, include it in your signature file, or put it on your own Web page. However, it is easier to publish a key once, and then let people download it from a central place when they want.</para>
-    <para>If you don't have a key to unlock or encrypt a message, you can set your encryption tool to look it up automatically. If it can't find the key, an error message appears.</para>
-   </section>
-
-   <section id="encrypt-getting-key">
-    <title>Getting and Using GPG Public Keys</title>
-    <para>To send an encrypted message, you need to use the recipient's public key in combination with your private key. Evolution handles the encryption, but you need to get the public key and add it to your keyring.</para>
-    <para>To get public keys from a public key server, enter the command<command> gpg --recv-keys --keyserver wwwkeys.pgp.net <varname>keyid</varname></command>, substituting <varname>keyid</varname> for your recipient's ID. You need to enter your password, and the ID is automatically added to your keyring.</para>
-    <note>
-     <para>The domain <quote><emphasis>wwwkeys.pgp.net</emphasis></quote> is assigned to multiple hosts in various networks. 
-     The gpg utility tries to connect to one in the current network; and if that particular host is down, 
-     it fails with a time-out.</para>
-     <para>To avoid this, type <command>$ host wwwkeys.pgp.net</command> in a terminal console and get the IP address of the hosts. 
-      You can ping each of them to find the one which is up and running. Now, you can replace wwwkeys.pgp.net in the gpg --recv-keys
-      --keyserver wwwkeys.pgp.net keyid command with that 
-      explicit IP number as returned by the host utility.</para> 
-    </note>
-    <para>If someone sends you a public key directly, save it as a plain text file and enter the command <command>gpg <varname>--import</varname></command> to add it to your keyring.</para>
-   </section>
-
-   <section id="encrypt-evo-integ">
-    <title>Setting up GPG Encryption</title>
-    <orderedlist>
-     <listitem id="bsg364h">
-      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-     </listitem>
-     <listitem id="bsg368f">
-      <para>Select the account you want to use securely, then click Edit.</para>
-     </listitem>
-     <listitem id="bsg36hg">
-      <para>Click the Security tab.</para>
-     </listitem>
-     <listitem id="bsg36jw">
-      <para>Specify your key ID in the PGP/GPG Key ID field.</para>
-     </listitem>
-     <listitem id="bsg36pj">
-      <para>Click OK.</para>
-     </listitem>
-     <listitem id="bsg36qt">
-      <para>Click Close.</para>
-     </listitem>
-    </orderedlist>
-    <para>Evolution requires that you know your key ID. If you don't remember it, you can find it by typing <command>gpg --list-keys</command> in a terminal window. Your key ID is an eight-character string with random numbers and letters.</para>
-   </section>
-
-   <section id="bspya9p">
-    <title>Encrypting Messages</title>
-    <para>To encrypt a single message:</para>
-    <orderedlist>
-     <listitem id="bsg2p0a">
-      <para>Open a Compose Message window.</para>
-     </listitem>
-     <listitem id="bsg2p9i">
-      <para>Click Security &gt; PGP Encrypt.</para>
-     </listitem>
-     <listitem id="bsg2prj">
-      <para>Compose your message.</para>
-      <para>Click Send.</para>
-     </listitem>
-    </orderedlist>
-    <note>
-    <para>The Subject line of the message will not be encrypted and should not be used for sensitive information.</para>
-    </note>
-    <para>You can set Evolution to always sign your email messages:</para>
-    <orderedlist>
-     <listitem id="bsaj12e">
-      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-     </listitem>
-     <listitem id="bsaj1aj">
-      <para>Select the account you want to use securely, then click Edit.</para>
-     </listitem>
-     <listitem id="bsaj1es">
-      <para>Click the Security tab.</para>
-     </listitem>
-     <listitem id="bsaj1yt">
-      <para>Select Always Sign Outgoing Messages When Using This Account.</para>
-     </listitem>
-     <listitem id="bsaj2e0">
-      <para>Click OK.</para>
-     </listitem>
-     <listitem id="bsaj2et">
-      <para>Click Close.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="unencrypting">
-    <title>Unencrypting a Received Message</title>
-    <para>If you receive an encrypted message, you need to decrypt it before you read it. Remember, the sender must have your public key before they can send you an encrypted message.</para>
-    <para>When you view the message, Evolution prompts you for your PGP password. Enter it, and the unencrypted message is displayed.</para>
-   </section>
-
-   <section id="encryption-smime">
-    <title>S/MIME Encryption</title>
-    <para>S/MIME encryption also uses a key-based approach, but it has some significant advantages in convenience and security. S/MIME uses certificates, which are similar to keys. The public portion of each certificate is held by the sender of a message and by one of several certificate authorities, who are paid to guarantee the identity of the sender and the security of the message. Evolution already recognizes a large number of certificate authorities, so when you get a message with an S/MIME certificate, your system automatically receives the public portion of the certificate and decrypts or verifies the message.</para>
-    <para>S/MIME is used most often in corporate settings. In these cases, administrators supply certificates that they have purchased from a certificate authority. In some cases, an organization can act as its own certificate authority, with or without a guarantee from a dedicated authority such as VeriSign&z-3rdParty; or Thawte&z-3rdParty;. In either case, the system administrator provides you with a certificate file.</para>
-    <para>If you want to use S/MIME independently, you can extract an identification certificate from your Mozilla&z-3rdParty; or Netscape&z-3rdParty; Web browser. See the <ulink url="http://www.mozilla.org/projects/security/pki/psm/help_21/using_certs_help.html">Mozilla Help</ulink> for more information on security certificates.</para>
-    <para>The certificate file is a password-protected file on your computer.</para>
-
-    <section id="bspyee8">
-     <title>Adding a Signing Certificate</title>
-     <orderedlist>
-      <listitem id="bsg2rkq">
-       <para>Select Edit &gt; Preferences.</para>
-      </listitem>
-      <listitem id="bsg2rkr">
-       <para>Click Certificates.</para>
-      </listitem>
-      <listitem id="bsg2rra">
-       <para>Click Import.</para>
-      </listitem>
-      <listitem id="bsg2rw3">
-       <para>Select the file to import, then click Open.</para>
-      </listitem>
-      <listitem id="bsg2s8y">
-       <para>Click Close.</para>
-      </listitem>
-     </orderedlist>
-     <para>Similarly, you can add certificates that are sent to you independently of any authority by clicking the Contact Certificates tab and using the same import tool. You can also add new certificate authorities, which have their own certificate files, in the same way.</para>
-    </section>
-
-    <section id="bsqbdkv">
-     <title>Signing or Encrypting Every Message</title>
-     <para>After you have added your certificate, you can sign or encrypt a message by clicking Security &gt; S/MIME Sign or S/MIME Encrypt in the message composer.</para>
-     <para>To have every message signed or encrypted:</para>
-     <orderedlist>
-      <listitem id="bsg2t55">
-       <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-      </listitem>
-      <listitem id="bsg2t56">
-       <para>Select the account to encrypt the messages in.</para>
-      </listitem>
-      <listitem id="bsg2tam">
-       <para>Click Edit, then click Security.</para>
-      </listitem>
-      <listitem id="bsg2tsx">
-       <para>Click Select next to Signing Certificate and specify the path to your signing certificate.</para>
-       <para>or</para>
-       <para>Click Select next to Encryption Certificate and specify the path to your encryption certificate.</para>
-      </listitem>
-      <listitem id="bsg2uuc">
-       <para>Select the appropriate options.</para>
-      </listitem>
-      <listitem id="bsg2vi6">
-       <para>Click OK.</para>
-      </listitem>
-      <listitem id="bsg2uvy">
-       <para>Click Close.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-   </section>
-  </section>
- </chapter>
-
- <chapter id="usage-mail-organize">
-  <title>Organizing Your Email</title>
-  <para>Whether you only get a few email messages a day, or you receive hundreds, you probably want to sort and organize them. <trademark>Evolution</trademark> has the tools to help you do it.</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="importing-mail-and-settings">Importing Your Old Email</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail-organize-columns">Sorting the Message List</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail-organize-folders">Getting Organized with Folders</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail-organize-search">Searching for Messages</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail-organize-filters">Create Rules to Automatically Organize Mail</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail-organize-vfolders">Using Search Folders</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-mail-organize-spam">Stopping Junk Mail (Spam)</link></para>
-   </listitem>
-  </itemizedlist>
-
-  <section id="importing-mail-and-settings">
-   <title>Importing Your Old Email</title>
-   <para>Evolution allows you to import old email and contacts so that you don't need to worry about losing your old information.</para>
-
-   <section id="importing-mail">
-    <title>Importing Single Files</title>
-    <para>Evolution can import the following types of files:</para>
-    <formalpara id="bsawbz2">
-     <title>vCard (.vcf, .gcrd):</title>
-     <para>The address book format used by the GNOME, KDE, and many other contact management applications. You should be able to export to vCard format from any address book application.</para>
-    </formalpara>
-    <formalpara id="b141jcun">
-     <title>vCalendar:</title>
-     <para>A format for storing calendar files, which is generally used by Evolution, Microsoft Outlook, Sunbird, and Korganizer.</para>
-    </formalpara>
-    <formalpara id="bsawccr">
-     <title>iCalendar or iCal (.ics):</title>
-     <para>A format for storing calendar files. iCalendar is used by Palm OS handhelds, Evolution, and Microsoft Outlook.</para>
-    </formalpara>
-    <formalpara id="b10ac57t">
-     <title>Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):</title>
-     <para>CSV or Tab files saved by using Evolution, Microsoft Outlook and Mozilla.</para>
-    </formalpara>
-    <formalpara id="bsawckg">
-     <title>Microsoft Outlook Express 4 (.mbx):</title>
-     <para>The email file format used by Microsoft Outlook Express 4. For other versions of Microsoft Outlook and Outlook Express, see the workaround described in <link linkend="bsawgkk">Step 1</link>.</para>
-    </formalpara>
-    <formalpara id="pst">
-     <title>Personal Storage Table (.pst):</title>
-     <para>A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook.</para>
-    </formalpara>
-    <formalpara id="bsawdfx">
-     <title>LDAP Data Interchange Format (.LDIF):</title>
-     <para>A standard data format for contact cards.</para>
-    </formalpara>
-    <formalpara id="bsawdmw">
-     <title>Berkley Mailbox (.mbox or null extension):</title>
-     <para>The email format used by Mozilla, Netscape, Evolution, Eudora&z-3rdParty;, and many other email clients.</para>
-    </formalpara>
-    <para>To import your old email:</para>
-    <orderedlist>
-     <listitem id="bsaweb1">
-      <para>Click File &gt; Import.</para>
-     </listitem>
-     <listitem id="bsaweiv">
-      <para>Click Forward.</para>
-     </listitem>
-     <listitem id="bsawely">
-      <para>Select Import a Single File, then click Forward.</para>
-      </listitem>
-     <listitem id="biyd1xa">
-      <para>Browse and find the location to save the imported email, then click Forward.</para>
-     </listitem>
-     <listitem id="bsawey0">
-      <para>Select the file to import, then click Forward.</para>
-     </listitem>
-     <listitem id="bsawf2t">
-      <para>Click Import.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="importing-preferences">
-    <title>Importing Multiple Files</title>
-    <para>Evolution automates the import process for several applications it can recognize.</para>
-    <orderedlist>
-     <listitem id="bsawfek">
-      <para>Click File &gt; Import.</para>
-     </listitem>
-     <listitem id="bsawfhu">
-      <para>Click Forward.</para>
-     </listitem>
-     <listitem id="bsawfiy">
-      <para>Select Import Data and Settings From Older Programs, then click Forward.</para>
-      <para>Follow the steps <link linkend="bsawely">Step 3</link> through <link linkend="bsawf2t">Step 5</link> to import.</para>
-      <para>Evolution searches for old mail programs and, if possible, imports the data from them.</para>
-     </listitem>
-    </orderedlist>
-    <para>Microsoft Outlook&z-3rdParty; and versions of Outlook Express after version 4 use proprietary formats that Evolution cannot read or import.</para>
-    <para>One migration method that works well is to use the Outport application. See <ulink url="http://outport.sourceforge.net">outport.sourceforge.net</ulink> for additional information. You can also import data into another Windows mail client such as Mozilla.</para>
-    <orderedlist>
-     <listitem id="bsawgkk">
-      <para>While in Windows, import your .pst files into Mozilla Mail (or another mail program such as Netscape or Eudora that uses the standard mbox format).</para>
-      <para>Before importing email from Netscape&z-3rdParty;, Mozilla and Netscape users need to click File &gt; Compact &gt; All Folders from within the Netscape or Mozilla mail tool. Otherwise, Evolution imports and undeletes the messages in your Trash folders.</para>
-     </listitem>
-     <listitem id="bsawh7h">
-      <para>Copy the files to the system or partition that Evolution is installed on.</para>
-     </listitem>
-     <listitem id="bsawhdw">
-      <para>Use the Evolution import tool to import the files.</para>
-     </listitem>
-    </orderedlist>
-    <para>For POP mail, filters are applied as messages are downloaded. For IMAP mail, filters are applied to new messages when you open the Inbox folder. On Exchange servers, filters are not applied until you select your Inbox folder and click Message &gt; Apply Filters, or press Ctrl+Y. To force your filters to act on all messages in the folder, select the entire folder by pressing Ctrl+A, then apply the filters by pressing Ctrl+Y.</para>
-   </section>
-  </section>
-
-  <section id="usage-mail-organize-columns">
-   <title>Sorting the Message List</title>
-   <para>Evolution helps you work by letting you sort your email. To sort by sender, subject, or date, click the bars with those labels at the top of the message list. The direction of the arrow next to the label indicates the direction of the sort. Click again, to sort them in reverse order. For example, click Date to sort messages by date from oldest to newest. Click again, and Evolution sorts the list from newest to oldest. You can also right-click the message header bars to get a set of sorting options, and to add to or remove columns from the message list.</para>
-   <para>To look at the complete headers for a message, click View &gt; All Message Headers. To see all message data, click View &gt; Message Source.</para>
-
-   <section id="b17qguvc">
-    <title>Sorting Mail In Email Threads</title>
-    <para>You can also choose a threaded message view. Click View &gt; Group By Threads to turn the threaded view on or off. When you select this option, Evolution groups the replies to a message with the original, so you can follow the thread of a conversation from one message to the next.</para>
-    <para>In a thread of conversation view, each new message is stacked below of the ones that arrived before it, so that the newest message is always the one you see first. Whenever a new message arrives to an old thread as a reply, you will see it below the parent message. You always see the thread based on the date of the recent message received. The threads are sorted by the date of most recent message in the threads.</para>
-    <tip>
-     <para>There is a GConf key to toggle between the collapsed or expanded state of mail thread. By default, it is collapsed and you can change this at /apps/evolution/mail/display/thread_expand. If the value is set to false, expanded state is remembered. When you restart Evolution, all the threads are arranged to this state. This is a highly advanced option only for the advanced users.</para>
-    </tip>
-   </section>
-
-   <section id="b17qgv2f">
-    <title>Sorting Mail with Column Headers</title>
-    <para>The message list normally has columns to indicate whether a message has been read, whether it has attachments, how important it is, and the sender, date, and subject. You can change the column order, or add and remove columns by dragging and dropping them.</para>
-   </section>
-
-   <section id="b17qgvet">
-    <title>Sorting Mail With Column Headers</title>
-    <para>In addition to it, Evolution enables you to sort your messages by using Sort-by list. You can use any of the criteria given in the Sort-by list such as <emphasis>sender, location, to, from, size</emphasis> and so forth to perform sorting. It returns the sorted email list that matches the criteria you have selected.</para>
-    <para>To sort messages, perform the following procedure:</para>
-    <orderedlist>
-     <listitem id="b131itxb">
-      <para>Right-click message header bar.</para>
-     </listitem>
-     <listitem id="b131iu51">
-      <para>Click Sort by to get a list of options.</para>
-      <formalpara id="b13sfwc8">
-       <title>Sort by:</title>
-       <para>Sorts the message by different criteria as listed below:</para>
-      </formalpara>
-      <itemizedlist>
-       <listitem>
-        <para>Recipients</para>
-       </listitem>
-       <listitem>
-        <para>Sender</para>
-       </listitem>
-       <listitem>
-        <para>Location</para>
-       </listitem>
-       <listitem>
-        <para>Sender</para>
-       </listitem>
-       <listitem>
-        <para>Due By</para>
-       </listitem>
-       <listitem>
-        <para>Follow Up Flag</para>
-       </listitem>
-       <listitem>
-        <para>Flag Status</para>
-       </listitem>
-       <listitem>
-        <para>Size</para>
-       </listitem>
-       <listitem>
-        <para>To</para>
-       </listitem>
-       <listitem>
-        <para>Received</para>
-       </listitem>
-       <listitem>
-        <para>Date</para>
-       </listitem>
-       <listitem>
-        <para>Subject</para>
-       </listitem>
-       <listitem>
-        <para>From</para>
-       </listitem>
-       <listitem>
-        <para>Attachment</para>
-       </listitem>
-       <listitem>
-        <para>Score</para>
-       </listitem>
-       <listitem>
-        <para>Flagged</para>
-       </listitem>
-       <listitem>
-        <para>Status</para>
-       </listitem>
-       <listitem>
-        <para>Custom</para>
-       </listitem>
-      </itemizedlist>
-      <note>
-       <para>Clicking each sort criteria cycles take you through three possibilities. Sort by criteria in ascending or descending order or unsort the message. When you click any of the sort criteria reiteratively, Evolution sorts the messages in a sequential order - ascending, descending and unsort. For example, when you click Recepients for the first time, Evolution sorts the messages by recipients in ascending order and for the second time, sorts in the reverse order. For the next click, messages will be displayed unsorted.</para>
-      </note>
-      <formalpara id="bsawhu7">
-       <title>Sort Ascending:</title>
-       <para>Sorts the messages top to bottom and returns you the sorted message list in the order of oldest to the latest.</para>
-      </formalpara>
-      <formalpara id="b1449089">
-       <title>Sort Descending:</title>
-       <para>Sort descending reverts the order and returns you the sorted message list in the order of newest to oldest.</para>
-      </formalpara>
-      <formalpara id="b144939d">
-       <title>Unsort:</title>
-       <para>Unsort removes sorting from this column, reverting to the order of messages as they were added to the folder.</para>
-      </formalpara>
-      <formalpara id="bsawiat">
-       <title>Removing a Column:</title>
-       <para>Remove this column from the display. You can also remove columns by dragging the header off the list and letting it drop.</para>
-      </formalpara>
-      <formalpara id="bsawie2">
-       <title>Adding a Column:</title>
-       <para>When you select this item, a dialog box appears, listing the possible columns. Drag the column you want into a space between existing column headers. A red arrow shows where the column will be placed.</para>
-      </formalpara>
-      <formalpara id="bsawiz9">
-       <title>Best Fit:</title>
-       <para>Automatically adjusts the widths of the columns for the most efficient use of space.</para>
-      </formalpara>
-      <formalpara id="bsawj3v">
-       <title>Customizing the Current View:</title>
-       <para>Choose this item to pick a more complex sort order for messages, or to choose which columns of information about your messages you want to display.</para>
-      </formalpara>
-     </listitem>
-     <listitem id="b131iudb">
-      <para>Select the search criteria from the list.</para>
-      <para>You can view the messages in the desired order in the message list.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="usage-mail-organize-columns-followup">
-    <title>Using the Follow-Up Feature</title>
-    <para>To make sure you don't forget about a message, you can use the follow-up feature.</para>
-    <orderedlist>
-     <listitem id="bsqbrxl">
-      <para>Select one or more messages.</para>
-     </listitem>
-     <listitem id="bsqbs0y">
-      <para>Right-click one of the messages.</para>
-     </listitem>
-     <listitem id="bsqbs6i">
-      <para>Click Mark for Follow Up.</para>
-     </listitem>
-    </orderedlist>
-    <para>You can also open the Flag to Follow Up window by</para>
-    <orderedlist>
-     <listitem id="b13tawzg">
-      <para>Selecting the messages.</para>
-     </listitem>
-     <listitem id="b13tax4b">
-      <para>Selecting the Message menu.</para>
-     </listitem>
-     <listitem id="b13taxf6">
-      <para>Clicking Mark as.</para>
-     </listitem>
-     <listitem id="b13taxls">
-      <para>Selecting Follow Up or pressing Shift+Ctrl+G.</para>
-      <para>A window opens to allow you to set the type of flag and the due date.</para>
-     </listitem>
-    </orderedlist>
-    <mediaobject id="b13tarj6"><imageobject><imagedata format="PNG" fileref="figures/evo_flag_follow_up_a.png"/></imageobject></mediaobject>
-    <para>The flag itself is the action you want to remind yourself about. Several are provided for you, such as Call, Forward and Reply, but you can enter your own note or action if you want.</para>
-    <para>After you have added a flag, you can mark it as complete or remove it entirely by right-clicking the message, then click either Flag Completed or Clear Flag.</para>
-    <para>When you read a flagged message, its flag status is displayed at the top, before the message headers. An overdue message might tell you <quote>Overdue: Call by April 07, 2003, 5:00 PM.</quote></para>
-    <para>Flags can help you organize your work in a number of ways. For example, you might add a Flag Status column to your message list and sort that way. Alternately, you could create a search folder that displays all your flagged messages, then clear the flags when you're done, so the search folder contains only messages with upcoming deadlines.</para>
-    <formalpara id="b17s9rir">
-     <title>Mark as Important Feature:</title>
-     <para>If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click Mark as Important or select Message &gt; Mark as &gt; Important from the menubar.</para>
-    </formalpara>
-   </section>
-  </section>
-
-  <section id="usage-mail-organize-folders">
-   <title>Getting Organized with Folders</title>
-   <para>Evolution, like most other mail systems, stores mail in folders. You start out with a few mail folders, such as Inbox, Outbox, and Drafts, but you can create as many as you like. Create new folders by clicking Folder &gt; New, or by right-clicking in the folder list and selecting New Folder.</para>
-   <para>When you click OK, your new folder appears in the folder view. You can then move the messages to it by dragging and dropping them, or right-click on the message and choose Move to folder, or press Shift+Ctrl+V.</para>
-   <para>You can also drop the messages to a particular folder by selecting Message &gt; Move to folder. This will open the Select folder window, where you can drop your message to any of the folders listed.</para>
-   <para>If you want to create a new folder click New at the bottom left of the window. Specify the location and enter the label of the folder in the entry box appeared at the top. You can also move the messages from one folder to another by selecting the message and then press the Move button at the bottom right.</para>
-   <para>If you create a filter with the filter assistant, you can have mail filed automatically. Select Edit &gt; Message Filters to bring up the Message Filters window.</para>
-   <para>Click on the Add button to bring up the Add Rule window from where you can set different criteria for filtering messages. For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
-   <note>
-    <para>The Inbox folder on most IMAP servers cannot contain both subfolders and messages. When you create additional folders on your IMAP mail server, branch them from the root of the IMAP account's folder tree, not from the Inbox. If you create subfolders in your Inbox folder, you lose the ability to read messages that exist in your Inbox until you move the folders out of the way.</para>
-   </note>
-  </section>
-
-  <section id="usage-mail-organize-search">
-   <title>Searching for Messages</title>
-   <para>Most email clients can search for messages for you, but Evolution does it differently and efficiently giving you faster search results with quick search, customized search and advanced search.</para>
-   <formalpara id="b131j1jn">
-    <title>Quick Search:</title>
-    <para>Quick Search displays all the messages that match the built-in criteria you selected from the drop-down list at the top left side, just above the message list.</para>
-   </formalpara>
-   <para>To perform a quick search:</para>
-   <orderedlist>
-    <listitem id="b131j296">
-     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
-    </listitem>
-    <listitem id="b131j2j8">
-     <para>Select the search criteria from the list:</para>
-     <itemizedlist>
-      <listitem>
-       <para>All Messages</para>
-      </listitem>
-      <listitem>
-       <para>Unread Messages</para>
-      </listitem>
-      <listitem>
-       <para>No Label</para>
-      </listitem>
-      <listitem>
-       <para>Important</para>
-      </listitem>
-      <listitem>
-       <para>Work</para>
-      </listitem>
-      <listitem>
-       <para>Personal</para>
-      </listitem>
-      <listitem>
-       <para>To do</para>
-      </listitem>
-      <listitem>
-       <para>Later</para>
-      </listitem>
-      <listitem>
-       <para>Read Messages</para>
-      </listitem>
-      <listitem>
-       <para>Recent Messages</para>
-      </listitem>
-      <listitem>
-       <para>Last 5 Days' Messages</para>
-      </listitem>
-      <listitem>
-       <para>Messages with Attachments</para>
-      </listitem>
-      <listitem>
-       <para>Important Messages</para>
-      </listitem>
-      <listitem>
-       <para>Messages Not Junk</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem id="b131j6sl">
-     <para>Evolution displays the messages matching the criteria present in the shown message list</para>
-    </listitem>
-   </orderedlist>
-   <tip>
-    <para>The following labels need not necessarily be the same as the default names listed here. You can change the name of these labels by selecting Edit &gt; Preferences &gt; Mail Preferences &gt; Colors.</para>
-    <itemizedlist>
-     <listitem>
-      <para>Important</para>
-     </listitem>
-     <listitem>
-      <para>Work</para>
-     </listitem>
-     <listitem>
-      <para>Personal</para>
-     </listitem>
-     <listitem>
-      <para>To do</para>
-     </listitem>
-     <listitem>
-      <para>Later</para>
-     </listitem>
-    </itemizedlist>
-   </tip>
-   <formalpara id="b131jgie">
-    <title>Customized Search:</title>
-    <para>Evolution allows you to perform customized search. To search for a message:</para>
-   </formalpara>
-   <orderedlist>
-    <listitem id="b131jhwt">
-     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
-     <formalpara id="b131lvi6">
-      <title>Subject or Sender Contain:</title>
-      <para>Finds messages that contain the search text in the subject or sender. It does not search in the message body.</para>
-     </formalpara>
-     <formalpara id="b131lx1i">
-      <title>Recipients Contain:</title>
-      <para>Finds messages with the search text in the To: and Cc: headers.</para>
-     </formalpara>
-     <formalpara id="b131m01u">
-      <title>Message Contains:</title>
-      <para>Searches the message body and all headers for the specified text.</para>
-     </formalpara>
-     <formalpara id="b131lvwy">
-      <title>Subject Contain:</title>
-      <para>Shows messages where the search text is in the subject line.</para>
-     </formalpara>
-     <formalpara id="b131lwe2">
-      <title>Sender Contain:</title>
-      <para>Finds messages whose From: header contains a match for your search text.</para>
-     </formalpara>
-     <formalpara id="b131lxie">
-      <title>Body Contains:</title>
-      <para>Searches only in message text, not any other header.</para>
-     </formalpara>
-    </listitem>
-    <listitem id="b131m0yx">
-     <para>Click the drop-down list to select the scope</para>
-     <itemizedlist>
-      <listitem>
-       <para>Current Folder</para>
-      </listitem>
-      <listitem>
-       <para>Current Account</para>
-      </listitem>
-      <listitem>
-       <para>All Accounts</para>
-      </listitem>
-      <listitem>
-       <para>Current Message</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem id="b131m1yz">
-     <para>Type the search string in the search entry and press Enter.</para>
-     <note>
-      <para>The folder list will be disabled while you perform search on All Accounts or Current Account.</para>
-     </note>
-    </listitem>
-   </orderedlist>
-   <para>Evolution shows your search results in the message list. You might want to create a search folder instead; see <link linkend="usage-mail-organize-vfolders">Using Search Folders</link> for more detail.</para>
-   <note>
-    <para>To clear your search you can click the Clear icon in the search string field, or choose Search &gt; Clear from the menubar, or enter a blank search. You can also press Shift+Ctrl+Q to clear the search.</para>
-   </note>
-   <tip>
-    <para>You can even perform a quick search on a customized search results as it just filters and displays the messages in the message list.</para>
-   </tip>
-   <formalpara id="b13tvajl">
-    <title>Advanced Search:</title>
-    <para> You can perform an advanced search based on any of the search types.</para>
-   </formalpara>
-   <orderedlist>
-    <listitem id="b13tvav6">
-     <para>Select the Search menu.</para>
-    </listitem>
-    <listitem id="b13tvb7l">
-     <para>Click Advanced Search to open the Advanced Search window.</para>
-     <mediaobject id="b13tvd61"><imageobject><imagedata format="PNG" fileref="figures/evo_adv_search_a.png"/></imageobject></mediaobject>
-     
-    </listitem>
-    <listitem id="b13tvdt8">
-     <para>Enter the Search name.</para>
-    </listitem>
-    <listitem id="b13tvet9">
-     <para>Click Add to add rules. For more information on rules, refer <link linkend="bsazsjd">Step 4</link> under <link linkend="vfolder-create">Creating A Search Folder</link>.</para>
-    </listitem>
-    <listitem id="b13tvira">
-     <para>Click OK.</para>
-    </listitem>
-    <listitem id="b13tviwm">
-     <para>Click Save to save your search results.</para>
-    </listitem>
-   </orderedlist>
-   <formalpara id="b13tvk69">
-    <title>Save Search:</title>
-    <para>To save your search results other than from advanced search, select Search &gt; Save Search. You can view the label of your search results listed under Search menu.</para>
-   </formalpara>
-   <formalpara id="b13tvnp3">
-    <title>Edit Saved Searches:</title>
-    <para>To edit your saved searches,</para>
-   </formalpara>
-   <orderedlist>
-    <listitem id="b13tw1cm">
-     <para>Select Search from the menu bar.</para>
-    </listitem>
-    <listitem id="b13tw2vp">
-     <para>Click Edit Saved Searches to open the Searches window.</para>
-     <mediaobject id="b13tw8de"><imageobject><imagedata format="PNG" fileref="figures/evo_edit_search.png"/></imageobject></mediaobject>
-     
-    </listitem>
-    <listitem id="b13tw8px">
-     <para>Click the Edit button to open the Edit Rule window.</para>
-     <para>You can also add or remove searches from the list by using the respective buttons available at the right.</para>
-          
-    </listitem>
-    <listitem id="b13twb4j">
-     <para>Edit the title or search criteria from the dialog box.</para>
-    </listitem>
-    <listitem id="b13twbu1">
-     <para>Click OK.</para>
-    </listitem>
-   </orderedlist>
-  </section>
-
-  <section id="usage-mail-organize-filters">
-   <title>Create Rules to Automatically Organize Mail</title>
-   <para>Filters work very much like the mail room in a large company. Their purpose is to bundle, sort, and distribute mail to the various folders. In addition, you can have multiple filters performing multiple actions that might effect the same message in several ways. For example, your filters could put copies of one message into multiple folders, or keep one copy and send one to another person.</para>
-
-   <section id="usage-mail-org-filters-new">
-    <title>Creating New Filter Rules</title>
-    <orderedlist>
-     <listitem id="bsazapz">
-      <para>Click Edit &gt; Message Filters.</para>
-     </listitem>
-     <listitem id="bsazaxn">
-      <para>Click Add.</para>
-     </listitem>
-     <listitem id="bsazayr">
-      <para>Type a name for the filter in the Rule name field.</para>
-      <mediaobject id="usage-mail-filter-fig-createrule"><imageobject><imagedata format="PNG" fileref="figures/filter-new-fig.png"/></imageobject></mediaobject>
-      
-     </listitem>
-     <listitem id="bsazb4y">
-      <para>Define the criteria for the filter in the first section.</para>
-      <para>For each of the filter criteria, you must first select which parts of the message you want to filter:</para>
-      <formalpara id="bsh25ic">
-       <title>Sender:</title>
-       <para>The sender's email address or the name of the sender.</para>
-      </formalpara>
-      <formalpara id="bsh25ui">
-       <title>Recipient:</title>
-       <para>The recipients of the message.</para>
-      </formalpara>
-      <formalpara id="bsh266q">
-       <title>Subject:</title>
-       <para>The subject line of the message.</para>
-      </formalpara>
-      <formalpara id="bshk9m6">
-       <title>Specific Header:</title>
-       <para>Any header including custom ones.</para>
-      </formalpara>
-      <para>If a message uses a header more than once, Evolution pays attention only to the first instance, even if the message defines the header differently the second time. For example, if a message declares the Resent-From: header as <quote>engineering@example.com</quote> and then restates it as <quote>marketing@example.com,</quote> Evolution filters as though the second declaration did not occur. To filter on messages that use headers multiple times, use a regular expression.</para>
-      <formalpara id="bshkazq">
-       <title>Message Body:</title>
-       <para>Searches in the actual text of the message.</para>
-      </formalpara>
-      <formalpara id="bshkb9x">
-       <title>Expression:</title>
-       <para>(For programmers only) Match a message according to an expression you write in the Scheme language used to define filters in Evolution.</para>
-      </formalpara>
-      <formalpara id="bshkbvl">
-       <title>Date Sent:</title>
-       <para>Filters messages according to the date on which they were sent. First, choose the conditions you want a message to meet, such as before a given time or after a given time. Then choose the time. The filter compares the message's time stamp to the system clock when the filter is run, or to a specific time and date you choose from a calendar. You can also have it look for a message within a range of time relative to the filter, such as two to four days ago.</para>
-      </formalpara>
-      <formalpara id="bshkcq6">
-       <title>Date Received:</title>
-       <para>This works the same way as the Date Sent option, except that it compares the time you received the message with the dates you specify.</para>
-      </formalpara>
-      <formalpara id="bshkcwe">
-       <title>Label:</title>
-       <para>Messages can have labels of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually.</para>
-      </formalpara>
-      <formalpara id="bshkdbe">
-       <title>Score:</title>
-       <para>Sets the message score to any whole number greater than 0. You can have one filter set or change a message score, and then set up another filter to move the messages you have scored. A message score is not based on anything in particular: it is simply a number you can assign to messages so other filters can process them.</para>
-      </formalpara>
-      <formalpara id="bshkdqm">
-       <title>Size:</title>
-       <para>Sorts based on the size of the message in kilobytes.</para>
-      </formalpara>
-      <formalpara id="bshkdww">
-       <title>Status:</title>
-       <para>Filters according to the status of a message. The status can be Replied To, Draft, Important, Read, or Junk.</para>
-      </formalpara>
-      <formalpara id="bshkeb2">
-       <title>Flagged:</title>
-       <para>Checks whether the message is flagged for follow-up.</para>
-      </formalpara>
-      <formalpara id="bshkej1">
-       <title>Attachments:</title>
-       <para>Creates a filter based on whether there is an attachment for the email.</para>
-      </formalpara>
-      <formalpara id="bshkev3">
-       <title>Mailing List </title>
-       <para>Filters based on the mailing list the message came from. This filter might miss messages from some list servers, because it checks for the X-BeenThere header, which is used to identify mailing lists or other redistributors of mail. Mail from list servers that do not set X-BeenThere properly are not be caught by these filters.</para>
-      </formalpara>
-      <formalpara id="bshkfrd">
-       <title>Regex Match:</title>
-       <para>If you know your way around a <link linkend="regular-expression">regex</link>, or regular expression, this option allows you to search for complex patterns of letters, so that you can find, for example, all words that start with a and end with m, and are between six and fifteen letters long, or all messages that declare a particular header twice. For information about how to use regular expressions, check the man page for the grep command.</para>
-      </formalpara>
-      <formalpara id="bshkggw">
-       <title>Source Account:</title>
-       <para>Filters messages according the server you got them from. This is most useful if you use multiple POP mail accounts.</para>
-      </formalpara>
-      <formalpara id="bshkgpo">
-       <title>Pipe to Program:</title>
-       <para>Evolution can use an external command to process a message, then process it based on the return value. Commands used in this way must return an integer. This is most commonly used to add an external junk mail filter.</para>
-      </formalpara>
-      <formalpara id="bshkgwb">
-       <title>Junk Test:</title>
-       <para>Filters based on the results of the junk mail test.</para>
-      </formalpara>
-      <formalpara id="bshkh3t">
-       <title>Select the Criteria for the Condition:</title>
-       <para>If you want multiple criteria for this filter, click Add and repeat step 4.</para>
-      </formalpara>
-      <formalpara id="bshkhi8">
-       <title>Select the Actions for the Filter in the Then Section:</title>
-       <para>Select any of the following options.</para>
-      </formalpara>
-      <itemizedlist>
-       <listitem>
-        <formalpara id="bsmr5pj">
-         <title>Move to Folder:</title>
-         <para>Moves the message into a folder you specify.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmr9sg">
-         <title>Copy to Folder:</title>
-         <para>Puts a copy of the message into a folder you specify.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmr9wy">
-         <title>Delete:</title>
-         <para>Marks the message for deletion. The message can be undeleted until you expunge or empty the trash.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmr9zn">
-         <title>Stop Processing:</title>
-         <para>Select this if you want to all other filters ignore this message. Note that only filters listed after this particular rule will be ignored.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmra5i">
-         <title>Assign Color:</title>
-         <para>Marks the message with a color of your choice.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmraa9">
-         <title>Assign Score:</title>
-         <para>Assigns the message a numeric score.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmrd39">
-         <title>Adjust Score:</title>
-         <para>Changes the numeric score by the amount you set.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmrd6f">
-         <title>Set Status:</title>
-         <para>Sets the status of the message. The status can be Replied To, Draft, Important, Read, or Junk.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmrd9c">
-         <title>Unset Status:</title>
-         <para>If the message has a status value, unsets it. If a status value is not set, it does nothing.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmrdcm">
-         <title>Beep:</title>
-         <para>Makes the system beep.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmrdey">
-         <title>Play Sound:</title>
-         <para>Select a sound file for Evolution to play.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmrdip">
-         <title>Pipe to Program:</title>
-         <para>Sends the message to a program of your choice. No return value is expected. This feature can be used to create automatic Web postings from email messages or to perform additional message post processing not supported by Evolution.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bsmrdm5">
-         <title>Run Program:</title>
-         <para>Evolution runs an application.</para>
-        </formalpara>
-       </listitem>
-      </itemizedlist>
-     </listitem>
-     <listitem id="bsazp1t">
-      <para>Click Add if you need multiple actions and click OK.</para>
-     </listitem>
-     <listitem id="bsazq81">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>There is an easy shortcut for fast filter or search folder creation:</para>
-    <orderedlist>
-     <listitem id="bsh2232">
-      <para>Right-click the message in the message list.</para>
-     </listitem>
-     <listitem id="bsh22bz">
-      <para>Select one of the items under the Create Rule From Message submenu.</para>
-      <para>Creating a rule based on a message opens the filter creation tool with some of the information about the message already filled in for your convenience.</para>
-     </listitem>
-    </orderedlist>
-    <para>If you have several filters that match a single message, they are all applied to the message in order, unless one of the filters has the Stop Processing action. If you use that action in a filter, the messages that it affects are not touched by other filters.</para>
-    <para>When you first open the Filters window, you are shown the list of filters sorted in the order in which they will be applied. You can move them up and down in the priority list by clicking the Up and Down buttons.</para>
-   </section>
-
-   <section id="filters-edit">
-    <title>Editing Filters</title>
-    <orderedlist>
-     <listitem id="bsazr7l">
-      <para>Click Edit &gt; Message Filters.</para>
-     </listitem>
-     <listitem id="bsazr9u">
-      <para>Select the filter to edit, then click Edit.</para>
-     </listitem>
-     <listitem id="bsazrhx">
-      <para>Make the desired corrections, then click OK twice.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="filters-deleting">
-    <title>Deleting Filters</title>
-    <orderedlist>
-     <listitem id="bsazrrq">
-      <para>Click Edit &gt; Message Filters.</para>
-     </listitem>
-     <listitem id="bsazrvn">
-      <para>Select the filter to remove, then click Remove.</para>
-     </listitem>
-     <listitem id="bsazryx">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-  </section>
-
-  <section id="usage-mail-organize-vfolders">
-   <title>Using Search Folders</title>
-   <para>If filters aren't flexible enough, or you find yourself performing the same search again and again, consider a search folder. Search folders are an advanced way of viewing your email messages within Evolution. If you get a lot of mail or often forget where you put messages, search folders can help you keep things organized.</para>
-   <para>A search folder is really a hybrid of all the other organizational tools: it looks like a folder, it acts like a search, and you set it up like a filter. In other words, a conventional folder actually contains messages, but a search folder is a view of messages that might be in several different folders. The messages it contains are determined on the fly using a set of criteria you choose in advance.</para>
-   <para>As messages that meet the search folder criteria arrive or are deleted, Evolution automatically adjusts the search folder contents. When you delete a message, it is erased from the folder in which it actually exists, as well as any search folders that display it.</para>
-   <para>The Unmatched Search Folder is the opposite of other search folders: it displays all messages that do not appear in other search folders.</para>
-   <para>If you use remote email storage like IMAP or Microsoft Exchange, and have created search folders to search through them, the Unmatched Search Folder also searches the remote folders. If you do not create any search folders that search remote mail stores, the Unmatched Search Folder does not search in them either.</para>
-   <para>As an example of using folders, searches, and search folders, consider the following: To organize his mailbox, Jim sets up a search folder for email from his friend and co-worker Anna. He has another search folder for messages that have novell.com in the address and Evolution in the subject line, so he can keep a record of what people from work send him about Evolution. If Anna sends him a message about anything other than Evolution, it only shows up in the <quote>Anna</quote> search folder. When Anna sends him mail about the user interface for Evolution, he can see the message both in the <quote>Anna</quote> search folder and in the <quote>Internal Evolution Discussion</quote> search folder.</para>
-
-   <section id="vfolder-create">
-    <title>Creating A Search Folder</title>
-    <orderedlist>
-     <listitem id="bsazs7h">
-      <para>Click Message &gt; Create Rule, then select a search folder based on Subject, Sender, Recipient, or Mailing List.</para>
-      <para>or</para>
-      <para>Select Search &gt; Create Search Folder From Search.</para>
-      <note>
-       <para>Perform this operation from the search results. Create a search folder from search is enabled only when you already have performed a search.</para>
-      </note>
-      <para>or</para>
-      <para>Select Edit &gt; Search Folder</para>
-     </listitem>
-     <listitem id="bsazsav">
-      <para>Click Add.</para>
-      <mediaobject id="usage-mail-vfolder-fig-createrule"><imageobject><imagedata format="PNG" fileref="figures/evo_rule_a.png"/></imageobject></mediaobject>
-      
-     </listitem>
-     <listitem id="bsazsbo">
-      <para>Type the name of the search folder in the Search name field.</para>
-     </listitem>
-     <listitem id="bsazsjd">
-      <para>Select your search criteria. For each criterion, you must first select which of the following parts of the message you want the search to examine. The criteria are almost similar to those for filters.</para>
-      <formalpara id="bshkrpc">
-       <title>Sender:</title>
-       <para>Sender's address.</para>
-      </formalpara>
-      <formalpara id="bshkrwe">
-       <title>Recipients:</title>
-       <para>The recipients of the message.</para>
-      </formalpara>
-      <formalpara id="bshks5p">
-       <title>Subject:</title>
-       <para>The subject line of the message.</para>
-      </formalpara>
-      <formalpara id="bshksea">
-       <title>Message Body:</title>
-       <para>Searches in the actual text of the message.</para>
-      </formalpara>
-      <formalpara id="bshkzum">
-       <title>Expression (for programmers only):</title>
-       <para>Match a message according to an expression you write in the Scheme language used to define filters in Evolution.</para>
-      </formalpara>
-      <formalpara id="bshkzun">
-       <title>Date Sent:</title>
-       <para>Filters messages according to the date on which they were sent. First, choose the conditions you want a message to meet, such as before a given time or after a given time. Then choose the time. The filter compares the message's time stamp to the system clock when the filter is run, or to a specific time and date you choose from a calendar. You can also have it look for a message within a range of time relative to the filter, such as two to four days ago.</para>
-      </formalpara>
-      <formalpara id="bshkzuo">
-       <title>Date Received:</title>
-       <para>This works the same way as the Date Sent option, except that it compares the time you received the message with the dates you specify.</para>
-      </formalpara>
-      <formalpara id="bshkzup">
-       <title>Label:</title>
-       <para>Messages can have labels of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually.</para>
-      </formalpara>
-      <formalpara id="bshkzuq">
-       <title>Score:</title>
-       <para>Sets the message score to any whole number greater than 0. You can have one filter set or change a message score, and then set up another filter to move the messages you have scored. A message score is not based on anything in particular: it is simply a number you can assign to messages so other filters can process them.</para>
-      </formalpara>
-      <formalpara id="bshkzur">
-       <title>Size:</title>
-       <para>Sorts based on the size of the message in kilobytes.</para>
-      </formalpara>
-      <formalpara id="bshkzus">
-       <title>Status:</title>
-       <para>Filters according to the status of a message. The status can be Replied To, Draft, Important, Read, or Junk.</para>
-      </formalpara>
-      <formalpara id="bshkzut">
-       <title>Follow Up:</title>
-       <para>Checks whether the message is flagged for follow-up.</para>
-      </formalpara>
-      <formalpara id="bshkzuu">
-       <title>Attachments:</title>
-       <para>Creates a filter based on whether there is an attachment for the email.</para>
-      </formalpara>
-      <formalpara id="bshkzuv">
-       <title>Mailing List:</title>
-       <para>Filters based on the mailing list the message came from. This filter might miss messages from some list servers, because it checks for the X-BeenThere header, which is used to identify mailing lists or other redistributors of mail. Mail from list servers that do not set X-BeenThere properly are not be caught by these filters.</para>
-      </formalpara>
-      <formalpara id="b13ttgjn">
-       <title>Match all:</title>
-       <para>Checks whether the message matchs all the criteria listed.</para>
-      </formalpara>
-     </listitem>
-     <listitem id="bsazxjk">
-      <para>Select which folders will be used for the search folder. Your options are:</para>
-      <formalpara id="bsmr82i">
-       <title> All local folders:</title>
-       <para>Uses all local folders for the search folder source in addition to individual folders that are selected.</para>
-      </formalpara>
-      <formalpara id="bsmr8jg">
-       <title>All active remote folders:</title>
-       <para>Remote folders are considered active if you are connected to the server; you must be connected to your mail server for the search folder to include any messages from that source in addition to individual folders that are selected.</para>
-      </formalpara>
-      <formalpara id="bsmr8zu">
-       <title>All local and active remote folders:</title>
-       <para>Uses all local and active remote folders for the search folder source in addition to individual folders that are selected.</para>
-      </formalpara>
-      <formalpara id="bsmr7jw">
-       <title>Specific folders only:</title>
-       <para>Uses individual folders for the search folder source.</para>
-      </formalpara>
-      <para>If you select Specific folders only,</para>
-      <orderedlist>
-       <listitem id="b13txae8">
-        <para>click Add button to open the Select folder window.</para>
-       </listitem>
-       <listitem id="b13txawl">
-        <para>Select the folder and press Add button.</para>
-       </listitem>
-      </orderedlist>
-      <para>You can view the folder added to the list in the entry box at the bottom of the New Search Folder window.</para>
-     </listitem>
-     <listitem id="bsazxwc">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-  </section>
-
-  <section id="usage-mail-organize-spam">
-   <title>Stopping Junk Mail (Spam)</title>
-   <para>Evolution can check for junk mail for you. Evolution uses SpamAssassin and/or Bogofilter with trainable Bayesian filters to perform the spam check. When the software detects mail that appears to be junk mail, it will flag it and hide it from your view. Messages that are flagged as junk mail are displayed only in the Junk folder.</para>
-   <para>The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it. When you first start using junk mail blocking, check the Junk folder to be sure that legitimate mail doesn't get flagged as junk mail. If legitimate mail is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting Mark as Not Junk or pressing Shift+Ctrl+J. If Evolution misses junk mail, right-click the message, then click Mark as Junk or press Ctrl+J. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on.</para>
-   <para>Every filter needs to learn at the least 100 spam and 100 ham to start working. For that, you must mark each message manually by clicking the <emphasis>Not junk</emphasis> button in the toolbar to learn that it is ham. The <emphasis>Junk</emphasis> button learns a message as spam.</para>
-   <para>To change your junk mail filtering preferences, click Edit &gt; Preferences, then click Mail Preferences.</para>
-   <para>For additional information on junk content, see <link linkend="mail-prefs-junk">Junk Mail Preferences</link>.</para>
-   <para>For additional junk mail settings, see <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
-   <note>
-    <para>SpamAssassin is an application that scans through the mail box to find junk mail. Evolution uses SpamAssassin as the default spam-filtering application. For more information, see<ulink url="http://spamassassin.apache.org/"> The Apache SpamAssassin Project</ulink>.</para>
-    <para>Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) by a statistical analysis of the message's header and content (body). It is able to learn from the user's classifications and corrections. For more information on Bogofilter, see <ulink url="http://bogofilter.sourceforge.net/">The Bogofilter site</ulink>.</para>
-   </note>
-  </section>
- </chapter>
-
- <chapter id="usage-contact">
-  <title>Evolution Contacts: the Address Book</title>
-  <para>This section shows you how to use the <trademark>Evolution</trademark> contacts tool to organize any amount of contact information, share addresses over a network, and save time with everyday tasks.</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="usage-contact-cards">Contacts and Cards</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="contact-search">Searching for Contacts</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-contact-organize">Organizing your Contacts</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-contact-sharing">LDAP: Shared Address Books on a Network</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="contact-automation-basic">Send Me a Card: Adding New Cards Quickly</link></para>
-   </listitem>
-  </itemizedlist>
-
-  <section id="usage-contact-cards">
-   <title>Contacts and Cards</title>
-   <para>Contacts are the individuals you have chosen to add to your address book so you can keep track of information about them and send email to them. In Evolution, an individual contact is called a card. For more information on organizing your contacts see <link linkend="usage-contact-organize">Organizing your Contacts</link>. To learn about configuring the contacts tool, see <link linkend="config-prefs-contact">Contact Management</link>.</para>
-
-   <section id="bsqchx3">
-    <title>The Contact Editor</title>
-    <para>If you want to add or change cards, use the contact editor. You can edit email addresses, telephone numbers, mailing addresses and all other contact information you have entered for a particular contact.</para>
-    <para>The contact editor window has three tabs:</para>
-    <formalpara id="b13psru7">
-     <title>Contact:</title>
-     <para>Contains basic contact information.</para>
-    </formalpara>
-    <formalpara id="b13pss9b">
-     <title>Personal Information:</title>
-     <para>Contains a more specific description of the person, including URLs for calendar and free/busy information.</para>
-    </formalpara>
-    <formalpara id="b13pssni">
-     <title>Mailing Address:</title>
-     <para>Contains the individual's mailing address.</para>
-    </formalpara>
-    <para>You can also use the Forward Contact menu item in the Action menu, which opens a new message with the card already attached, or Send Message to Contact, which opens a new message to the contact's email address.</para>
-    <para>You can add a card from within an email message or calendar appointment. In an open email, right-click any email address or message, and click Add to Address Book or select Add Sender to Address Book from the Message menu.</para>
-    <para>Most of the items in the contact editor simply display the information you enter, but some of them have additional features:</para>
-    <formalpara id="b13psuii">
-     <title>Full Name:</title>
-     <para>Specify the name of your contact here. You can type a name into the Full Name field, but you can also click the Full Name button to bring up a small dialog box with text boxes for first and last names, titles like <quote>Mr.</quote> or <quote>Her Excellency,</quote> and suffixes like <quote>Jr.</quote> The Full Name field also interacts with the File Under box to help you organize your contacts and to handle multi-word surnames. To see how it works, type a name in the Full Name field. As an example, we will use Miguel de Icaza. You will notice that the File Under field also fills in, but in reverse: Icaza, Miguel de. If you had entered John Q. Doe, the contacts editor would have correctly guessed that the entry should be filed under <quote>Doe, John Q.</quote> However, Miguel's surname, <quote>de Icaza,</quote> has two words, and to sort it correctly you must enter de Icaza, Miguel in the File Under entry.</para>
-    </formalpara>
-    <formalpara id="b13psvf3">
-     <title>Where:</title>
-     <para>Select one of your address books as the location for this contact. You might not be able to write to all available address books, especially those on a network.</para>
-    </formalpara>
-    <formalpara id="b13psvpv">
-     <title>Categories:</title>
-     <para>Click the Categories button to select categories for this card. If you assign contact categories, you can then search for contacts using those categories. For more information on contact categories, see <link linkend="usage-contact-organize">Organizing your Contacts</link></para>
-    </formalpara>
-    <formalpara id="b13psweg">
-     <title>Free/Busy and Calendar URLs:</title>
-     <para>Click the Personal Information tab to enter Web addresses for the contact. If the contact publishes free/busy or calendar data online, using a server other than Exchange or GroupWise, you can specify the addresses for those servers here. After you do so, you can check their schedules when creating appointments in the calendar.</para>
-    </formalpara>
-    <mediaobject id="usage-contact-editor-fig"><imageobject><imagedata format="PNG" fileref="figures/evo_contacteditor_a.png"/></imageobject></mediaobject>
-
-    <section id="b17s9rwk">
-     <title>Creating and Editing Contacts</title>
-     <para>Follow the steps given below to create a new card.</para>
-     <orderedlist>
-      <listitem id="b13prudx">
-      <para>Click File &gt; New &gt; Contact.</para>
-      </listitem>
-      <listitem id="b13prwao">
-       <para>Enter the contact information to the entry boxes provided.</para>
-      </listitem>
-      <listitem id="b13ps54o">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-     <para>If you want to change a card that already exists,</para>
-     <orderedlist>
-      <listitem id="b13ps1yb">
-       <para>Go to the Contacts window by selecting View &gt; Window &gt; Contacts from the menubar.</para>
-      </listitem>
-      <listitem id="b13ps28d">
-       <para>Double-click on the card you want to edit.</para>
-      </listitem>
-      <listitem id="b13ps3r7">
-       <para>Edit the information in the Contact Editor window.</para>
-      </listitem>
-      <listitem id="b13ps518">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-     <para>You can also edit the contact information from the preview pane.</para>
-     <orderedlist>
-      <listitem id="b13psb92">
-       <para>Right-click on the address from Message Header.</para>
-      </listitem>
-      <listitem id="b13psizd">
-       <para>Select Add to Address Book to bring up the Contact Quick-Add window.</para>
-       <mediaobject id="b13psl8w"><imageobject><imagedata format="PNG" fileref="figures/quick_add_a.png"/></imageobject></mediaobject>
-       
-      </listitem>
-      <listitem id="b13pslot">
-       <para>Press the Edit Full button at the bottom left to bring up the Contact Editor window.</para>
-      </listitem>
-      <listitem id="b13pslyy">
-       <para>Edit the information in the Contact Editor window.</para>
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-   </section>
-  
-   <section id="b1dl9th7">
-    <title>Google Contacts</title>
-    <para>Evolution allows you to access your Google Address Book. You can view the Google contacts offline and create, modify and delete the contacts online.</para>
-    <para>To configure your Google Address Book in Evolution contacts:</para>
-    <orderedlist>
-     <listitem id="b1dl9x1r">
-      <para>Click File &gt; New &gt; Address Book.</para>
-    
-     </listitem>
-     <listitem id="b1dl9x69">
-      <para>Select Google from the Type drop-down list.</para>
-     </listitem>
-     <listitem id="b1dl9z6j">
-      <para>Specify a name for the address book.</para>
-     </listitem>
-     <listitem id="b1dl9zh8">
-      <para>Select or deselect the following options and provide the username for the Google account:</para>
-      <itemizedlist>
-       <listitem>
-        <formalpara id="b1dla0di">
-         <title>Mark as default address book:</title>
-         <para>Select this option to make the Google address book as your default address book.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="b1dla0sn">
-         <title>Copy book content locally for offline operations:</title>
-         <para>Select this option to copy the address book to your machine so you can access the contacts even when you are not connected to the network.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="b1dla28w">
-         <title>Username:</title>
-         <para>Specify your username for your Google account.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="b1dla46h">
-         <title>Use SSL:</title>
-         <para> Select Use SSL to enable a secure connection between Evolution and the server.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="b1dla666">
-         <title>Refresh:</title>
-         <para>Set the time to automatically refresh the Google address book.</para>
-        </formalpara>
-       </listitem>
-      </itemizedlist>
-     </listitem>
-     <listitem id="b1dla994">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-  </section>
-  
-  <section id="contact-search">
-   <title>Searching for Contacts</title>
-   <formalpara id="b131mz65">
-    <title>Customized Search:</title>
-    <para>Evolution enables you to find the contact address quickly by using customized search. To find the contact address you are looking for, use the following procedure:</para>
-   </formalpara>
-   <orderedlist>
-    <listitem id="b131m9n2">
-     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
-    </listitem>
-    <listitem id="b131mb7o">
-     <para>Specify the search criteria from any of the following:</para>
-     <itemizedlist>
-      <listitem>
-       <para>Name contains</para>
-      </listitem>
-      <listitem>
-       <para>Email begins with</para>
-      </listitem>
-      <listitem>
-       <para>Any field contains</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem id="b131mgp9">
-     <para>Press Enter to begin the search.</para>
-    </listitem>
-   </orderedlist>
-   <para>For a more complex search, select Search Advanced and select criteria that describe your desired contact:</para>
-   <orderedlist>
-    <listitem id="bsb04xh">
-     <para>Name the rule in the Rule Name field.</para>
-    </listitem>
-    <listitem id="bsb050n">
-     <para>Set up your criteria in the Find items field.</para>
-    </listitem>
-    <listitem id="bsb0546">
-     <para>Select Add to add additional criteria.</para>
-    </listitem>
-    <listitem id="bsb05aw">
-     <para>Click OK.</para>
-    </listitem>
-   </orderedlist>
-   <para>To clear your search you can click the Clear icon in the search string field, or choose Search &gt; Clear from the menubar, or enter a blank search. You can also press Shift+Ctrl+Q to clear the search.</para>
-   <formalpara id="b131mh80">
-    <title>Quick Search:</title>
-    <para>Displays all the contacts that match the built-in criteria you have selected from the drop-down list at the top left side, just above the display pane.</para>
-   </formalpara>
-   <para>To perform quick search, use the following procedure:</para>
-   <orderedlist>
-    <listitem id="b131mjuy">
-     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
-    </listitem>
-    <listitem id="b131mkao">
-     <para>Select the search criteria from the list.</para>
-    </listitem>
-    <listitem id="b131mqyi">
-     <para>Evolution displays the desired contacts.</para>
-    </listitem>
-   </orderedlist>
-  </section>
-
-  <section id="usage-contact-organize">
-   <title>Organizing your Contacts</title>
-   <para>Evolution allows you to organize your contacts. You can create several individual address books, or contact lists. Within a given address book, you can have several categories of contacts.</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="usage-contact-organize-group">Contact Groups</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-contact-organize-group-list">Creating a List of Contacts</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-contact-organize-group-category">Grouping with Categories</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-contact-sharing-setup">Configuring Evolution to use LDAP</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="usage-contact-organize-group">
-    <title>Contact Groups</title>
-    <para>Contact groups are nothing but address books. The simplest way to organize contacts is to create additional address books. You can create a new one by clicking File &gt; New &gt; Address Book. For contacts groups on your computer, you only need to provide a name. For contacts on the network, you need to provide more information about the contacts server you are trying to access.</para>
-    <para>To move a card from one group to another, just drag it from the main display of contacts and drop it to a different group. You cannot change the contents of most network contact groups.</para>
-    <note>
-     <para>Contacts groups are not the same as contact lists. A contact group is like a folder or address book full of contacts. A contact list is a single contact that contains other contacts, and is most often used to email several people at once.</para>
-    </note>
-   </section>
-
-   <section id="bsqcii0">
-    <title>Importing Contacts</title>
-    <para>You can import contacts from other contact management tools with the Import tool.</para>
-    <orderedlist>
-     <listitem id="bsqciqk">
-      <para>Click File &gt; Import.</para>
-      <para>or</para>
-      <para>Mail yourself a contact as a vCard attachment.</para>
-      <para>Currently VCF and LDIF are supported. CSV and TAB format files are supported from Microsoft Outlook, Thunderbird, Mozilla, and Evolution.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="usage-contact-organize-group-list">
-    <title>Creating a List of Contacts</title>
-    <para>A contact list is a set of contacts with a single nickname that you create. When you send email to the nickname, it is sent to every member of the list. This differs from a network mailing list in that it exists only on your computer as a convenience to you, rather than as an actual email address managed by a mailing list application on a server.</para>
-    <para>For example, you could create one card for each family member, then add those cards to a contact list called <quote>Family.</quote> Then, instead of entering each person's email address individually, you can send email to <quote>Family</quote> and the message would go to all of them.</para>
-    <para> To create a list of contacts:</para>
-    <orderedlist>
-     <listitem id="bshlf6r">
-      <para>Open the list creation window by clicking the New List button.</para>
-      <para>or</para>
-      <para>Click File &gt; New &gt; Contact List.</para>
-     </listitem>
-     <listitem id="bshlfal">
-      <para>Specify a name for the list.</para>
-     </listitem>
-     <listitem id="bshlfcp">
-      <para>Specify the names or email addresses of contacts.</para>
-      <para>or</para>
-      <para>Drag contacts from the main window into the list.</para>
-     </listitem>
-     <listitem id="bshlfem">
-      <para>Choose whether you want to hide the email addresses when you send a message to the list.</para>
-      <para>Unless it is a very small list, it is recommended that you leave the addresses hidden. This is the same thing as using the <quote>Bcc:</quote> feature discussed in <link linkend="usage-mail-getnsend-send-to-types">Specifying Additional Recipients for Email</link>.</para>
-     </listitem>
-     <listitem id="bshlfgv">
-      <para>When you are finished, click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>The list appears as a contact card, which you can use as you would any other card, including mailing the list to another person and sending email to the list.</para>
-    <para>To mail the list, open a new email and type the name you chose for the list. Evolution addresses the message to the entire list when you send the message. You can also right-click the list's address card in the contacts tool and select Send Message to List.</para>
-    <para>Evolution cannot store contact lists on Microsoft Exchange servers.</para>
-   </section>
-
-   <section id="usage-contact-organize-group-category">
-    <title>Grouping with Categories</title>
-    <para>Another way to group cards is to mark them as belonging to different categories. You can mark a card as being in several categories or no category at all. For example, you put a friend's card in the <guilabel>Business</guilabel> category because he works with you and the <guilabel>Friends</guilabel> category because he's a friend.</para>
-    <para>To mark a card as belonging to a category,</para>
-    <orderedlist>
-     <listitem id="b13ptaog">
-      <para>Double-click the card to bring up the Contact Editor window.</para>
-     </listitem>
-     <listitem id="b13ptb98">
-      <para>Click the Categories button at the left.</para>
-      <para>The Categories window is shown below.</para>
-      <mediaobject id="b13pr0v9"><imageobject><imagedata format="PNG" fileref="figures/categories_a.png"/></imageobject></mediaobject>
-      
-     </listitem>
-     <listitem id="b13ptc7b">
-      <para>Select the category from the list. You can select as many or as few categories as you like.</para>
-     </listitem>
-    </orderedlist>
-    <para>If the master list of categories doesn't suit you, you can add your own categories. To add a new category,</para>
-    <orderedlist>
-     <listitem id="b13ptcwe">
-      <para>Enter the new category in the entry box at the top.</para>
-     </listitem>
-     <listitem id="b13ptef4">
-      <para>Click OK.</para>
-      <para>You can view the category name in the field next to Categories button in the Contact Editor window.</para>
-     </listitem>
-     <listitem id="b13ptgw7">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-    <tip>
-     <para>You can edit or set the color and icon for each categories available under categories list. To achieve that click the Edit button at the bottom of the Categories window. Press the Delete button to delete the items from the list.</para>
-    </tip>
-   </section>
-  </section>
-
-  <section id="usage-contact-sharing">
-   <title>LDAP: Shared Address Books on a Network</title>
-   <para>The <link linkend="ldap">LDAP</link> protocol was created to let users share contact information over a network by sharing access to a central directory. LDAP allows a company to maintain a shared set of contact information. Many companies keep a common LDAP address book for all their employees or for client contacts.</para>
-   <para>To learn how to add a remote LDAP directory to your available address books, see <link linkend="config-prefs-contact">Contact Management</link>. Remote groups of contacts appear under the On LDAP Servers item in the side bar. They work like a local folder of contact cards, with the following exceptions:</para>
-   <itemizedlist>
-    <listitem>
-     <para>Network folders are only available when you are connected to the network. If you use a laptop or have a modem connection, you might want to copy or cache some of the network directory. You do this by dragging and dropping your desired contacts into the local address books.</para>
-     <para>You can also mark the network folder for offline usage. To mark the folder, right-click the folder, click Properties and select Copy Folder Content Locally for Offline Operation.</para>
-    </listitem>
-    <listitem>
-     <para>To prevent excess network traffic, Evolution does not normally load data from the LDAP server upon opening.</para>
-    </listitem>
-    <listitem>
-     <para>Depending on your server settings, you might not be able to edit all the fields in a contact stored on an LDAP server. Some servers prohibit some or all changes, and others use a smaller set of fields than Evolution allows. Check with your system administrator if you need different settings.</para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="usage-contact-sharing-setup">
-    <title>Configuring Evolution to use LDAP</title>
-    <para>For information about setting up Evolution to use LDAP, refer to <link linkend="config-prefs-contact">Contact Management</link>.</para>
-   </section>
-  </section>
-
-  <section id="contact-automation-basic">
-   <title>Send Me a Card: Adding New Cards Quickly</title>
-   <para>When you get information about a person in the mail or in a calendar entry, you can add it to an address card. To do so, right-click any email address or email message, and click Add to Address Book on the menu that appears. If the sender already exists, the Editor button opens and you can edit the address card details. Evolution can also add cards from a hand-held device during a HotSync&z-3rdParty; operation. For more information, see <link linkend="config-sync">Synchronizing Your Handheld Device</link>.</para>
-  </section>
- </chapter>
-
- <chapter id="usage-calendar">
-  <title>Evolution Calendar</title>
-  <para>This section shows you how to use the <trademark>Evolution</trademark> Calendar to manage your schedule alone or in conjunction with peers. To learn about importing calendar data, see <link linkend="importing-mail">Importing Single Files</link>, which covers the Import tool.</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="usage-calendar-view">Ways of Looking at your Calendar</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-calendar-apts">Scheduling With the Evolution Calendar</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="CHDJAEFJ">Searching for Calendar Items</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="CHDFEJGG">Printing Displayed Items</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bshm4dy">Deleting Old Appointments and Meetings</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bxqatxt">Delegating Meetings</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-calendar-multiple">Multiple Calendars, Web Calendars, and CalDAV</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="usage-calendar-todo">The Task List</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="b1012vdd">Memos</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bshlzlu">Configuring Time Zones</link></para>
-   </listitem>
-  </itemizedlist>
-
-  <section id="usage-calendar-view">
-   <title>Ways of Looking at your Calendar</title>
-   <para>In Evolution, you can keep multiple calendars and overlay them one over the next. For example, you might have a schedule of events for work, one for home, and one for your favorite sports team. The side bar lists those calendars, and you can select or deselect the boxes next to them to show and hide the appointments in your calendar view. By hiding and showing different sets of appointments, you can be sure to avoid conflicts, while keeping a minimum of clutter in your view.</para>
-   <para>Appointments for each calendar appear as a different color.</para>
-   <para>The toolbar offers you five different buttons that can show you different views of your calendar.</para>
-   <informaltable>
-    <tgroup cols="2">
-     <colspec colwidth="2.844*" colname="1" colnum="1"/>
-     <colspec colwidth="2.844*" colname="2" colnum="2"/>
-     <thead valign="top">
-      <row id="b13bu0pg">
-       <entry colname="1">
-        <para>Calendar View</para>
-       </entry>
-       <entry colname="2">
-        <para>Shortcut Keys</para>
-       </entry>
-      </row>
-     </thead>
-     <tbody valign="top">
-      <row id="b13bu0ph">
-       <entry colname="1">
-        <para>Day</para>
-       </entry>
-       <entry colname="2">
-        <para>control+y</para>
-       </entry>
-      </row>
-      <row id="b13bu0pi">
-       <entry colname="1">
-        <para>Work Week</para>
-       </entry>
-       <entry colname="2">
-        <para>control+j</para>
-       </entry>
-      </row>
-      <row id="b13bu0pj">
-       <entry colname="1">
-        <para>Week</para>
-       </entry>
-       <entry colname="2">
-        <para>control+k</para>
-       </entry>
-      </row>
-      <row id="b13bu0pk">
-       <entry colname="1">
-        <para>Month</para>
-       </entry>
-       <entry colname="2">
-        <para>control+m</para>
-       </entry>
-      </row>
-      <row id="b13bu0pm">
-       <entry colname="1">
-        <para>List</para>
-       </entry>
-       <entry colname="2">
-        <para>control+l </para>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-   <para>You can also select an arbitrary range of days in the small calendar in the side bar. To do this, select the days that you want to view in your calendar.</para>
-   <para>The Previous and Next buttons move you forward and back in your calendar pages. If you are using a week or month view, you can move by week or month. To return to today's listing, click the Today button in the toolbar.</para>
-   <para>To visit calendar entries for a specific date, click Go To and select the date in the dialog box that appears.</para>
-
-   <section id="b13xy2ak">
-    <title>Calendar Properties</title>
-    <para>Evolution allows you to edit the label of your calendar, assign color, and copy content for offline use. To set your calendar properties</para>
-    <orderedlist>
-     <listitem id="b13xybev">
-      <para>Select the calendar from the side bar at the left.</para>
-     </listitem>
-     <listitem id="b13xyc0b">
-      <para>Right-click on the calendar.</para>
-     </listitem>
-     <listitem id="b13xyc3r">
-      <para>Select Properties to open Calendar Properties dialog box.</para>
-         
-     </listitem>
-     <listitem id="b13xyg92">
-      <para>Edit the label from Name field.</para>
-     </listitem>
-     <listitem id="b13xyirm">
-      <para>To assign a color for the calendar, click the Color button.</para>
-     </listitem>
-     <listitem id="b13xyj63">
-      <para>Select the color and click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>To mark your calendar content for offline use, click Copy calendar contents locally for offline operations.</para>
-    <para>Or</para>
-    <para>Right-click on the calendar at the left and select Mark Calendar for offline use. For more information on working offline refer <link linkend="usage-mail-getnsend-offline">Working Offline</link>.</para>
-    <tip>
-     <para>To export or share or to store a calendar locally in iCal format, right-click on the calendar in the calendar view at the left and select Save to Disk.</para>
-    </tip>
-    <para>Click Mark as default folder if you want to mark this folder as your default calendar folder.</para>
-    <section id="b1g4s6ns">
-     <title>Weather Calendar</title>
-     <para>In the Properties of a Weather calendar you can specify a location for the weather calendar. Click Location to select any world-wide location for the calendar.</para>
-     <mediaobject id="b1g4qrov"><imageobject><imagedata format="PNG" fileref="figures/evo_Wcal_prop_a.png"/></imageobject></mediaobject>
-     <para>The temperature for the selected location appears in units as specified at the top of the Calendar view.</para>
-
-   </section>
-  
-   <section id="b1a47igh">
-    <title>Google Calendar </title>
-    <para>Evolution allows you to access your Google calendar. You can view the Google calendar offline or create, modify, and delete the calendar items online. Google calendar uses the CalDAV interface.</para>
-    <para>To integrate the Google calendar to Evolution:</para>
-    <mediaobject id="b1a4ahp1"><imageobject><imagedata format="PNG" fileref="figures/google_cal_view.png"/></imageobject></mediaobject>
-    <orderedlist>
-     <listitem id="b1a47ou5">
-      <para>Click New, then select Calendar to open the New Calendar dialog.</para>
-     </listitem>
-     <listitem id="b1a49odb">
-      <para>Select Google from the Type drop-down list.</para>
-    
-     </listitem>
-     <listitem id="b1a4aebo">
-      <para>Specify the following:</para>
-      <itemizedlist>
-       <listitem>
-       <formalpara id="b1a4aey4">
-       <title>Name:</title>
-       <para>Specify a name for the Google calendar.</para>
-       </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="b1a4af9o">
-        <title>Username:</title>
-        <para>Specify your username for your Google account.</para>
-        </formalpara>
-       </listitem>
-      </itemizedlist>
-     </listitem>
-     <listitem id="b1a4ah6w">
-      <para>Set the time to automatically refresh the calendar.</para>
-     </listitem>
-     <listitem id="b1a4amec">
-      <para>If you want to set a color label for the calendar, click the Color tab, select the desired color, then click OK.</para>
-     </listitem>
-     <listitem id="b1a4ao1h">
-      <para>If you want to view the calendar items offline, select Copy calendar content locally for offline operation check box.</para>
-      <para>If you select this option, you cannot modify or create the calendar items.</para>
-     </listitem>
-     <listitem id="b1a4awms">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-    
-   </section>
-  </section>
-  </section>
-  <section id="usage-calendar-apts">
-   <title>Scheduling With the Evolution Calendar</title>
-   <para>There are two types of events you can schedule with Evolution: appointments and meetings. An appointment is an event you schedule for yourself only, and a meeting is an event that you schedule multiple people for. You can also use the busy/free search for meetings to determine the availability of invitees.</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="usage-calendar-apts-basic">Appointments</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-calendar-rsvp">Sending a Meeting Invitation</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="replying-to-rsvp">Accepting and Replying to a Meeting Request</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="receiving-rsvp-response">Reading Responses to Meeting Requests</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="tool_tip">Tool Tip View</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="usage-calendar-freebusy">Using the Free/Busy View</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="publishing-freebusy">Publishing Calendar and Free/Busy Information Without a Groupware Server</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="accessing-freebusy-offserver">Accessing Free/Busy Data Without a Groupware Server</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="usage-calendar-apts-basic">
-    <title>Appointments</title>
-    <para>In Evolution, an appointment is an event you schedule for yourself.</para>
-    <itemizedlist>
-     <listitem>
-      <para><link linkend="bxmtdx4">Creating Appointments</link></para>
-     </listitem>
-     <listitem>
-      <para><link linkend="bshly4v">Reminders</link></para>
-     </listitem>
-     <listitem>
-      <para><link linkend="bxmtbjb">Classifications</link></para>
-     </listitem>
-     <listitem>
-      <para><link linkend="bxmtcp3">Recurrence</link></para>
-     </listitem>
-    </itemizedlist>
-
-    <section id="bxmtdx4">
-     <title>Creating Appointments</title>
-     <orderedlist>
-      <listitem id="bshlods">
-       <para>Click File &gt; New &gt; Appointment.</para>
-       <para>or</para>
-       <para>Click Calendars on the Switcher, then click File, then New &gt; Appointment.</para>
-       <para>or</para>
-       <para>Double-click in a blank space on the calendar view to open an Appointment dialog box. The particular time on the calendar view against which you have double-clicked on will be suggested for the new appointment.</para>
-       <para>or</para>
-       <para>Select the required duration on the calendar view and enter the summary.</para>
-      </listitem>
-      <listitem id="b10fnwj2">
-       <para>Select a calendar in the Calendar drop-down list.</para>
-       <para>Enter a brief summary in the Summary field.</para>
-       <mediaobject id="b13uby19"><imageobject><imagedata format="PNG" fileref="figures/evo_calender_appointmnt.png"/></imageobject></mediaobject>
-       
-      </listitem>
-      <listitem id="b10fnwru">
-       <para>(Optional) Type a location in the Location field.</para>
-      </listitem>
-      <listitem id="b13uc0pd">
-       <para>Select the date and time.</para>
-      </listitem>
-      <listitem id="b13uc1k9">
-       <para>Enter a brief summary in the Summary field.</para>
-      </listitem>
-      <listitem id="b10fnwwl">
-       <para>To select this appointment as an all day event, click Options &gt; All Day Event.</para>
-       <para>or</para>
-       <para>Click the All Day Event button on the toolbar.</para>
-      </listitem>
-      <listitem id="b10fnxet">
-       <para>If the event is an all day event, specify a starting date and an ending date.</para>
-      </listitem>
-      <listitem id="b10fnxkk">
-       <para>If the event is not an all day event, specify a starting time and an ending time.</para>
-      </listitem>
-      <listitem id="b10fnxtn">
-       <para>Select For to specify the duration.</para>
-       <para>or</para>
-       <para>Select Until to specify the ending time of the event.</para>
-      </listitem>
-      <listitem id="b10fny4e">
-       <para>Type the time zone information in the Time Zone field.</para>
-       <para>or</para>
-       <para>Click the globe to customize the time zone.</para>
-       <para>To hide or show the Time Zone field, click View &gt; Time Zone.</para>
-      </listitem>
-      <listitem id="b10fnyrt">
-       <para>To show the time as busy, click Options &gt; Show Time as Busy.</para>
-      </listitem>
-      <listitem id="b10fnz0t">
-       <para>(Optional) Type a category in the Categories field.</para>
-       <para>To show or hide the Categories field, click View &gt; Categories.</para>
-      </listitem>
-      <listitem id="b10fo1zg">
-       <para>(Optional) Enter a description in the Description field.</para>
-      </listitem>
-      <listitem id="b10fo251">
-       <para>To create an alarm for this appointment, click Alarms on the toolbar, or click Options &gt; Alarms.</para>
-       <para>Select Customize to add or remove customized alarms for the event.</para>
-       <para>For more information on reminders, see <link linkend="bshly4v">Reminders</link>.</para>
-      </listitem>
-      <listitem id="b10fo3gm">
-       <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
-       <para>or</para>
-       <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
-      </listitem>
-      <listitem id="b10fo4ao">
-       <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential).</para>
-      </listitem>
-      <listitem id="b10fo4rj">
-       <para>(Optional) Click the Recurrence button on the toolbar.</para>
-       <para>or</para>
-       <para>Click Options &gt; Recurrence, and specify whether you want the appointment to recur and how often.</para>
-      </listitem>
-     </orderedlist>
-
-     <section id="b17sa034">
-      <title>All Day Event</title>
-      <para>An All Day event appears at the top of a day's appointment list, in the header under the date, rather than inside. That makes it easy to have appointments that overlap and fit inside each other. For example, a conference might be an All Day appointment, and the meetings at the conference could be timed appointments. Appointments with specific starting and ending times can also overlap. When they do they display as multiple columns in the day view of the calendar.</para>
-      <para>If you create calendar appointments that overlap, Evolution displays them side by side in your calendar.</para>
-         
-     </section>
-    </section>
-
-    <section id="bshly4v">
-     <title>Reminders</title>
-     <para>You can have several Reminders for individual appointments, any time prior to the appointment you schedule. You can have one reminder of each of the following types:</para>
-     <itemizedlist>
-      <listitem>
-       <formalpara id="bsb097g">
-        <title>Display:</title>
-        <para>A notification pops up on your screen to remind you of your appointment.</para>
-       </formalpara>
-      </listitem>
-      <listitem>
-       <formalpara id="bsb09dl">
-        <title>Audio:</title>
-        <para>Your computer delivers a sound alarm.</para>
-       </formalpara>
-      </listitem>
-      <listitem>
-       <formalpara id="bsb09hb">
-        <title>Program:</title>
-        <para>You can run a program as a reminder. You can enter its name in the text field, or find it with the Browse button.</para>
-       </formalpara>
-      </listitem>
-     </itemizedlist>
-     <para>Apart from the above notifications, the Evolution alarm icon blinks in the notification area. To pause the alarm or view the event, click the notification icon.</para>
-     <para>To create a reminder:</para>
-     <orderedlist>
-      <listitem id="bxmtait">
-       <para>To create an alarm for this appointment, click Alarms on the toolbar, or click Options, then Alarms.</para>
-      </listitem>
-      <listitem id="bzz2xh4">
-       <para>Select Customize to add or remove customized alarms for the event.</para>
-      </listitem>
-     </orderedlist>
-     <para>If you have stored reminders in a local calendar, they work from the moment you log in. However, for reminders stored on any remote server like GroupWise or Exchange which requires authentication, you must run Evolution at least once after logging in. No matter where the reminders are stored, you can quit Evolution and still be reminded of an upcoming appointment.</para>
-    </section>
-
-    <section id="bxmtbjb">
-     <title>Classifications</title>
-     <para>If you are using a calendar on a Novell <trademark class="registered">GroupWise</trademark> or Microsoft Exchange server, select a classification for the appointment to determine who can view it. Public is the default category, and a public appointment can be viewed by anyone on the calendar-sharing network. Private denotes one level of security, and Confidential an even higher level. The different levels vary depending on your server settings; check with your system administrator or adjust your delegation settings.</para>
-     <para>If you are using a Novell GroupWise or Microsoft Exchange server, other people on the server can check your schedule to see if you are available at any given time. If you have an appointment that is flexible or that you want to designate as Free rather than Busy time, select the Free box in the Show Time As section. Normally, appointments display as Busy.</para>
-     <para>You can categorize appointments in the same way you can categorize contacts.</para>
-     <orderedlist>
-      <listitem id="bzxwtyr">
-       <para>(Optional) Type a category in the Categories field.</para>
-      </listitem>
-      <listitem id="bsqcyli">
-       <para>Select the check box next to each category that matches the appointment you are creating.</para>
-      </listitem>
-      <listitem id="bzy02er">
-       <para>To show or hide the Categories field, click View &gt; Categories.</para>
-      </listitem>
-     </orderedlist>
-     <tip>
-      <para>You can add a new category to your category list by clicking Edit Master Category List, then click Click Here To Add A Category.</para>
-     </tip>
-     <para>After you have selected your categories, click OK to assign these categories to the appointment. The categories you selected are now listed in the text box to the right of the Categories button.</para>
-     <para>Appointments with categories appear with icons in the calendar display, and you can also search for appointments by category. To display only the appointments in a particular category, select the corresponding category in the search bar at the top of the calendar.</para>
-    </section>
-
-    <section id="bxmtcp3">
-     <title>Recurrence</title>
-     <para>The Recurrence tool button lets you describe repetition in appointments ranging from once every day up to once every 100 years. You can then choose a time and date when the appointment stops recurring, and, under Exceptions, pick individual days when the appointment does not recur. Make your selections from left to right, and you form a sentence: <quote>Every two weeks on Monday and Friday until January 3, 2008</quote> or <quote>Every month on the first Friday for 12 occurrences.</quote></para>
-     <para>After you have finished settings, click the Save button in the toolbar to save and close the appointment editor window. If you want, you can alter an appointment summary in the calendar view by clicking it and typing. You can change other settings by right-clicking the appointment then choosing Open, or double-clicking the appointment.</para>
-    </section>
-   </section>
-
-   <section id="usage-calendar-rsvp">
-    <title>Sending a Meeting Invitation</title>
-    <para>A meeting is an event you schedule for multiple people. Evolution can be used to schedule group meetings and help you manage responses to meeting requests.</para>
-    <para>When you create a meeting or group appointment, you can specify the attendees in several categories, such as <quote>chair</quote> or <quote>required</quote>. When you save the meeting listing, each attendee is sent an email with the meeting information, which also gives them the option to respond.</para>
-    <para>If you don't need to collect attendance information when you're scheduling an event, and would rather just announce the event, right-click the meeting and select Forward as iCalendar. This opens a new email message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it won't automatically send you email about whether they plan to attend.</para>
-    <para>To schedule a meeting:</para>
-    <orderedlist>
-     <listitem id="bsb0agm">
-      <para>Click File &gt; New &gt; Meeting.</para>
-     </listitem>
-     <listitem id="bsb0ao0">
-      <para>If you have multiple email accounts, select the one to use by selecting an item in the Organizer field.</para>
-     </listitem>
-     <listitem id="b10fof8d">
-      <para>Select a calendar in the Calendar drop-down list.</para>
-     </listitem>
-     <listitem id="b10fofba">
-      <para>Click Add to add the email addresses of people you want to invite.</para>
-     </listitem>
-     <listitem id="b10fofdk">
-      <para>To remove an attendee from the list, select an attendee and press Remove.</para>
-     </listitem>
-     <listitem id="b10fofpb">
-      <para>To edit a field, select the field and click Edit.</para>
-     </listitem>
-     <listitem id="b10fofs8">
-      <para>Click View on the menu bar to show or hide the Type, Role, Status, and RSVP fields.</para>
-     </listitem>
-     <listitem id="b10fofv1">
-      <para>Enter a brief summary in the Summary field.</para>
-     </listitem>
-     <listitem id="b10fofxb">
-      <para>(Optional) Type a location in the Location field.</para>
-     </listitem>
-     <listitem id="b10fofz9">
-       <para>To select this appointment as an all day event, click Options &gt; All Day Event.</para>
-       <para>or</para>
-       <para>Click the All Day Event button on the toolbar.</para>
-     </listitem>
-     <listitem id="b10fog24">
-      <para>If the event is an all day event, specify a starting date and an ending date.</para>
-     </listitem>
-     <listitem id="b10fog42">
-      <para>If the event is not an all day event, specify a starting time and an ending time.</para>
-     </listitem>
-     <listitem id="bzxwvrs">
-      <para>Select For to specify the duration.</para>
-      <para>or</para>
-      <para>Select Until to specify the ending time of the event.</para>
-     </listitem>
-     <listitem id="bzxys1w">
-      <para>Type the time zone information in the Time Zone field.</para>
-      <para>or</para>
-      <para>Click the globe to customize the time zone.</para>
-      <para>To hide or show the Time Zone field, click View &gt; Time Zone.</para>
-     </listitem>
-     <listitem id="b10foc50">
-      <para>To create an alarm for this appointment, click Alarms on the toolbar, or click Options &gt; Alarms.</para>
-      <para>Select Customize to add or remove customized alarms for the event.</para>
-      <para>For more information on reminders, see <link linkend="bshly4v">Reminders</link>.</para>
-     </listitem>
-     <listitem id="b10fof8e">
-      <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
-      <para>or</para>
-      <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
-     </listitem>
-     <listitem id="b10fof8f">
-      <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential).</para>
-     </listitem>
-     <listitem id="b10fof8g">
-      <para>(Optional) Click the Recurrence button on the toolbar.</para>
-      <para>or</para>
-      <para>Click Options &gt; Recurrence, and specify whether you want the appointment to recur and how often.</para>
-     </listitem>
-     <listitem id="bzy03l6">
-      <para>To query free/busy information for the attendees, click the Free/Busy button on the toolbar.</para>
-      <para>or</para>
-      <para>Click Options &gt; Free/Busy.</para>
-     </listitem>
-     <listitem id="bzy03nn">
-      <para>Click Save to save the meeting.</para>
-     </listitem>
-    </orderedlist>
-    <para>An email is sent out to all the recipients, inviting them to your event.</para>
-    <note>
-     <para>In Evolution, a meeting can have only one organizer, and only the organizer can add participants to that meeting. Though it is possible to change the organizer of a meeting, this is not recommended as a means to invite additional participants to meetings. If you want to invite additional people to a meeting and are not that meeting's organizer, it is recommended that you forward the invitation message you received from the original meeting organiser to additional participants.</para>
-    </note>
-   </section>
-
-   <section id="replying-to-rsvp">
-    <title>Accepting and Replying to a Meeting Request</title>
-    <para>Meeting requests are sent as iCal attachments. To view or respond to one, click the attachment icon and view it inline in the mail window. All the details are shown about the event, including time and dates. Then you can choose how to reply to the invitation. Your choices are:</para>
-    <itemizedlist>
-     <listitem>
-      <para>Accept</para>
-     </listitem>
-     <listitem>
-      <para>Tentatively Accept</para>
-     </listitem>
-     <listitem>
-      <para>Decline</para>
-     </listitem>
-    </itemizedlist>
-    <para>Click OK to send an email to the organizer with your answer. The event is also added to your calendar if you accept.</para>
-    <para>After you add the meeting to your calendar, you can make changes to the information, but if the original organizer sends out another update, your changes might be overwritten.</para>
-   </section>
-
-   <section id="receiving-rsvp-response">
-    <title>Reading Responses to Meeting Requests</title>
-    <para>When you get a reply to a meeting invitation you sent, you can view it inline by clicking the attachment and selecting View Inline.</para>
-   </section>
-
-   <section id="tool_tip">
-    <title>Tool Tip View</title>
-    <para>If you are in a hurry and you want to see the details of a meeting, mouse over the meeting in the calendar view. A tool tip appears with the details of the meeting. It will provide the agenda of the meeting, venue and time. If you are the organizer of the meeting, you can also view the status of the attendees, e.g. how many of them have accepted or declined the meeting request.</para>
-   </section>
-
-   <section id="usage-calendar-freebusy">
-    <title>Using the Free/Busy View</title>
-    <para>In addition to the standard meeting scheduling tools, you can use the Free/Busy view to check whether people are available in advance. The Free/Busy feature is normally a function of dedicated groupware servers such as Microsoft Exchange and Novell GroupWise. However, you can also publish Free/Busy information online, and access Free/Busy information published elsewhere. If not everyone you collaborate with publishes Free/Busy data, you can still use iCal event invitations to coordinate schedules with other people.</para>
-    <para>To access the free/busy view:</para>
-    <orderedlist>
-     <listitem id="bsbzmp5">
-      <para>Click File &gt; New &gt; Meeting.</para>
-     </listitem>
-     <listitem id="b10foig5">
-      <para>Click Add to add the email addresses of people you want to invite.</para>
-     </listitem>
-     <listitem id="bsb0c7x">
-      <para>Click the Free/Busy button on the toolbar, or click Options &gt; Free/Busy.</para>
-   
-     </listitem>
-     <listitem id="b10fogwo">
-      <para>Adjust the meeting time, either by dragging the meeting borders or by using the Autopick buttons to choose a time automatically, then click Save and Close. Attendees on an Exchange server have the appointment updated automatically; others receive email notification of any change in plans.</para>
-     </listitem>
-    </orderedlist>
-    <formalpara id="bsb0cyw">
-     <title>Attendee List:</title>
-     <para>The Attendee List shows the people who have been invited to the appointment.</para>
-    </formalpara>
-    <formalpara id="bsb0da3">
-     <title>Schedule Grid:</title>
-     <para>The Schedule Grid shows the published Free/Busy information for the people you have invited. This is where you compare schedules to find free time to schedule the appointment. Individuals have visible scheduling information only if they use the same Novell GroupWise or Microsoft Exchange server you do (that is, if they are in the same organization as you), or if they publish free/busy information at a URL you can reach and you have entered that URL into their contact cards using the contact editor.</para>
-    </formalpara>
-
-    <section id="publishing-freebusy">
-     <title>Publishing Calendar and Free/Busy Information Without a Groupware Server</title>
-     <para>You can publish Calendar and Free/Busy information to a WebDAV, FTP server, or remote machine through secure shell or other Web server with HTTP PUT support. Check with your system administrator if you are not sure you have this functionality.</para>
-     <para>To set up Calendar or Free/Busy publishing:</para>
-     <orderedlist>
-      <listitem id="bxpfdeu">
-       <para>Click Edit &gt; Preferences, then click Calendar and Tasks.</para>
-      </listitem>
-      <listitem id="bxpfdk4">
-       <para>Click the Calendar Publishing tab, click Add, then select the information you want to publish.</para>
-      </listitem>
-      <listitem id="bxpfdr3">
-       <para>Select the frequency with which you want to upload data.</para>
-      </listitem>
-      <listitem id="bxpfe22">
-       <para>Select the calendars you want to display data for.</para>
-      </listitem>
-      <listitem id="b10159gy">
-       <para>Specify the publishing location for the upload server.</para>
-      </listitem>
-      <listitem id="b1015cuo">
-       <para>Type your username and password.</para>
-      </listitem>
-      <listitem id="bxpfea9">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-     <para>To immediately publish calendar information, go to the Calendar tool and click Actions &gt; Publish Calendar Information.</para>
-     <note>
-      <para>You can specify a template to use when posting to the Free/Busy server.</para>
-     </note>
-    </section>
-
-    <section id="accessing-freebusy-offserver">
-     <title>Accessing Free/Busy Data Without a Groupware Server</title>
-     <para>If individuals give you a URL for Free/Busy data or for their Web calendar, you can enter it as part of the contact information in the Contacts tool. Then, when you schedule a meeting with them, Evolution looks up the schedule and displays it in the Free/Busy data.</para>
-    </section>
-   </section>
-  </section>
-
-  <section id="CHDJAEFJ">
-   <title>Searching for Calendar Items</title>
-   <para>You can use a customized search, an advanced search, or a quick search to search for Calendar items.</para>
-   <formalpara id="b131myk7">
-    <title>Customized Search:</title>
-    <para>Evolution enables you to find the Calendar items by using a Customized Search.</para>
-   </formalpara>
-   <orderedlist>
-    <listitem id="b131n1cx">
-     <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
-    </listitem>
-    <listitem id="b131n2au">
-     <para>Specify the search criteria from any of the following:</para>
-     <itemizedlist>
-      <listitem>
-       <para>Summary contains</para>
-      </listitem>
-      <listitem>
-       <para>Description contains</para>
-      </listitem>
-      <listitem>
-       <para>Any field Contains</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem id="b131n44f">
-     <para>Evolution displays the desired Calendar items.</para>
-    </listitem>
-   </orderedlist>
-   <formalpara id="b17qbhpu">
-    <title>Advanced Search:</title>
-    <para>You can perform an advanced search based on any of the search types.</para>
-   </formalpara>
-   <orderedlist>
-    <listitem id="b17qblvd">
-     <para>Select the Search menu.</para>
-    </listitem>
-    <listitem id="b17qbhvy">
-     <para>Select Advanced Search to open Advanced Search dialog box.</para>
-     <para>Search name field displays the search type you have selected.</para>
-          
-    </listitem>
-    <listitem id="b17qbiup">
-     <para>Click Add to add rules.</para>
-    </listitem>
-    <listitem id="b17qcpti">
-     <para>Select the criteria, and then type a search entry in the given field.</para>
-    </listitem>
-    <listitem id="b17qcr6c">
-     <para>Click OK.</para>
-    </listitem>
-    <listitem id="b17qbo55">
-     <para>Click Save to save your search results.</para>
-    </listitem>
-   </orderedlist>
-   <formalpara id="b131n58d">
-    <title>Quick Search:</title>
-    <para>Displays all the Calendar items that match the criteria that you have selected from the drop-down list in the Search bar.</para>
-   </formalpara>
-   <orderedlist>
-    <listitem id="b131n6zv">
-     <para>Click the Show drop-down list.</para>
-    </listitem>
-    <listitem id="b131n7gu">
-     <para>Select the search criteria from the list.</para>
-    </listitem>
-   </orderedlist>
-   <para>You can view the desired items listed in the Calendar view.</para>
-  </section>
-
-  <section id="CHDFEJGG">
-   <title>Printing Displayed Items</title>
-   <para>To print the displayed calendar items, click File &gt; Print.</para>
-  </section>
-
-  <section id="bshm4dy">
-   <title>Deleting Old Appointments and Meetings</title>
-   <para>Keeping a list of everything you did in the past eventually slows down your calendar. To delete old events, click Actions &gt; Purge, then enter the number of days of past events you want to keep. Click OK to purge the items.</para>
-  </section>
-
-  <section id="bxqatxt">
-   <title>Delegating Meetings</title>
-   <para>Only attendees of a meeting can delegate a meeting.</para>
-   <orderedlist>
-    <listitem id="bxqatxu">
-     <para>In the Calendar, right-click the meeting you want to delegate.</para>
-    </listitem>
-    <listitem id="bxqatxv">
-     <para>Click Delegate Meeting.</para>
-    </listitem>
-    <listitem id="bxqe3l9">
-     <para>Select the contacts you want to delegate the meeting to.</para>
-    </listitem>
-    <listitem id="bxqatxw">
-     <para>Click OK.</para>
-    </listitem>
-   </orderedlist>
-   <para>Each contact receives a copy of the meeting invitation.</para>
-  </section>
-
-  <section id="usage-calendar-multiple">
-   <title>Multiple Calendars, Web Calendars and CalDAV</title>
-   <para>To create a new calendar, click File &gt; New &gt; Calendar. If the calendar is one you plan to store locally, you need only provide a name and color. If it is a remote calendar, specify the name, color, URL, and a refresh frequency. The refresh frequency determines how often Evolution checks to see if the calendar has changed. If you are working with someone who publishes an online calendar, you might want to check for updates every thirty minutes. On the other hand, if you have displayed a sports team schedule in your calendar, you might not need to refresh it more than once a week.</para>
-   <para>The <ulink url="http://icalshare.com">icalshare.com Web site</ulink> has an extensive list of shared online calendars, including national and religious holidays, phases of the moon, sports, and local and regional events.</para>
-   <para>Evolution lets you view and manage calendars on remote CalDAV servers. The procedure to create a CalDAV calendar source is similar to that of a remote Web calendar source. You can view and create calendar events on CalDav accounts just like other calendars on Evolution.</para>
-   <para>You can view and manage local iCal or ics files in the Calendar view. Select the local iCal or ics files as calendar source to manage or view them in Evolution.</para>
-   <para>To access a local ics or iCal file in the Calendar view:</para>
-   <orderedlist>
-     <listitem>
-     <para>Click New, then select Calendar to open the New Calendar dialog.</para>
-     </listitem>
-     <listitem>
-     <para>Select On this computer from the Type drop-down list.</para>
-     </listitem>	
-     <listitem>
-     <para>In the Name field, specify a name for the local calendar.</para>
-     </listitem>
-     <listitem>
-     <para>Select customize options.</para>
-     </listitem>
-     <listitem> 
-     <para>In the File name field, give ics / ical file location as the calendar source.</para>
-     </listitem>
-     <listitem>
-     <para>In the Refresh field, choose refresh type from the drop-down list.</para>
-     </listitem> 
-     <listitem>
-     <para>Select the Force read only option if you want the calendar read-only.</para>
-     </listitem> 
-     <listitem>
-     <para>To set a color label for the calendar, click the Color tab, select the desired color, then click OK.</para>
-    </listitem>
-   </orderedlist>
-    <mediaobject><imageobject><imagedata format="PNG" fileref="figures/local_ics_calendar.png"/></imageobject></mediaobject>
-  </section>
-
-  <section id="usage-calendar-todo">
-   <title>The Task List</title>
-   <para>The Task List, located in the upper-right corner of the calendar, lets you keep a list of tasks separate from your calendar appointments.</para>
-   <para>You can use the list in a larger window by clicking the Tasks button in the side bar.</para>
-   <para>Task Lists are more easily organized in the dedicated Tasks tool. Each task list is assigned a color, and you can use the Tasks tool switcher to hide and show task lists just like calendars. In the calendar display task pad, tasks from all visible task lists appear, color coded by list.</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="CHDEGEBJ">Creating a New Task List</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="task-folders">Creating a New Task</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="b1012vcx">Assigned Tasks</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="CHDEGEBJ">
-    <title>Creating a New Task List</title>
-    <orderedlist>
-     <listitem id="b1047d8t">
-      <para>Click File &gt; New &gt; Task List.</para>
-     </listitem>
-     <listitem id="b1047d8u">
-      <para>Specify the name and color for the task list.</para>
-     </listitem>
-     <listitem id="b1047d8v">
-      <para>(Optional) If the task is an online list, specify the URL of the task list.</para>
-     </listitem>
-     <listitem id="b1047d8w">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>After you have added a task to your to-do list, its summary appears in the Summary section of the task list. To view or edit a detailed description of an item, double-click it, or right-click it and select Open. You can delete items by selecting them, then clicking Delete. The list of tasks is sorted in a similar way to the list of email messages in Evolution Mail. Click once on a message header to change the direction and type of sorting, or right-click to add or remove columns from the display.</para>
-   </section>
-
-   <section id="task-folders">
-    <title>Creating a New Task</title>
-    <orderedlist>
-     <listitem id="b10155hr">
-      <para>Click File &gt; New &gt; Task.</para>
-     </listitem>
-     <listitem id="b10155hs">
-      <para>Select a group for the task.</para>
-     </listitem>
-     <listitem id="b10155ht">
-      <para>Enter a brief summary in the Summary field.</para>
-     </listitem>
-     <listitem id="b10155hu">
-      <para>(Optional) Specify a starting date and ending date for the task.</para>
-     </listitem>
-     <listitem id="b10155hv">
-      <para>(Optional) Specify a starting time and ending time for the task.</para>
-     </listitem>
-     <listitem id="b10fqh6l">
-      <para>Type the time zone information in the Time Zone field.</para>
-      <para>or</para>
-      <para>Click the globe to customize the time zone.</para>
-      <para>To hide or show the Time Zone field, click View &gt; Time Zone.</para>
-     </listitem>
-     <listitem id="b10155hx">
-      <para>(Optional) Type a category in the Categories field.</para>
-      <para>To show or hide the Categories field, click View &gt; Categories.</para>
-     </listitem>
-     <listitem id="b10155hy">
-      <para>(Optional) Enter a description in the Description field.</para>
-     </listitem>
-     <listitem id="b10155hz">
-      <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential).</para>
-     </listitem>
-     <listitem id="b10155i0">
-      <para>(Optional) To specify a status for the task, click Options &gt; Status Details.</para>
-     </listitem>
-     <listitem id="b10fqh6m">
-      <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
-      <para>or</para>
-      <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="b1012vcx">
-    <title>Assigned Tasks</title>
-    <para>Evolution can be used to assign a task to multiple people.</para>
-    <para>When you assign a task, you can specify the attendees in several categories, such as <quote>chair</quote> or <quote>required.</quote> When you save the task, each attendee is sent an email with the task information, which also gives them the option to respond.</para>
-    <para>To assign a new task:</para>
-    <orderedlist>
-     <listitem id="b1012vcy">
-      <para>Click File &gt; New &gt; Assigned Task.</para>
-     </listitem>
-     <listitem id="b1012vcz">
-      <para>If you have multiple email accounts, select the one to use by selecting an item in the Organizer field.</para>
-     </listitem>
-     <listitem id="b1012vd0">
-      <para>Select a group for the task.</para>
-     </listitem>
-     <listitem id="b1012vd1">
-      <para>Click Add, or press Insert key, or right-click and then press Add to add the email addresses of people you want to assign the task. To remove an attendee from the list, select an attendee, then press Remove. To edit a field, select the field, then click Edit. Click View on the menu bar to show or hide the Type, Role, Status, and RSVP fields.</para>
-     </listitem>
-     <listitem id="b1012vd2">
-      <para>Enter a brief summary in the Summary field.</para>
-     </listitem>
-     <listitem id="b1012vd3">
-      <para>(Optional) Specify a starting date and time, and a due date and time for the task.</para>
-     </listitem>
-     <listitem id="b10fqh6n">
-      <para>Type the time zone information in the Time Zone field.</para>
-      <para>or</para>
-      <para>Click the globe to customize the time zone.</para>
-      <para>To hide or show the Time Zone field, click View &gt; Time Zone.</para>
-     </listitem>
-     <listitem id="b1012vd6">
-      <para>(Optional) Type a category in the Categories field.</para>
-      <para>To show or hide the Categories field, click View &gt; Categories.</para>
-     </listitem>
-     <listitem id="b1012vd7">
-      <para>(Optional) Enter a description in the Description field.</para>
-     </listitem>
-     <listitem id="b10fqh6o">
-      <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
-      <para>or</para>
-      <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
-     </listitem>
-     <listitem id="b10fqh6p">
-      <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential).</para>
-     </listitem>
-     <listitem id="b1012vda">
-      <para>(Optional) To specify a status for the task, click Options &gt; Status Details.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="b17qcv9q">
-    <title>Searching for Task Items</title>
-    <formalpara id="b17qcy13">
-     <title>Customized Search:</title>
-     <para>Evolution enables you to find the task items by using Customized Search.</para>
-    </formalpara>
-    <orderedlist>
-     <listitem id="b17qcy7p">
-      <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
-     </listitem>
-     <listitem id="b17qcyfg">
-      <para>Specify the search criteria from any of the following:</para>
-      <itemizedlist>
-       <listitem>
-        <para>Summary contains</para>
-       </listitem>
-       <listitem>
-        <para>Description contains</para>
-       </listitem>
-       <listitem>
-        <para>Any field Contains</para>
-       </listitem>
-      </itemizedlist>
-     </listitem>
-     <listitem id="b17qcypm">
-      <para>Evolution displays the desired Task items.</para>
-     </listitem>
-    </orderedlist>
-    <formalpara id="b17qczaw">
-     <title>Advanced Search:</title>
-     <para>You can perform an advanced search based on any of the search types.</para>
-    </formalpara>
-    <orderedlist>
-     <listitem id="b17qczhr">
-      <para>Select the Search menu.</para>
-      <para>Select Advanced Search to open Advanced Search dialog box.</para>
-      <para>Search name field displays the search type you have selected.</para>
-     </listitem>
-     <listitem id="b17qd03l">
-      <para>Click Add to add rules.</para>
-     </listitem>
-     <listitem id="b17qd0b1">
-      <para>Select the criteria, and then type a search entry in the given field.</para>
-     </listitem>
-    </orderedlist>
-    <formalpara id="b17qd1cq">
-     <title>Quick Search:</title>
-     <para>Displays all the task items that match the criteria that you have selected from the drop-down list at the top left side, just above the display pane.</para>
-    </formalpara>
-    <para>This feature provides the following best quick search options. This allows you to quickly see when tasks are due, as it can become unwieldy for planning if you have a lot of tasks in hand.</para>
-    <formalpara id="b17qeipm">
-     <title>Any Category:</title>
-     <para>Displays all the tasks that fall under any category.</para>
-    </formalpara>
-    <formalpara id="b17qej5f">
-     <title>Unmatched:</title>
-     <para>Displays all the tasks that do not fall under any of the categories listed here.</para>
-    </formalpara>
-    <formalpara id="b17qdqzj">
-     <title>Next 7 Days' Tasks:</title>
-     <para>Displays all the active tasks that are due within the next seven days.</para>
-    </formalpara>
-    <formalpara id="b17qdsg5">
-     <title>Active Tasks:</title>
-     <para>Displays all the tasks whose due date is yet to come. This allows you to see the date due for tasks due in the future.</para>
-    </formalpara>
-    <formalpara id="b17qeai3">
-     <title>Over Due Tasks:</title>
-     <para>Displays all the tasks whose end date has already passed.</para>
-    </formalpara>
-    <formalpara id="b17qed9o">
-     <title>Completed Tasks:</title>
-     <para>Displays the tasks whose status is 100% completed.</para>
-    </formalpara>
-    <formalpara id="b17qei0d">
-     <title>Tasks With Attachment:</title>
-     <para>Displays all the tasks with attachments.</para>
-    </formalpara>
-    <formalpara id="b17qejz7">
-     <title>&lt;List of Categories&gt;:</title>
-     <para>Lists all the tasks that belong to a particular category such as Anniversary, Holidays, Gifts, etc.</para>
-    </formalpara>
-    <para>To perform quick search,</para>
-    <orderedlist>
-     <listitem id="b17qd0pe">
-      <para>Click the Show drop-down list from the Search bar.</para>
-     </listitem>
-     <listitem id="b17qd0wm">
-      <para>Select the search criteria from the list.</para>
-     </listitem>
-    </orderedlist>
-    <para>You can view the desired items listed in the Task view.</para>
-   </section>
-  </section>
-
-  <section id="b1012vdd">
-   <title>Memos</title>
-   <para>In Evolution, the Memos component lets you create, edit, and store journal entries without dates, using the filesystem as a backend.</para>
-   <mediaobject id="b15ildhk"><imageobject><imagedata format="PNG" fileref="figures/evo_memo_a.png"/></imageobject></mediaobject>
-   <para>To create a new memo entry:</para>
-   <orderedlist>
-    <listitem id="b1012vde">
-     <para>Click File &gt; New &gt; Memo.</para>
-    </listitem>
-    <listitem id="b1012vdf">
-     <para>Select the Group in which you would like to create the entry.</para>
-    </listitem>
-    <listitem id="b1012vdg">
-     <para>(Optional) Type a category in the Categories field.</para>
-     <para>To show or hide Categories field, click View &gt; Categories.</para>
-    </listitem>
-    <listitem id="b1012vdh">
-     <para>Enter a brief summary in the Summary field.</para>
-    </listitem>
-    <listitem id="b15ilfa0">
-     <para>In the Start Date field, type the date this reminder note should appear in the recipients' Calendars.</para>
-    </listitem>
-    <listitem id="b15ilpb6">
-     <para>(Optional) Enter a description in the Description field.</para>
-    </listitem>
-    <listitem id="b10fqh6q">
-     <para>(Optional) To add an attachment, drag and drop the attachment into the attachment bar.</para>
-     <para>or</para>
-     <para>Click the Attach button on the toolbar, or click Insert &gt; Attachment and then browse to the attachment.</para>
-    </listitem>
-    <listitem id="b10fqh6r">
-     <para>(Optional) Click Options &gt; Classifications, then select a classification (as Public, Private or Confidential).</para>
-    </listitem>
-   </orderedlist>
-
-   <section id="b1012vdk">
-    <title>The Memo List</title>
-    <para>As with calendars and tasks, you can create multiple memo lists. Each memo list is assigned a color, and you can use the side bar to hide and show memo lists.</para>
-    <para>To create a new memo list:</para>
-    <orderedlist>
-     <listitem id="b1012vdl">
-      <para>Click File &gt; New &gt; Memo List.</para>
-     </listitem>
-     <listitem id="b1012vdm">
-      <para>Enter the type, name and color for the memo list.</para>
-     </listitem>
-     <listitem id="b1012vdo">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="b17qeph9">
-    <title>Searching for Memo Items</title>
-    <para>You can use a customized search, an advanced search, or a quick search to search for Memo Items.</para>
-    <formalpara id="b17qermf">
-     <title>Customized Search:</title>
-     <para>Evolution enables you to find the Memo items by using a Customized Search.</para>
-    </formalpara>
-    <orderedlist>
-     <listitem id="b17qers6">
-      <para>Click the search icon <inlinegraphic format="PNG" fileref="figures/stock_search.png"/> to expand the drop-down list.</para>
-     </listitem>
-     <listitem id="b17qerzd">
-      <para>Specify the search criteria from any of the following:</para>
-      <itemizedlist>
-       <listitem>
-        <para>Summary contains</para>
-       </listitem>
-       <listitem>
-        <para>Description contains</para>
-       </listitem>
-       <listitem>
-        <para>Any field Contains</para>
-       </listitem>
-      </itemizedlist>
-     </listitem>
-     <listitem id="b17qes70">
-      <para>Evolution displays the desired Calendar items.</para>
-     </listitem>
-    </orderedlist>
-    <formalpara id="b17qesf9">
-     <title>Advanced Search:</title>
-     <para> You can perform an advanced search based on any of the search types.</para>
-    </formalpara>
-    <orderedlist>
-     <listitem id="b17qetff">
-      <para>Select the desired search type from the drop-down list.</para>
-     </listitem>
-     <listitem id="b17qetjk">
-      <para>Select Advanced Search to open Advanced Search dialog box.</para>
-      <para>Search name field displays the search type you have selected.</para>
-     </listitem>
-     <listitem id="b17qetof">
-      <para>Click Add to add rules.</para>
-     </listitem>
-     <listitem id="b17qewzp">
-      <para>Select the criteria, and then type a search entry in the given field.</para>
-     </listitem>
-     <listitem id="b17qexap">
-      <para>Click OK.</para>
-     </listitem>
-     <listitem id="b17qey4k">
-      <para>Click Save to save your search results.</para>
-     </listitem>
-    </orderedlist>
-    <formalpara id="b17qeyur">
-     <title>Quick Search:</title>
-     <para>Displays all the Memo items that match the criteria that you have selected from the Show drop-down list in the Search bar.</para>
-    </formalpara>
-    <orderedlist>
-     <listitem id="b17qezgk">
-      <para>Click the Show drop-down list.</para>
-     </listitem>
-     <listitem id="b17qezl9">
-      <para>Select the search criteria from the list.</para>
-      <para>You can view the desired items listed in the Memo view.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-  </section>
-
-  <section id="bshlzlu">
-   <title>Configuring Time Zones</title>
-   <para>Evolution supports the use of multiple time zones.</para>
-   <para>If you share calendar files with friends or co-workers, you might need to configure your time zone.</para>
-   <orderedlist>
-    <listitem id="bsb07m1">
-     <para>Click Edit &gt; Preferences, then click Calendar and Tasks.</para>
-    </listitem>
-    <listitem id="bsb07qx">
-     <para>Click the icon next to the Time Zone field, then select your location.</para>
-     <para>Each red dot represents a major city.</para>
-    </listitem>
-    <listitem id="bsb08u5">
-     <para>Select a city, then click OK.</para>
-    </listitem>
-   </orderedlist>
-   <para>You can also configure time zone information specific to each appointment. To do that, simply create a new appointment and click the globe to customize the time zone that the time exists in. For example, if you live in New York but have a telephone meeting set for noon with someone in California, you need to make sure that your schedules are coordinated. Setting time zones on a per-appointment basis helps avoid that potential confusion.</para>
-  </section>
-
-  <section id="bxqaqja">
-   <title>Marcus Bains Line</title>
-   <para>The Marcus Bains Line is a marker to show the current date and time. This feature is available in the Evolution calendar.</para>
-  </section>
- </chapter>
-
- <chapter id="usage-exchange">
-  <title>Connecting to Exchange Servers</title>
-  <para><trademark>Evolution</trademark> Exchange for Microsoft Exchange allows Evolution clients to access accounts on Microsoft Exchange 2000 and 2003 servers. Like Evolution, it is free software and is licensed under the GPL.</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="features">Evolution Exchange Features</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="exchange-configure">Adding Your Exchange Account to Evolution</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="access">Accessing the Exchange Server</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="exchange-settings">Settings Exclusive to Evolution Exchange</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="full-advantage">Scheduling Meetings with Free/Busy</link></para>
-   </listitem>
-  </itemizedlist>
-  <important>
-   <para>Evolution Exchange works only with Exchange 2000 and later, and requires that Outlook Web Access be enabled. Each user needs a valid Microsoft Exchange server account, including a license.</para>
-  </important>
-
-  <section id="features">
-   <title>Evolution Exchange Features</title>
-   <para>Evolution Exchange supports the following basic Microsoft Exchange features:</para>
-   <itemizedlist>
-    <listitem>
-     <para>General</para>
-     <itemizedlist>
-      <listitem>
-       <formalpara id="b10fqhlv">
-        <title>Remote Exchange Information Store:</title>
-        <para>Allows you to access mail, address book (including the Global Address List folder), calendars, and task folders on an Exchange server from Evolution.</para>
-       </formalpara>
-      </listitem>
-      <listitem>
-       <formalpara id="b10fqhyb">
-        <title>Palm Synchronization:</title>
-        <para>Supported for Contacts and Calendars on Exchange.</para>
-       </formalpara>
-      </listitem>
-      <listitem>
-       <formalpara id="b10fqi3n">
-        <title>Password Management:</title>
-        <para>Allows you to reset your password. If your password has expired, Evolution asks you to change your password at startup.</para>
-       </formalpara>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem>
-     <para>Mail</para>
-     <itemizedlist>
-      <listitem>
-       <formalpara id="b10fqio8">
-        <title>Viewing Mail in Exchange Folders:</title>
-        <para>Mail stored on the Exchange server is visible in the Mail component in Evolution.</para>
-       </formalpara>
-      </listitem>
-      <listitem>
-       <formalpara id="b10fqiuh">
-        <title>Sending Email via Exchange Protocols:</title>
-        <para>If you use the Microsoft Exchange mail transport protocol to send email, make sure that the address you have entered as your email address is exactly the one that is registered on the Exchange server. This might be <quote>yourname@exchange-server.example.com</quote> rather than <quote>yourname@example.com</quote>.</para>
-       </formalpara>
-      </listitem>
-      <listitem>
-       <formalpara id="b13pa41j">
-        <title>Out of Office Message:</title>
-        <para>You can set <quote>out of Office</quote> message that will automatically be sent to people who send mail to you while you are away from office.</para>
-       </formalpara>
-      </listitem>
-      <listitem>
-       <formalpara id="b15fkslg">
-        <title>Send Options:</title>
-        <para>You can set the priority and sensitivity of the sent message so that the recipients will know how important the message is. You can also enable delivery receipt request and read receipt request for the messages sent.</para>
-       </formalpara>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem>
-     <para>Calendar </para>
-     <itemizedlist>
-      <listitem>
-       <formalpara id="b10fqjl1">
-        <title>Meeting Requests/Proposal:</title>
-        <para>Allows Evolution users to schedule meetings. You can check when other users are busy according to their calendars and send the meeting requests accordingly.</para>
-       </formalpara>
-      </listitem>
-      <listitem>
-       <formalpara id="b10fqjsl">
-        <title>Adding iCalendar Meeting Requests to the Calendar:</title>
-        <para>Allows you to add the iCalendar meeting requests you receive to your Exchange calendar. Note that you need to specify the calendar from the list, to which you want to add your meeting schedules.</para>
-       </formalpara>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem>
-     <para>Contacts</para>
-     <itemizedlist>
-      <listitem>
-       <formalpara id="b10fqjzj">
-        <title>Address Completion:</title>
-        <para>Supported for your Exchange Contacts folder.</para>
-       </formalpara>
-      </listitem>
-      <listitem>
-       <formalpara id="b10fqk4l">
-        <title>Adding vCards to the Address Book:</title>
-        <para>Allows you to save the vCards that you receive as attachments to your Exchange address book. New Address Book entries can also be created on Exchange from received email messages with a single click.</para>
-       </formalpara>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem>
-     <para>Work Offline (disconnected mode)</para>
-     <para>To mark a folder for offline usage, right-click the folder, then click Properties. Click Copy Folder Content Locally for Offline Operation. For more information see <link linkend="usage-mail-getnsend-offline">Working Offline</link>.</para>
-    </listitem>
-   </itemizedlist>
-   <itemizedlist>
-    <listitem>
-     <para>Recall Message function is not available.</para>
-    </listitem>
-   </itemizedlist>
-  </section>
-
-  <section id="exchange-configure">
-   <title>Adding Your Exchange Account to Evolution</title>
-   <para>After you have installed Evolution Exchange, you need to set up access for your Exchange account on both the Exchange server and within Evolution.</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="config-server">Exchange Server Settings</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="config-client">Standard Configuration Tool for Evolution Exchange</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="config-easy">Simple Configuration Tool for Evolution Exchange</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="config-exchange-new-account">Creating a New Exchange Account</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="config-exchange-existing-account">Configuring an Existing Account for Evolution Exchange Account</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="config-server">
-    <title>Exchange Server Settings</title>
-    <para>Check with your system administrator to ensure that:</para>
-    <itemizedlist>
-     <listitem>
-      <para>You have a valid account on the Exchange server.</para>
-     </listitem>
-     <listitem>
-      <para>You are permitted to access the account with WebDAV. This is the default setting for the Exchange server, so unless your system administrator has specifically turned it off, no changes should be necessary.</para>
-     </listitem>
-    </itemizedlist>
-    <para>The <ulink url="http://support.novell.com"><trademark class="registered">Novell</trademark> Web site Knowledgebase</ulink> has additional information about checking to make sure that your Exchange server accepts connections from Evolution.</para>
-   </section>
-
-   <section id="config-client">
-    <title>Standard Configuration Tool for Evolution Exchange</title>
-    <para>When you know that your server is ready for you to connect, you are ready to add your Exchange account to Evolution Exchange.</para>
-
-    <section id="config-easy">
-     <title>Simple Configuration Tool for Evolution Exchange</title>
-     <para>Evolution Exchange comes with a simple account creation tool for Exchange accounts.</para>
-     <para>If you have no accounts configured, the simple account configuration assistant starts when you start Evolution. It asks only for the Outlook Web Access URL, and your username and password. Evolution Exchange determines the remaining information for you.</para>
-     <para>If the simple account configuration tool does not run automatically, you need to create an account manually. For more information on how to do this, see <link linkend="config-exchange-new-account">Creating a New Exchange Account</link>.</para>
-    </section>
-
-    <section id="config-exchange-new-account">
-     <title>Creating a New Exchange Account</title>
-     <orderedlist>
-      <listitem id="bshnbof">
-       <para>Select Edit &gt; Preferences.</para>
-      </listitem>
-      <listitem id="bshnbsi">
-       <para>Click Add.</para>
-             
-      </listitem>
-      <listitem id="bshnbxz">
-       <para>Create the account following the procedure in <link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link>. Remember to select Microsoft Exchange as server type in the Receiving Mail section.</para>
-       <mediaobject id="bs4aw7k"><imageobject><imagedata format="PNG" fileref="figures/exchng-rec-mails.png"/></imageobject></mediaobject>
-       
-      </listitem>
-     </orderedlist>
-     <note>
-      <para>Only one Microsoft Exchange account can be configured in Evolution.</para>
-     </note>
-     <mediaobject id="bs4aw7l"><imageobject><imagedata format="PNG" fileref="figures/exchng-rec-options.png"/></imageobject></mediaobject>
-     
-    </section>
-
-    <section id="config-exchange-existing-account">
-     <title>Configuring an Existing Account for Evolution Exchange Account</title>
-     <para>Use the following procedure to configure your existing account for Evolution Exchange:</para>
-     <orderedlist>
-      <listitem id="bsqdqje">
-       <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-      </listitem>
-      <listitem id="bsqdqvl">
-       <para>Select the account you want to convert, then click Edit.</para>
-       <para>Click the Identity tab.</para>
-      </listitem>
-      <listitem id="bshngg7">
-       <para>Change your email address as needed.</para>
-      </listitem>
-      <listitem id="bshngsm">
-       <para>Click the Receiving Mail tab, then select Microsoft Exchange as your server type.</para>
-      </listitem>
-      <listitem id="bshnh8h">
-       <para>Type your user name, and the Outlook Web Access (OWA) URL. Click Authenticate, then enter the password at the prompt. The Exchange server authenticates your account.</para>
-      </listitem>
-      <listitem id="bxpfgk7">
-       <para>Select your authentication type in the Authentication list.</para>
-      </listitem>
-      <listitem id="bshnhvg">
-       <para>Click the Receiving Options tab.</para>
-       <para>Specify how often to check for new mail, your Global Catalog server name and whether to apply filters to messages in your Inbox, check for junk, set a password expiry period, and any other settings you want to include.</para>
-      </listitem>
-      <listitem id="bshnjw0">
-       <para>Use the Defaults tab to define folders, send CC or BCC messages to certain email addresses, and set options for message receipts.</para>
-      </listitem>
-      <listitem id="bshnkmu">
-       <para>Use the Security tab to set PGP and S/MIME options.</para>
-      </listitem>
-      <listitem id="bxn65fw">
-       <para>Quit Evolution and restart it.</para>
-       <para>Changes to Evolution Exchange accounts configuration are not active until you have restarted the application.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-   </section>
-  </section>
-
-  <section id="access">
-   <title>Accessing the Exchange Server</title>
-   <para>When you have installed Evolution Exchange, you can access public folders and perform certain Exchange actions like delegation and password management, and subscribing to other user's calendars, tasks, and contact folders. You can also carry out any folder-related operations like adding, deleting, and renaming folders, and selecting folder permissions on calendars, tasks, and contact folders. Use the regular Mail tool for mail, the Contacts tool for contacts, and the Calendar tool for setting schedules.</para>
-   <para>If you are using both an Exchange account and a local mail account, you should be aware that whenever you save an email address or appointment from an email message, it is saved in your Exchange contacts list or calendar, rather than in your local account. The same is true for synchronization with Palm OS devices; tasks, and appointments. Addresses from your Palm OS device are synchronized in the Exchange folders rather than in local folders.</para>
-   <para>To avoid unnecessary strain on the server, the Global Address List (GAL) appears empty until you search for something in it.</para>
-   <para></para>
-  </section>
-
-  <section id="exchange-settings">
-   <title>Settings Exclusive to Evolution Exchange</title>
-   <para>There are some settings in Evolution that are available only with Evolution Exchange, like delegation and permission handling, creating <quote>Out of Office</quote> messages, changing password and viewing folder size.</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="b15flgn7">Send Options</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="exchange-delegate">Access Delegation</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="exchange-delegate-to-others">Delegating Access to Others</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="exchange-delegated-to-you">Subscribe to Other Users' Folders</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bxn827k">Subscribe to Public Folders</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="exchange-out-of-office">Setting an Out of Office Message</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="full-advantage">Scheduling Meetings with Free/Busy</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="b15flgn7">
-    <title>Send Options</title>
-    <para>You can set the priority and sensitivity of the sent message from an exchange account so that the recipients will know how important the message is. The priority can have one of the three options: High, Normal or Low; and sensitivity can have one of the four options: Normal, Personal, Private and Confidential. You can also enable delivery receipt request and read receipt request for the messages sent.</para>
-
-    <section id="b17reifv">
-     <title>Tracking Options</title>
-     <para>Evolution lets you track the status of an item you have sent. You can enable the Delivery Receipt request as well as Read Receipt request so that you will know when the item reached the recipients or read by them.</para>
-     <para>To set the importance and sensitivity of the message:</para>
-     <orderedlist>
-      <listitem id="b15flkfv">
-       <para>Open a Compose Message window.</para>
-      </listitem>
-      <listitem id="b15fllby">
-       <para>Select the exchange account from the From field.</para>
-      </listitem>
-      <listitem id="b15flmjn">
-       <para>Click Insert &gt; Send Options.</para>
-       <mediaobject id="b15fliu0"><imageobject><imagedata format="PNG" fileref="figures/evo_send_option_a.png"/></imageobject></mediaobject>
-       
-      </listitem>
-      <listitem id="b15flnox">
-       <para>Select the priority for your sent message from the given three options (Normal, High, Low).</para>
-      </listitem>
-      <listitem id="b15flo2b">
-       <para>Select the sensitivity for your sent message from the given four options (Normal, Personal, Private, Confidential).</para>
-      </listitem>
-      <listitem id="b17qwn1k">
-       <formalpara id="b17qwqjy">
-        <title>Message Access Delegation:</title>
-        <para>Click Send as Delegate to send the message to the recipient on behalf of someone else.</para>
-       </formalpara>
-       <important>
-        <para>To send a calendar item as delegate, you should subscribe to the delegator's message and also you should have necessary rights assigned to you by the delegator.</para>
-       </important>
-       <orderedlist>
-        <listitem id="b17qwr4g">
-         <para>Click User to open Show Contacts dialog box.</para>
-        </listitem>
-        <listitem id="b17qwruz">
-         <para>Select the contact from the desired Address book and click Add, then close the dialog box.</para>
-         <warning>
-          <para>You are not permitted to send a message on behalf of more than one person at a time.</para>
-         </warning>
-         <para>When the recipient opens the mail, he or she can also read a message that <guilabel>The message was sent by &lt;Delegator's name&gt; on behalf of &lt;Delegate's name&gt;</guilabel> on the preview pane header bar.</para>
-        </listitem>
-       </orderedlist>
-      </listitem>
-      <listitem id="b15floq9">
-       <para>Select the Request a delivery receipt for this message check box to get a delivery receipt from your recipient.</para>
-      </listitem>
-      <listitem id="b15flpg4">
-       <para>Select the Request a read receipt for this message to get a read receipt for the message you have sent.</para>
-      </listitem>
-      <listitem id="b15flpzo">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-
-    <section id="b17reixo">
-     <title>Delegating Calendar Items</title>
-     <para>You can send Meetings or Appointments on behalf of someone else if you have subscribed to his or her Calendar.</para>
-     <orderedlist>
-      <listitem id="b17rf0ow">
-       <para>Select the delegator's Calendar.</para>
-      </listitem>
-      <listitem id="b17rekzs">
-       <para>Open a new Meeting composer window.</para>
-      </listitem>
-      <listitem id="b17ren0l">
-       <para>Add the recipients.</para>
-      </listitem>
-      <listitem id="b17renoo">
-       <para>Fill in the information.</para>
-       <para>Click Send.</para>
-       <para>When the recipient receives the calendar item, a message indicates that the item was created by someone on behalf of the Delegator.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-   </section>
-
-   <section id="exchange-delegate">
-    <title>Access Delegation</title>
-    <para>You can allow other people in your organization's Global Address List to access your calendar, address book, and messages, and they can let you manage theirs. Delegation allows people to do anything from check on each other's schedules to completely manage their personal information.</para>
-
-    <section id="exchange-delegate-to-others">
-     <title>Delegating Access to Others</title>
-     <para>To add someone to your list of delegates:</para>
-     <orderedlist>
-      <listitem id="bxpfj0n">
-       <para>Select Edit &gt; Preferences.</para>
-      </listitem>
-      <listitem id="bxpfj0o">
-       <para>Click the Exchange Settings tab.</para>
-      </listitem>
-      <listitem id="b17qx94g">
-       <para>Click Delegation Assistant to open the Delegates dialog box.</para>
-       <mediaobject id="bxorvbh"><imageobject><imagedata format="PNG" fileref="figures/delgt-add.png"/></imageobject></mediaobject>
-       
-      </listitem>
-      <listitem id="bxpfj5p">
-       <para>Click Add, then search for a contact in the Global Address List.</para>
-       <para>Remember that the Global Address List (GAL) appears empty until you have searched for something in it.</para>
-      </listitem>
-      <listitem id="b17qxknb">
-       <para>Select the delegate and click Edit to open the delegate permission dialog box.</para>
-       <mediaobject id="b17qxmcm"><imageobject><imagedata format="PNG" fileref="figures/evo_delegate_permission_a.png"/></imageobject></mediaobject>
-       
-      </listitem>
-      <listitem id="bxpfjm3">
-       <para>Select from the following access levels for each of the four types of folders:</para>
-       <formalpara id="bsbg9j6">
-        <title>None:</title>
-        <para>Do not allow this person to access any folders of this type.</para>
-       </formalpara>
-       <formalpara id="bsbg9oa">
-        <title>Reviewer (read-only):</title>
-        <para>Allows the delegate to see items in this type of folder, but not create new items or edit existing items.</para>
-       </formalpara>
-       <formalpara id="bsbg9ts">
-        <title>Author (read, create):</title>
-        <para>The delegate can view items in your folders, and can create new items, but cannot change any existing items.</para>
-       </formalpara>
-       <formalpara id="bsbg9yy">
-        <title>Editor (read, create, edit):</title>
-        <para>The delegate can view, create, and change items in your folders.</para>
-       </formalpara>
-      </listitem>
-      <listitem id="bxpfkfd">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-     <para>The delegate is notified through a separate mail that he or she is being added to your list of delegates. The mail summarizes all the rights that have been assigned to the delegate.</para>
-    </section>
-
-    <section id="exchange-delegated-to-you">
-     <title>Subscribe to Other Users' Folders</title>
-     <para>To access the folders delegated to you:</para>
-     <orderedlist>
-      <listitem id="bshok43">
-       <para>Click File &gt; Subscribe to Other User's Exchange Folder.</para>
-              
-      </listitem>
-      <listitem id="bshokwk">
-       <para>Specify the email address of the user who has delegated to you, or click User to select the user from your address book.</para>
-      </listitem>
-      <listitem id="bshol98">
-       <para>Select the folder you want to open.</para>
-      </listitem>
-      <listitem id="bsholc3">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-     <para>Folders delegated to you appear in your folder list inside a folder labeled with the name of its owner. For example, if Martha Thompson delegates folders to you, you see a folder called Martha Thompson's Folders in the folder tree at the same level as your Personal Folders and Public Folders.</para>
-     <para>If the folder fails to open properly, check with the folder owner to make sure that you have been granted the correct access permissions.</para>
-    </section>
-   </section>
-
-   <section id="bxn827k">
-    <title>Subscribe to Public Folders</title>
-    <para>You can subscribe to public folders available on the Exchange server.</para>
-    <orderedlist>
-     <listitem id="bxn8euw">
-      <para>Click Folder &gt; Subscriptions.</para>
-     </listitem>
-     <listitem id="bxn8f74">
-      <para>Select the Exchange account.</para>
-     </listitem>
-     <listitem id="bxn8ffk">
-      <para>Check the folders you want to subscribe to.</para>
-      
-     </listitem>
-     <listitem id="bxn8fm8">
-      <para>Click OK.</para>
-      <para>The folders you have subscribed to appear in the folder list at the left.</para>
-     </listitem>
-     <listitem id="bxn8h3p">
-      <para>To view contents of a folder, click it.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="b13pnzby">
-    <title>Reminders</title>
-    <para>Reminders for meetings in your Exchange calendar do not work until you have run Evolution at least once after logging in. This is different from locally stored reminders, which work from the moment you log in, regardless of whether you have run Evolution in the session so that you can fix a convenient time for a meeting. To enable Reminder setting in your Exchange account, select <guilabel>Remember the password</guilabel> checkbox. To find more information about Reminders see<link linkend="bshly4v">Reminders</link>.</para>
-   </section>
-
-   <section id="exchange-out-of-office">
-    <title>Setting an Out of Office Message</title>
-    <para>An Out of Office message is an automatic reply that you can send as a reply to messages, explaining why you are not immediately responding to their messages. For example, if you go on vacation for a week and will not access your email, you can set an automatic reply so that people know that you are not ignoring them.</para>
-    <orderedlist>
-     <listitem id="bsbgb7t">
-      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-     </listitem>
-     <listitem id="bxn8hun">
-      <para>Select the Exchange account, then click Edit.</para>
-     </listitem>
-     <listitem id="bxn8jdh">
-      <para>Select the Exchange Settings tab. The top option allows you to set an Out of Office message.</para>
-     </listitem>
-     <listitem id="bsbgbe3">
-      <para>Click I Am Currently Out of the Office.</para>
-     </listitem>
-     <listitem id="bsbgbi0">
-      <para>Type a short message in the text field.</para>
-     </listitem>
-     <listitem id="bsbgbl5">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>Your message is automatically sent to anyone who sends you mail until you return and select I Am in the office.</para>
-   </section>
-  </section>
-
-  <section id="full-advantage">
-   <title>Scheduling Meetings with Free/Busy</title>
-   <para>Evolution helps you fix a convenient time for a meeting according to the availability of the attendees. Its Free/Busy feature allows you to perform a check on other user's Exchange calendar to find whether they are busy according to their Exchange calendars, if so, you can reschedule the meeting altogether.</para>
-   <orderedlist>
-    <listitem id="bsbgc5a">
-     <para>Create a new appointment in the calendar.</para>
-    </listitem>
-    <listitem id="bsbgc8b">
-     <para>Right-click the appointment, then select Schedule Meeting.</para>
-    </listitem>
-    <listitem id="b13pcsbd">
-     <para>Click the Add tab to enter the email addresses into the list.</para>
-    </listitem>
-    <listitem id="b13pcukb">
-     <para>Click the Attendees tab to select the participants from Global Address List (GAL).</para>
-     <para>You can directly select the participants from the following address lists.</para>
-     <itemizedlist>
-      <listitem>
-       <para>Personal</para>
-      </listitem>
-      <listitem>
-       <para>Global Address List</para>
-      </listitem>
-      <listitem>
-       <para>Contacts</para>
-      </listitem>
-     </itemizedlist>
-     <para>You can also specify the category as Anniversary, Birthday, Business etc. from the drop-down list for each address list given.</para>
-    </listitem>
-    <listitem id="b13pczyv">
-     <para>Add the participants to the following categories of attendees.</para>
-     <itemizedlist>
-      <listitem>
-       <para>Chair Persons</para>
-      </listitem>
-      <listitem>
-       <para>Required Participants</para>
-      </listitem>
-      <listitem>
-       <para>Optional Participants</para>
-      </listitem>
-      <listitem>
-       <para>Resources</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem id="bsbgcft">
-     <para>Click Free/Busy tool at the top right corner.</para>
-    </listitem>
-    <listitem id="b13pd6sk">
-     <para>Click Options &gt; Update Free/Busy to check participant schedules and, if possible, update the meeting in all participants' calendars</para>
-    </listitem>
-   </orderedlist>
-   <para>If meeting attendees are not available during the times you have scheduled a meeting, you can <quote>nudge</quote> the meeting forward or backward to the nearest available time. To do so, just click the arrows to the left or right of the Autopick button. The Autopick tool lets you move the meeting to the nearest time during which all attendees are available. If you are not satisfied with those results, you can also drag the edges of the area marked as meeting time to the hours that you want to select.</para>
-  </section>
-  
- </chapter>
-
- <chapter id="usage-groupwise">
-  <title>Connecting to GroupWise</title>
-  <para><trademark>Evolution</trademark> can access accounts on <trademark class="registered">Novell</trademark> <trademark class="registered">GroupWise</trademark> 7 systems.</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="bv7wchf">GroupWise Features</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bv3rax2">GroupWise Terminology vs. Evolution Terminology</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bv7wcei">Adding your GroupWise Account to Evolution</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bv7wck0">Scheduling Appointments with Free/Busy</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="Aaej55l">Managing Sent Items</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="Aai4ois">Giving Other People Access to Your Mailbox or Calendar</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bxqwde6">Junk Mail Handling</link></para>
-   </listitem>
-  </itemizedlist>
-
-  <section id="bv7wchf">
-   <title>GroupWise Features</title>
-   <para>GroupWise connectivity in Evolution supports the following basic Novell GroupWise features:</para>
-   <itemizedlist>
-    <listitem>
-     <para>Mail</para>
-     <itemizedlist>
-      <listitem>
-       <para>Viewing mail and folders stored on the GroupWise system.</para>
-      </listitem>
-      <listitem>
-       <para>Sending mail from you GroupWise account.</para>
-      </listitem>
-      <listitem>
-       <para>Converting mail to a task or meeting.</para>
-      </listitem>
-      <listitem>
-       <para>Tracking the status of a message.</para>
-      </listitem>
-      <listitem>
-       <para>Marking a message as junk mail adds the sender to your GroupWise junk mail list.</para>
-      </listitem>
-      <listitem>
-       <para>Improved Status Tracking.</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem>
-     <para>Calendar</para>
-     <itemizedlist>
-      <listitem>
-       <para>You can send and receive appointment and meeting requests. Allows Evolution users to schedule meetings and view attendee availability for other users on GroupWise.</para>
-      </listitem>
-      <listitem>
-       <para>You can resend meeting requests. Also, you can edit the fields, and add or delete participants.</para>
-      </listitem>
-      <listitem>
-       <para>You can receive an iCalendar meeting request and add it to your GroupWise calendar.</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem>
-     <para>Contacts</para>
-     <itemizedlist>
-      <listitem>
-       <para>Address Completion is supported for your GroupWise address books, including the System address book, the Frequent Contacts address book, and your personal address book.</para>
-      </listitem>
-      <listitem>
-       <para>If you receive a card attachment and click Save in Address Book, it is saved to your Personal address book. New Address Book entries can also be added to your personal address book from received Email messages.</para>
-      </listitem>
-      <listitem>
-       <para>To create your GroupWise Frequent contacts and Personal address books, you need to access your GroupWise account once through GroupWise Java client because Evolution currently does not support creating them. The GroupWise system address book is marked for offline use by default. This boosts performance.</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem>
-     <para>Reminder Note</para>
-     <itemizedlist>
-      <listitem>
-       <para>GroupWise Reminder Note is integrated into Memo component. You can view the Reminder notes listed under Memos at the bottom right of the Calendar view given that you have selected them under the Memos component.</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-    <listitem>
-     <para>Proxy</para>
-     <itemizedlist>
-      <listitem>
-       <para>You can assign Proxy access to other users.</para>
-      </listitem>
-      <listitem>
-       <para>You can view other users' accounts through Proxy access.</para>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-   </itemizedlist>
-   <para>There are, however, some features that are not available:</para>
-   <itemizedlist>
-    <listitem>
-     <para>Accepting appointments or meetings in offline mode</para>
-    </listitem>
-    <listitem>
-     <para>Archive</para>
-    </listitem>
-   </itemizedlist>
-  </section>
-
-  <section id="bv3rax2">
-   <title>GroupWise Terminology vs. Evolution Terminology</title>
-   <para>GroupWise and Evolution sometimes uses different terminology for different types of items. The following table compares GroupWise terminology to Evolution terminology.</para>
-   <informaltable>
-    <tgroup cols="2">
-     <colspec colwidth="2.828*" colname="1" colnum="1"/>
-     <colspec colwidth="2.828*" colname="2" colnum="2"/>
-     <thead valign="top">
-      <row id="bv3rc30">
-       <entry colname="1">
-        <para>GroupWise</para>
-       </entry>
-       <entry colname="2">
-        <para>Evolution</para>
-       </entry>
-      </row>
-     </thead>
-     <tbody valign="top">
-      <row id="bv3rc32">
-       <entry colname="1">
-        <para>Appointment</para>
-       </entry>
-       <entry colname="2">
-        <para>Meeting</para>
-       </entry>
-      </row>
-      <row id="bv3rc33">
-       <entry colname="1">
-        <para>Posted Appointment</para>
-       </entry>
-       <entry colname="2">
-        <para>Appointment</para>
-       </entry>
-      </row>
-      <row id="bv3rc34">
-       <entry colname="1">
-        <para>Reminder Note</para>
-       </entry>
-       <entry colname="2">
-        <para>None; use a task</para>
-       </entry>
-      </row>
-      <row id="bv3rc35">
-       <entry colname="1">
-        <para>Discussion Note</para>
-       </entry>
-       <entry colname="2">
-        <para>None; use an assigned task</para>
-       </entry>
-      </row>
-      <row id="bv3rc36">
-       <entry colname="1">
-        <para>Phone Message</para>
-       </entry>
-       <entry colname="2">
-        <para>None; use a message</para>
-       </entry>
-      </row>
-      <row id="bv3rldo">
-       <entry colname="1">
-        <para>Checklist</para>
-       </entry>
-       <entry colname="2">
-        <para>None; use a task</para>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
-  <section id="bv7wcei">
-   <title>Adding your GroupWise Account to Evolution</title>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="bv7wcb5">Creating a New GroupWise Account</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="buw5x0k">Changing an Existing Account to Work with GroupWise</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="bv7wcb5">
-    <title>Creating a New GroupWise Account</title>
-    <orderedlist>
-     <listitem id="bv7wb3t">
-      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-     </listitem>
-     <listitem id="bv7wbac">
-      <para>Click Add.</para>
-     </listitem>
-     <listitem id="bv7wbdi">
-      <para>Create the account following the procedure in <link linkend="usage-mainwindow-starting">Starting Evolution for the First Time</link>.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="buw5x0k">
-    <title>Changing an Existing Account to Work with GroupWise</title>
-    <para>If you have an existing email account, and want to convert it to use with GroupWise:</para>
-    <orderedlist>
-     <listitem id="buw5x0l">
-      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-     </listitem>
-     <listitem id="buw5x0m">
-      <para>Select the account you want to convert, then click Edit.</para>
-     </listitem>
-     <listitem id="buw5x0n">
-      <para>Click the Identity tab.</para>
-       
-     </listitem>
-     <listitem id="bxpfqzp">
-      <para>Change your email address as needed.</para>
-     </listitem>
-     <listitem id="buw5x0o">
-      <para>Click the Receiving Email tab, then select Novell GroupWise as your server type.</para>
-        
-     </listitem>
-     <listitem id="buw5x0p">
-      <para>Type the name of your mail server, your user name, and select whether to use SSL.</para>
-      <note>
-       <para>Select Use SSL to enable a secure connection between Evolution and the server.</para>
-      </note>
-     </listitem>
-     <listitem id="bsthkyr">
-      <para>Click the Receiving Options tab.</para>
-      <para>Select if you want Evolution to automatically check for new mail.</para>
-      <para>If you select this option, you need to specify how often Evolution should check for new messages.</para>
-            
-     </listitem>
-     <listitem id="bv7wbod">
-      <para>Select if you want to check for new messages in all folders.</para>
-     </listitem>
-     <listitem id="bv7wbr9">
-      <para>Select Apply filters to new messages in inbox on this server if you want to apply filters.</para>
-      <para>For additional information on filtering, see <link linkend="usage-mail-org-filters-new">Creating New Filter Rules</link>.</para>
-     </listitem>
-     <listitem id="bv7wbto">
-      <para>Select if you want to check new messages for junk content.</para>
-      <para>For additional information on junk content, see <link linkend="mail-prefs-junk">Junk Mail Preferences</link>.</para>
-     </listitem>
-     <listitem id="bv7wbwf">
-      <para>Select if you want to only check for junk messages in the Inbox folder.</para>
-     </listitem>
-     <listitem id="bv7wc2w">
-      <para>Select if you want to automatically synchronize your remote calendar and contacts locally.</para>
-      <para>It fetches the remote calendar and contact information and stores it on your local drive.</para>
-      <note>
-       <para>Remote calendar and contacts are typically stored remotely on servers rather than on local hard disk.</para>
-      </note>
-     </listitem>
-     <listitem id="bv7wn80">
-      <para>Specify your Post Office Agent SOAP port in the Post Office Agent SOAP Port field.</para>
-      <para>If you are unsure what your Post Office Agent SOAP port is, contact your system administrator.</para>
-     </listitem>
-     <listitem id="bxmtk4e">
-      <para>(Optional) Click the Proxy tab, then click Add to add any Proxy users to your account.</para>
-     </listitem>
-     <listitem id="buw5x0s">
-      <para>Click OK.</para>
-      <para>Click Close.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-  </section>
-
-  <section id="b15iirao">
-   <title>Reminder Notes</title>
-   <para>GroupWise Reminder notes are like mail messages except they are scheduled for a particular day and appear on the Calendar for that date. You can use reminder notes to show vacations, holidays, pay days, birthdays, and so on. Posted reminder notes are placed in your Calendar on the date you specify. They are not placed in your Mailbox or in any other user's Mailbox.</para>
-   <para>Evolution integrates this feature into its Memo component so that you can view the Reminder notes listed under Memo at the right bottom side of the calendar view.</para>
-   <note>
-    <para>Select the memo or the Reminder notes under the Memo component to display it on the Calendar view.</para>
-   </note>
-   <para>To create a new Reminder Note follow <link linkend="b1012vde">Step 1</link> through <link linkend="b10fqh6r">Step 8</link> under <link linkend="b1012vdd">Memos</link>.</para>
-   <para>To send a Reminder Note,</para>
-   <orderedlist>
-    <listitem id="b15ijcgi">
-     <para>Click File, then New &gt; Shared Memo.</para>
-    </listitem>
-    <listitem id="b15ijcow">
-     <para>Select the Organizer's account name from the drop-down list given next to the Organizer field.</para>
-    </listitem>
-    <listitem id="b15ijf00">
-     <para>In the To field, type a username, then press Enter. Repeat for additional users.</para>
-    </listitem>
-    <listitem id="b15ijfl9">
-     <para>Select the Group in which you would like to create the entry.</para>
-    </listitem>
-    <listitem id="b15ijg02">
-     <para>Enter a brief summary in the Summary field.</para>
-    </listitem>
-    <listitem id="b15ijgcw">
-     <para>In the Start Date field, type the date this reminder note should appear in the recipients' Calendars.</para>
-    </listitem>
-    <listitem id="b15ijgn9">
-     <para>Specify the category that the Reminder note falls under.</para>
-    </listitem>
-    <listitem id="b15ijkkf">
-     <para>(Optional) Enter a description in the Description field.</para>
-    </listitem>
-    <listitem id="b15ijkqc">
-     <para>Click Save.</para>
-    </listitem>
-   </orderedlist>
-   <mediaobject id="b15ijb3h"><imageobject><imagedata format="PNG" fileref="figures/evo_shd_memo_a.png"/></imageobject></mediaobject>
-   
-  </section>
-
-  <section id="bv7wck0">
-   <title>Scheduling Appointments with Free/Busy</title>
-   <para>When you schedule a meeting with your calendar on GroupWise, you can check when other local GroupWise users are busy according to their GroupWise calendars.</para>
-   <para>Reminders for appointments in your GroupWise calendar do not work until you have run Evolution at least once after logging in. This is different from locally stored reminders, which work from the moment you log in, regardless of whether you have run Evolution in the session.</para>
-   <orderedlist>
-    <listitem id="bv7wal9">
-     <para>Open a new appointment in the calendar.</para>
-    </listitem>
-    <listitem id="bv7wapb">
-     <para>Click Actions &gt; Schedule Meeting.</para>
-    </listitem>
-    <listitem id="bv7wato">
-     <para>Add attendees, either by entering their email addresses into the list, or by clicking the Invite Others button.</para>
-    </listitem>
-    <listitem id="bv7wb0h">
-     <para>Click Options, then click Update Free/Busy to check participant schedules and, if possible, update the meeting in all participants' calendars.</para>
-    </listitem>
-   </orderedlist>
-   <para>If meeting attendees are not available during the times you have scheduled a meeting, you can <quote>nudge</quote> the meeting forward or backward to the nearest available time. To do so, just click the arrows to the left or right of the Autopick button. The Autopick tool moves the meeting to the nearest time during which all attendees are available. If you aren't satisfied with those results, you can drag the edges of the meeting time to the hours that you want to select.</para>
-  </section>
-
-
-  <section>
-   <title>Resending a GroupWise Meeting Request</title>
-   <orderedlist>
-    <listitem>
-     <para>Right-click an existing meeting that you have organized.</para>
-    </listitem>
-    <listitem>
-     <para>Select Resend meeting. A confirmation dialog is displayed.</para>
-    </listitem>
-    <listitem>
-     <para>Click OK to resend the meeting.</para>
-     <mediaobject><imageobject><imagedata format="PNG" fileref="figures/groupwise_resend.png"/></imageobject></mediaobject>
-    </listitem>
-     <listitem>
-     <para>(Optional) Edit any of the fields: Duration, Summary, Description</para>
-    </listitem>
-    <listitem>
-     <para>(Optional) Add attendees, either by entering their email addresses into the list, or by clicking the Invite Others button.</para>
-    </listitem>
-    <listitem>
-     <para>To remove an attendee from the list, select the attendee and click Remove.</para>
-    </listitem>
-    <listitem>
-     <para>Click Save to save the meeting.</para>
-    </listitem>
-    <listitem>
-     <para>A Dialog is displayed to check whether you want to retract the original item or not. Click OK to confirm. Click Cancel if you want to keep the original item in the recipients' calendar.</para>
-     <mediaobject><imageobject><imagedata format="PNG" fileref="figures/groupwise_resend_retract.png"/></imageobject></mediaobject>
-    </listitem>
-   </orderedlist>
-   <para>An email is sent to all the recipients to invite them to your updated event.</para>
-  </section>
-  
-  
-  <section>
-   <title>GroupWise support for header based threading enabled</title>
-   <para>There is no need to enable 'Fall back to threading by subject' from Edit > Preferences > Mail preferences > General tab unless other wise you want messages to be threaded on subject basis.</para>
-  </section>
-  
-  
-  <section id="Aaej55l">
-   <title>Managing Sent Items</title>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="Aaez1x0">Confirming Delivery of Items You have Sent</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="Aal4xf4">Displaying Sent Items</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="Aal54a9">Checking the Status of an Item You Have Sent</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="Ak05sv1">Requesting a Reply for Items You Send</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="Ak05sv1">Requesting a Reply for Items You Send</link></para>
-    </listitem>
-   </itemizedlist>
-   <important>
-    <para>You can manage your sent items for GroupWise email only if the recipient is located on the same GroupWise system as you.</para>
-   </important>
-
-   <section id="Aaez1x0">
-    <title>Confirming Delivery of Items You have Sent</title>
-    <para>Evolution provides several ways for you to confirm that your item was delivered. You can easily track message status of any message you have sent. For example, you can see when an email was delivered and when the recipient opened or deleted the email.</para>
-    <formalpara id="b17sa0q2">
-     <title>Track an Item You Sent:</title>
-     <para> You can check the status in the Message Status window of an email you have sent.</para>
-    </formalpara>
-    <formalpara id="b17sa0y1">
-     <title>Receive Notification When the Item is Opened or Deleted:</title>
-     <para> You can receive notification when the recipient opens or deletes a message. For information, see <link linkend="Ak05sv1">Requesting a Reply for Items You Send</link>.</para>
-    </formalpara>
-    <formalpara id="b17sa1iu">
-     <title>Request a Reply:</title>
-     <para>You can inform the recipient that you need a reply to an email. Evolution adds a sentence to the item stating that a reply is requested and changes the icon in the recipient's Mailbox to a double arrow. For information, see <link linkend="Ak05sv1">Requesting a Reply for Items You Send</link>.</para>
-    </formalpara>
-
-    <section id="b17qstbk">
-     <title>Enabling Status Tracking</title>
-     <orderedlist>
-      <listitem id="b17qt8ih">
-       <para>In the Compose Message window, click Insert &gt; Send Options.</para>
-       <para>Select Status Tracking.</para>
-       <mediaobject id="b17qsuu3"><imageobject><imagedata format="PNG" fileref="figures/evo_gwstatustrack.png"/></imageobject></mediaobject>
-      </listitem>
-      <listitem id="b17qt9nx">
-       <para>Select the check box next to Create a sent item to track information.</para>
-      </listitem>
-      <listitem id="b17qt9yd">
-       <para>Select any of the options given (Delivered, Delivered and opened, All information).</para>
-       <para>Based on this selection, you can view the status of the send message in the Sent Items folder.</para>
-       <para>For more information, see <link linkend="Aal54a9">Checking the Status of an Item You Have Sent</link>.</para>
-      </listitem>
-      <listitem id="b17qtcil">
-       <para>(Optional) Select the check box next to Auto-delete sent item to automatically delete the sent item from the Sent folder.</para>
-      </listitem>
-      <listitem id="b17qte6b">
-       <para>Under Return Notification, specify the type of return receipt you want.</para>
-      </listitem>
-      <listitem id="b17qtf00">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-
-    <section id="Aal54a9">
-     <title>Checking the Status of an Item You Have Sent</title>
-     <orderedlist>
-      <listitem id="Aaezj33">
-       <para>Right-click an email in your Sent folder, then click Track Message Status.</para>
-       <para>With Message Tracking, you know when the item reaches the recipients or is read by them. You also know exactly who received your message, who read your message, and who deleted it and when.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-   </section>
-
-   <section id="bv7v0t1">
-    <title>Changing the Priority of an Email</title>
-    <orderedlist>
-     <listitem id="bv7vmrv">
-      <para>In the Compose Message window, click Insert &gt; Send Options.</para>
-     </listitem>
-     <listitem id="bv7vmrw">
-      <para>Select the priority for your sent message from the given three options (Normal, High, Low).</para>
-      <para>The small icon next to an item in the Mailbox is red when the priority is high.</para>
-     </listitem>
-     <listitem id="bv7vmrx">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="Ak05sv1">
-    <title>Requesting a Reply for Items You Send</title>
-    <orderedlist>
-     <listitem id="Ak05z6c">
-      <para>In the Compose Message window, click Insert &gt; Send Options.</para>
-      <mediaobject id="Ak06ek0"><imageobject><imagedata format="PNG" fileref="figures/evo_sendstatus_a.png"/></imageobject></mediaobject>
-     </listitem>
-     <listitem id="Ak05zcd">
-      <para>Click Reply Requested, then specify when you want to receive the reply.</para>
-      <formalpara id="bio3ukp">
-       <title>When convenient:</title>
-       <para>Select this option to allow the recipients to reply at their convenience. If you select this option, <emphasis>Reply Requested: When Convenient</emphasis> appears at the top of the message.</para>
-      </formalpara>
-      <formalpara id="bio3ut9">
-       <title>Within days:</title>
-       <para>Specify the number of days by when you need a reply.</para>
-      </formalpara>
-
-     </listitem>
-     <listitem id="b17qtynu">
-      <para>Click Set Expiration Date, then specify the number of days for this message to remain in the recipient's Inbox.</para>
-     </listitem>
-     <listitem id="Ak060fu">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-   <section id="b17qtwxt">
-    <title>Setting Message Delivery Options</title>
-    <para>You can delay the delivery of an individual message by having it held in the Outbox for a specified time.</para>
-    <orderedlist>
-     <listitem id="b17qubge">
-      <para>Click Delay message delivery.</para>
-     </listitem>
-     <listitem id="b17qubw7">
-      <para>Use the Date and Time options to specify how long the message should remain in the Outbox before it is sent to the recipient.</para>
-     </listitem>
-     <listitem id="b17qud1r">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-   <section id="Aal4xf4">
-    <title>Displaying Sent Items</title>
-    <orderedlist>
-     <listitem id="Ak05v13">
-      <para>Click the Sent Items folder in the Folder List.</para>
-     </listitem>
-    </orderedlist>
-    <para>All sent items reside in this folder unless you select a different folder for sent email in the account editor default settings. For more information, refer to <link linkend="b17s9qmz">Changing Default Folder for Sent and Draft Items</link> under <link linkend="b13uhy6r">Default Settings</link>.</para>
-   </section>
-   <section id="bxjm31g">
-    <title>Delegating an Item</title>
-    <orderedlist>
-     <listitem id="bxjm3ii">
-      <para>In the Calendar, right-click the meeting or appointment you want to delegate.</para>
-     </listitem>
-     <listitem id="bxjm6u5">
-      <para>Select Delegate Meeting, then select the contacts you want to delegate the meeting/appointment for.</para>
-     </listitem>
-     <listitem id="bxjm7ie">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>Each contact gets a copy of the appointment or meeting.</para>
-
-    <section id="b17rea9d">
-     <title>Enabling Status Tracking</title>
-     <orderedlist>
-      <listitem id="b17rearj">
-       <para>In the Compose Meeting window, click Insert &gt; Send Options.</para>
-       <para>Select Status Tracking.</para>
-       <mediaobject id="b17reckf"><imageobject><imagedata format="PNG" fileref="figures/evo_calstatus_a.png"/></imageobject></mediaobject>
-      </listitem>
-      <listitem id="b17recrx">
-       <para>Select the check box next to Create a sent item to track information.</para>
-      </listitem>
-      <listitem id="b17recvl">
-       <para>Select any of the options given (Delivered, Delivered and opened, All information)</para>
-       <para>Based on this selection, you can view the status of the send message in the Sent Items folder.</para>
-      </listitem>
-      <listitem id="b17red21">
-       <para>(Optional) Select the check box next to Auto-delete sent item to automatically delete the sent item from the Sent folder.</para>
-      </listitem>
-      <listitem id="b17red4i">
-       <para>Under Return Notification, specify the type of return receipt you want.</para>
-      </listitem>
-      <listitem id="b17redc7">
-       <para>Click OK.</para>
-      </listitem>
-     </orderedlist>
-    </section>
-   </section>
-  </section>
-  
-  <section id="Aai4ois">
-   <title>Giving Other People Access to Your Mailbox or Calendar</title>
-   <para>Use Proxy to manage another user's Mailbox and Calendar. Proxy lets you perform various actions, such as reading, accepting, and declining items on behalf of another user, within the restrictions the other user sets.</para>
-   <important>
-    <para>You can proxy for a user in a different post office or domain, as long as that person is in the same GroupWise system. You cannot proxy for a user in a different GroupWise system.</para>
-   </important>
-   <para>This section contains the following topics:</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="Aai4ots">Receiving Proxy Rights</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="Aai4p9d">Assigning Proxy Rights to Another User</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="Aai4rus">Adding and Removing Proxy Names and Rights in Your Proxy List</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="Aai4t8q">Managing Someone Else's Mailbox or Calendar</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="Aaihztz">Marking an Item Private</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="Aai4ots">
-    <title>Receiving Proxy Rights</title>
-    <para>Two steps must be completed before you can act as someone's proxy. First, the person for whom you plan to act as proxy must grant you rights in the Proxy List in Preferences. Second, you must proxy to the user so you can access his or her Mailbox or Calendar.</para>
-   </section>
-
-   <section id="Aai4p9d">
-    <title>Assigning Proxy Rights to Another User</title>
-    <para>Use the Proxy List in the Preferences Account Editor to give other users rights to proxy for you. You can assign each user different rights to your calendaring and messaging information. If you want to let users view specific information about your appointments when they do a Busy Search on your Calendar, give them Read access for appointments. The following table describes the rights you can grant to users:</para>
-    <informaltable>
-     <tgroup cols="2">
-      <colspec colwidth="1.849*" colname="1" colnum="1"/>
-      <colspec colwidth="3.818*" colname="2" colnum="2"/>
-      <thead valign="top">
-       <row id="b10fqugl">
-        <entry colname="1">
-         <para>Permission:</para>
-        </entry>
-        <entry colname="2">
-         <para>Allows your proxy to do:</para>
-        </entry>
-       </row>
-      </thead>
-      <tbody valign="top">
-       <row id="b10fqugm">
-        <entry colname="1">
-         <para>Read</para>
-        </entry>
-        <entry colname="2">
-         <para>Read items you receive. Proxies cannot see your Contacts folder with this or any other proxy right.</para>
-        </entry>
-       </row>
-       <row id="b10fqugn">
-        <entry colname="1">
-         <para>Write</para>
-        </entry>
-        <entry colname="2">
-         <para>Create and send items in your name, including applying your signature if you have one defined. Assign categories to items, and change the subject of items.</para>
-        </entry>
-       </row>
-       <row id="b10fqugo">
-        <entry colname="1">
-         <para>Subscribe to my alarms</para>
-        </entry>
-        <entry colname="2">
-         <para>Receive the same alarms you receive. Receiving alarms is supported only if the proxy is on the same post office you are.</para>
-        </entry>
-       </row>
-       <row id="b10fqugp">
-        <entry colname="1">
-         <para>Subscribe to my notifications</para>
-        </entry>
-        <entry colname="2">
-         <para>Receive notification when you receive items. Receiving notifications is supported only if the proxy is on the same post office you are.</para>
-        </entry>
-       </row>
-       <row id="b10fqugq">
-        <entry colname="1">
-         <para>Modify options/rules/folders</para>
-        </entry>
-        <entry colname="2">
-         <para>Change the options in your Mailbox. The proxy can edit any of your Options settings, including the access given to other users. If the proxy also has Mail rights, he or she can create or modify rules and folders. This right allows a proxy to add, delete, and modify categories.</para>
-        </entry>
-       </row>
-       <row id="b10fqugr">
-        <entry colname="1">
-         <para>Read items marked Private</para>
-        </entry>
-        <entry colname="2">
-         <para>Read the items you marked Private. If you don't give a proxy Private rights, all items marked Private in your Mailbox are hidden from that proxy.</para>
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </section>
-
-   <section id="Aai4rus">
-    <title>Adding and Removing Proxy Names and Rights in Your Proxy List</title>
-    <orderedlist>
-     <listitem id="Aai4s3e">
-      <para>Select Edit &gt; Preferences, then select Mail Accounts.</para>
-     </listitem>
-     <listitem id="bxmtp5i">
-      <para>Select the GroupWise account to edit, then click Edit.</para>
-     </listitem>
-     <listitem id="Aai4s6y">
-      <para>Click the Proxy tab, then click Add.</para>
-     </listitem>
-     <listitem id="Aai4sat">
-      <para>To add a user to the list, type the name in the Name box or import the contact from Contact list.</para>
-     </listitem>
-     <listitem id="Aai4sll">
-      <para>Select the rights you want to give to the user.</para>
-      <mediaobject id="bxmtqdk"><imageobject><imagedata format="PNG" fileref="figures/evo_proxyadd_a.png"/></imageobject></mediaobject>
-      
-     </listitem>
-     <listitem id="Aai4soe">
-      <para>Repeat <link linkend="Aai4sat">Step 4</link> and <link linkend="Aai4sll">Step 5</link> to assign rights to each user in the Proxy List.</para>
-     </listitem>
-     <listitem id="Aai4sse">
-      <para>Click OK.</para>
-      <para>Click Close.</para>
-     </listitem>
-    </orderedlist>
-    <para>To delete a user from the Proxy List, select the user, then click Remove User.</para>
-   </section>
-
-   <section id="Aai4t8q">
-    <title>Managing Someone Else's Mailbox or Calendar</title>
-    <para>Before you can act as a proxy for someone, that person must give you proxy rights in his or her Proxy List in Preferences. The amount of access you have depends on the rights you have been given.</para>
-    <orderedlist>
-     <listitem id="bxmtz8u">
-      <para>Right-click on the GroupWise account in the folder list.</para>
-     </listitem>
-     <listitem id="bxmtz8v">
-      <para>Click Proxy Login.</para>
-       
-     </listitem>
-     <listitem id="bxmtz8w">
-      <para>Type the user name of the person who has given you Proxy access, or select from the list.</para>
-     </listitem>
-     <listitem id="bxmtz8x">
-      <para>Click OK.</para>
-      <para>The user's data appears in the respective components.</para>
-      <para>You can set different colors to each user to distinguish between each users' appointments. You can also select whether to display the appointments of a particular user or not.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="Aaihztz">
-    <title>Marking an Item Private</title>
-    <para>You can limit a proxy's access to individual items in your Mailbox or Calendar by marking items Private.</para>
-    <para>When you mark an item Private, you prevent unauthorized proxies from opening it. Proxies cannot access items marked Private unless you give them those rights in your Access List.</para>
-    <para>If you mark an item Private when you send it, neither your proxies nor the recipient's proxies can open the item without rights. If you mark an item Private when you receive it, it cannot be read by your unauthorized proxies, but it can be read by the sender's proxies. Appointments marked Private display in Busy Search according to the status you selected when you accepted the appointment.</para>
-    <orderedlist>
-     <listitem id="Aaii0go">
-      <para>In an open item, click Actions, then click Mark Private.</para>
-      <para>or</para>
-      <para>In your Calendar, click an item in the Appointments, Reminder Notes, or Tasks List, click Actions, then click Mark Private.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-  </section>
-
-  <section id="bxqwde6">
-   <title>Junk Mail Handling</title>
-   <para>Junk mail handling for GroupWise accounts is a little different than other junk mail handling. When you mark an item as junk mail in GroupWise, the item is added to your junk list in the GroupWise system. Because these settings are on the GroupWise system, your junk list follows you from computer to computer.</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="bxqwfae">Marking a Message As Junk Mail</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bxqwhft">Marking a Message As Not Junk Mail</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bxqwfgd">Enabling or Disabling Your Junk Mail List</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bxqwjg6">Adding an Email Address to Your Junk List</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bxqwk0f">Removing an Email Address from Your Junk List</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="bxqwfae">
-    <title>Marking a Message As Junk Mail</title>
-    <orderedlist>
-     <listitem id="bxqwgji">
-      <para>Select the message to mark as junk, then click the Junk icon or press Ctrl+J.</para>
-      <para>The message is moved to your Junk Mail folder and the user is added to your junk list.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="bxqwhft">
-    <title>Marking a Message As Not Junk Mail</title>
-    <orderedlist>
-     <listitem id="bxqwhn3">
-      <para>Select the message to mark as not junk in your Junk Mail folder.</para>
-     </listitem>
-     <listitem id="bxqwhsp">
-      <para>Right-click the message, then click Mark as Not Junk.</para>
-      <para>Or select the message and press Shift+Ctrl+J</para>
-      <para>The message is moved to your Mailbox folder and the name is removed from your junk list.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="bxqwfgd">
-    <title>Enabling or Disabling Your Junk Mail List</title>
-    <orderedlist>
-     <listitem id="bxqwi9s">
-      <para>Right-click a message, then click Junk Mail Settings.</para>
-     </listitem>
-     <listitem id="bxqwikf">
-      <para>Select if you want to enable or disable junk mail handling.</para>
-     </listitem>
-     <listitem id="bxqwirh">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="bxqwjg6">
-    <title>Adding an Email Address to Your Junk List</title>
-    <orderedlist>
-     <listitem id="bxqwjmf">
-      <para>Right-click a message, then click Junk Mail Settings.</para>
-     </listitem>
-     <listitem id="bxqwjq0">
-      <para>Type the email address to block in the Email field.</para>
-     </listitem>
-     <listitem id="bxqwju6">
-      <para>Click Add, then click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="bxqwk0f">
-    <title>Removing an Email Address from Your Junk List</title>
-    <orderedlist>
-     <listitem id="bxqwkeq">
-      <para>Right-click a message, then click Junk Mail Settings.</para>
-     </listitem>
-     <listitem id="bxqwker">
-      <para>Select the email address to remove, then click Remove.</para>
-     </listitem>
-     <listitem id="bxqwkes">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-  </section>
- </chapter>
-
- <chapter id="config-prefs">
-  <title>Advanced Configuration</title>
-  <para>Perhaps your mail server has changed names. Or you have grown tired of a certain layout for your appointments. Whatever the reason, you can change your <trademark>Evolution</trademark> settings.</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="config-prefs-mail-identity">Working with Mail Accounts</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bshoq5l">Autocompletion</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="config-prefs-mail">Mail Preferences</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="config-prefs-mail-composer">Composer Preferences</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="config-prefs-cal">Calendar and Tasks Settings</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="config-prefs-contact">Contact Management</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bshoty0">Certificates</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="b1a4ol61">Debug Logs</link></para>
-   </listitem>
-  </itemizedlist>
-  <para>You reach the Evolution settings window by clicking Edit &gt; Preferences. In the left part of the settings window is a column that lets you choose which portion of Evolution to customize. The right part of the window is where you make your actual changes.</para>
-  <mediaobject id="config-prefs-mail-fig"><imageobject><imagedata format="PNG" fileref="figures/mailer_preferences.png"/></imageobject></mediaobject>
-  <para>There are six items you can customize.</para>
-  <formalpara id="b17sa7c0">
-   <title>Mail Accounts:</title>
-   <para>Add or change information about your email accounts, such as the servers you connect to, the way you download mail, and your password authentication mode. This is the most complex item in the list, and is covered in <link linkend="config-prefs-mail-identity">Working with Mail Accounts</link>.</para>
-  </formalpara>
-  <formalpara id="b17sa7hj">
-   <title>Autocompletion:</title>
-   <para>Set the address books to be used when completing email addresses in the message composer. For more information, see <link linkend="bshoq5l">Autocompletion</link>.</para>
-  </formalpara>
-  <formalpara id="b17sa7qv">
-   <title>Mail Preferences:</title>
-   <para>These are overall mail reading preferences, such as display settings, notification options, and security. Settings that vary per account are in the Mail Accounts tool, described in <link linkend="config-prefs-mail-identity">Working with Mail Accounts</link>, but most of the mail settings are in <link linkend="config-prefs-mail">Mail Preferences</link>.</para>
-  </formalpara>
-  <formalpara id="b17sa85j">
-   <title>Composer Preferences:</title>
-   <para>These are settings for the way that you use the mail composer, such as signatures, and spelling. This includes the ability to substitute graphical emoticons for <quote>emoticons</quote> such as : ) that many people use in email. This tool is covered in <link linkend="config-prefs-mail-composer">Composer Preferences</link>.</para>
-  </formalpara>
-  <formalpara id="b17sa8cq">
-   <title>Calendar and Tasks:</title>
-   <para>Use these settings to control how the calendar behaves, including your time zone and the length of your work week. For more information, see <link linkend="config-prefs-cal">Calendar and Tasks Settings</link>.</para>
-  </formalpara>
-  <formalpara id="b17sa8o7">
-   <title>Certificates:</title>
-   <para>Use these settings for certificate handling for S/MIME security systems. For more information, see <link linkend="bshoty0">Certificates</link>.</para>
-  </formalpara>
-  <para>Previous versions of Evolution included directory servers, folder settings, and Exchange delegation in the settings tool. Directory servers can now be set up as contacts groups in the Contacts tool, you can change folder settings in the folder right-click menu, and Exchange delegation is available in the Message Menu of the Exchange tool.</para>
-
-  <section id="config-prefs-mail-identity">
-   <title>Working with Mail Accounts</title>
-   <para>Evolution allows you to maintain multiple accounts, or identities. When you are writing an email message, you can choose which account to use by selecting from the drop-down list next to the From field in the message composer.</para>
-   <para>Click Send/Receive to update all mail sources that are not disabled. If you don't want to check mail for a given account, select the account in Edit &gt; Preferences, then Mail Accounts page and click the Disable button.</para>
-   <para>To add a new account, click Add to open the Evolution configuration assistant.</para>
-   <para>To alter an existing account, select it in the Preferences window.</para>
-   <para>Click Edit to open the Account Editor.</para>
-   <para>The account editor dialog box has seven sections:</para>
-   <formalpara id="bsbhdwn">
-    <title>Identity:</title>
-    <para>Specify the name and email address for this account. You can also choose a default signature to insert into messages sent from this account.</para>
-   </formalpara>
-   <formalpara id="bsbhe10">
-    <title>Receiving Email:</title>
-    <para>Select the way you receive email. You can download email from a <link linkend="pop">POP server</link>, read and keep it on the server (Microsoft Exchange, <trademark class="registered">Novell</trademark> <trademark class="registered">GroupWise</trademark>, or <link linkend="imap">IMAP</link>), or read it from files that already exist on your desktop computer. If your server requires you to use a secure connection, you can select from the given three options: No encryption, TLS encryption or SSL encryption.</para>
-   </formalpara>
-   <para>Your system administrator might ask you to connect to a specific port on a mail server. To specify which port you use, just type a colon and the port number after the server name. For example, to connect to port 143 on the server smtp.example.com, specify smtp.example.com:143 as the server name.</para>
-   <para>For additional information, see <link linkend="second-step">Receiving Mail</link>.</para>
-   <formalpara id="bsbhezv">
-    <title>Receiving Options:</title>
-    <para>Decide if you want to check for mail automatically and how often, as well as setting other message retrieval options.</para>
-   </formalpara>
-   <para>For additional information, see <link linkend="more-mail-options">Receiving Mail Options</link>.</para>
-   <formalpara id="bsbhltb">
-    <title>Sending Mail:</title>
-    <para>Use this section to choose and configure a method for sending mail. You can choose <link linkend="smtp">SMTP</link>, Microsoft Exchange (if you have installed the Evolution Connector for Microsoft Exchange), <link linkend="sendmail">Sendmail</link> or many other options.</para>
-   </formalpara>
-   <para>For additional information, see <link linkend="third-step">Sending Mail</link>.</para>
-   <formalpara id="bsbhn0t">
-    <title>Defaults:</title>
-    <para>Use this section to set where this account stores the messages that it has sent, and the messages that you save as drafts. If you want to revert to the default settings, click Restore.</para>
-   </formalpara>
-   <para>If you want to send someone a copy of every message from this account, select either Always Carbon-Copy (Cc) To: or Always Blind Carbon-Copy (Bcc) To:, and specify one or more addresses.</para>
-   <para>You can specify the way you want to receive message receipts. You can set Send message receipts to Never, Always or Ask for each message. For more information refer <link linkend="b13uhy6r">Default Settings</link>.</para>
-   <para>You can change the default settings of your sent items. Click Advanced Send Options to prioritize, classify your send messages. You can also set the date for reply request so that recipient will know the immediacy and can accordingly response to your message. Enable status tracking and set Return Notification for Mail, Calendar and Task.</para>
-   <formalpara id="bsbhndi">
-    <title>Security:</title>
-    <para>Use this section to set the security options for this account. If you use encryption, enter your PGP key ID (see <link linkend="encryption">Encryption</link> for more information) and select among the four options to determine key and signature handling.</para>
-   </formalpara>
-   <formalpara id="bxmvpry">
-    <title>Proxy:</title>
-    <para>This only displays if you have a GroupWise account. Use this section to set proxy access for other users to access your mailbox or calendar.</para>
-   </formalpara>
-  </section>
-
-  <section id="bshoq5l">
-   <title>Autocompletion</title>
-   <para>The Autocompletion tool lets you choose address books to auto-complete names for you in the mail composer. This functionality requires accessibility to each of the address books you want to use. To enable autocompletion, select each of the address books that you want to use auto completion in the Autocompletion page.</para>
-   <para>Select the Always show address of the autocompleted contact check box to show the email address along with the username.</para>
-   <mediaobject><imageobject><imagedata format="PNG" fileref="figures/evolution_contact_preference.png"/></imageobject></mediaobject>
-  </section>
-
-  <section id="b15fx7uz">
-   <title>IMAP Mail Headers</title>
-   <para>Evolution allows you to choose the headers that you want to download so that you can reduce the download time and filter or move your mail around the way you like it. Evolution helps you to customize your IMAP Mail header preferences and thus save the download time. The IMAP Mail header options are as follows:</para>
-   <formalpara id="b15fzvdp">
-    <title>All Headers:</title>
-    <para>All available IMAP mail headers for all the messages will be downloaded.</para>
-   </formalpara>
-   <formalpara id="b15fzvjw">
-    <title>Basic Headers:</title>
-    <para>This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, Message-ID, Mime-Version, and Content-Type. If you want to just fetch and see messages without having to categorically filter messages based on your mailing lists, choose this option. This will make Evolution work faster and is generally recommended for common users.</para>
-   </formalpara>
-   <formalpara id="b15fzvq4">
-    <title>Mailing List Headers:</title>
-    <para>Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have the informations such as the mailinglist-ID, owner of the mailing list, and so on with which you can create mailing list filters.</para>
-   </formalpara>
-   <para>This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the "Basic Headers Only" option.</para>
-   <para>To set the IMAP Mail headers:</para>
-   <orderedlist>
-    <listitem id="b15fy0yh">
-     <para>Select Edit &gt; Preferences.</para>
-    </listitem>
-    <listitem id="b15fy3hq">
-     <para>Select the IMAP account.</para>
-     <para>Click Edit to open the Account Editor.</para>
-    </listitem>
-    <listitem id="b15fy4cs">
-     <para>On the Account Editor, click IMAP Headers tab to open IMAP Headers to the Account Editor.</para>
-    </listitem>
-    <listitem id="b15fy565">
-     <para>Click Fetch All Headers to download all the available header information.</para>
-     <warning>
-      <para>The more headers you have, the more time it will consume to download. This option is not recommended.</para>
-     </warning>
-    </listitem>
-    <listitem id="b15fzu3n">
-     <para>Click Basic Headers to download basic headers.</para>
-    </listitem>
-    <listitem id="b15g0kdi">
-     <para>Click Basic and Mailing Headers to download both.</para>
-    </listitem>
-    <listitem id="b15g160e">
-     <para>Click Add to add any predefined custom headers.</para>
-    </listitem>
-    <listitem id="b15g168p">
-     <para>Click Remove to remove the custom headers.</para>
-    </listitem>
-   </orderedlist>
-  </section>
-
-  <section id="config-prefs-mail">
-   <title>Mail Preferences</title>
-   <para>The Mail Preferences tool lets you choose how to display citations, how long to wait before marking a message as read, and other mail display settings.</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="config-prefs-mail-general">General Mail Settings</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="mail-prefs-html">HTML Mail Preferences</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="mail-prefs-colors">Label Preferences</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="mail-prefs-headers">Mail Header Preferences</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="mail-prefs-junk">Junk Mail Preferences</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bxjnb81">Automatic Contacts Preferences</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bxjncro">Calendar and Tasks Preferences</link></para>
-    </listitem>
-   </itemizedlist>
-   <para>For information on individual email account settings, see <link linkend="config-prefs-mail-identity">Working with Mail Accounts</link>.</para>
-
-   <section id="config-prefs-mail-general">
-    <title>General Mail Settings</title>
-    <para>The following options are available:</para>
-    <formalpara id="bsbhnw0">
-     <title>Message Fonts:</title>
-     <para>Normally, Evolution uses the same fonts as other GNOME applications. To choose different fonts, deselect Use the same fonts as other applications and select one font for standard typefaces and a second for monospace.</para>
-    </formalpara>
-    <formalpara id="bsbho3f">
-     <title>Message Display:</title>
-     <para>Choose how long you want to wait before marking a message read, how to highlight quotations, and the default encoding. Enable <guilabel>Fall back to threading message by subject</guilabel> to group the messages as message threads. You can also set the limit to the number of addresses displayed in the message header by enabling <guilabel>Shrink To/CC/BCC header to</guilabel> option. You can also set the limit for rendering text content in the message you receive. By default, when you receive a message with text content more than 4096 Kilo Bytes, Evolution will not render the message in the preview pane. You can view unformatted text either inline or using an external application. You can also enable the <link linkend="b17rgdac">Magic spacebar</link> and <link linkend="usage-mail-organize-vfolders">search folders</link>.</para>
-    </formalpara>
-    <para>To group the messages as threads select View &gt; Group By threads or press Ctrl+T.</para>
-    <formalpara id="bsbhq3y">
-     <title>Deleting Mail:</title>
-     <para>Choose whether to delete messages automatically when quitting Evolution and how frequently, and whether you want to explicitly confirm the final deletion of messages. Select Confirm when expunging a folder to confirm the final deletion. You can have four different options to set the frequency for deletion: Everytime, Once per day, Once per week, and Once per month.</para>
-    </formalpara>
-    <formalpara id="bsbhq7t">
-     <title>New Mail Notifications:</title>
-     <para>Evolution can alert you to the arrival of new mail with a beep or by playing a sound file. Choose your alert noise, or select none, as you prefer. You can choose not to notify on new mail arrival.</para>
-    </formalpara>
-   </section>
-
-   <section id="mail-prefs-html">
-    <title>HTML Mail Preferences</title>
-    <para>The following options are available:</para>
-    <formalpara id="bsbhqot">
-     <title>Show Image Animations:</title>
-     <para>Turns image animation (e.g. GIF files) on or off.</para>
-    </formalpara>
-    <formalpara id="bsbhquu">
-     <title>Prompt When Sending HTML Messages to Contacts That Don't Want Them:</title>
-     <para>Some people do not like HTML mail, and you can set Evolution to warn you of this preference. This warning appears only when you send HTML mail to people in your contacts who are listed as disliking HTML.</para>
-    </formalpara>
-    <formalpara id="bsbhr9p">
-     <title>Loading Images:</title>
-     <para>You can embed a image in an email and have it load only when the message arrives. However, spammers can use image loading patterns to confirm <quote>valid</quote> addresses and invade your privacy. You can elect to never load images automatically, to load images only if the sender is in your contacts, or always load images.</para>
-    </formalpara>
-    <para>If you have chosen not to load images automatically, you can choose to see the images in one message at a time by selecting View &gt; Load Images or press Ctrl+I.</para>
-   </section>
-
-   <section id="mail-prefs-colors">
-    <title>Label Preferences</title>
-    <para>The Label preferences option lets you add color labels for different kinds of messages. You can add, edit, or remove the labels. You can also assign colors to each label you create. You cannot remove the default labels.</para>
-    <mediaobject id="b1ahji7w"><imageobject><imagedata format="PNG" fileref="figures/evo_labels_a.png"/></imageobject></mediaobject>
-    <para>To create a label:</para>
-    <orderedlist>
-     <listitem id="b1a58p9g">
-      <para>Click Add and specify the name in the Label Name dialog box.</para>
-     </listitem>
-     <listitem id="b1a58pyg">
-      <para>Click the color tab and select a color, then click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>To edit label properties:</para>
-    <orderedlist>
-     <listitem id="b1a58tbo">
-      <para>Select the label and click Edit.</para>
-     </listitem>
-     <listitem id="b1a58vfx">
-      <para>Edit name and color, then click OK.</para>
-     </listitem>
-    </orderedlist>
-    <para>To assign a label to a specific email message:</para>
-    <orderedlist>
-     <listitem id="b1a58ynk">
-      <para>Right-click the message from the message preview.</para>
-     </listitem>
-     <listitem id="b1a58zoy">
-      <para>Click Label and select the desired label for the message.</para>
-      <mediaobject id="b1a59ar0"><imageobject><imagedata format="PNG" fileref="figures/evo_label_a.png"/></imageobject></mediaobject>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="mail-prefs-headers">
-    <title>Mail Header Preferences</title>
-    <para>The headers on an incoming message are the information about the message that isn't the content of the message itself, such as the sender and the time it was sent. Select the options here to show or hide different amounts of information about the messages you read. You can also add or remove new mail headers to the list. The default mail headers cannot be removed.</para>
-    <formalpara id="b17qfhkz">
-     <title>Sender Photograph:</title>
-     <para>This feature adds support for viewing the photograph of the sender at the right side of the preview pane.</para>
-    </formalpara>
-    <para>To enable this feature, select Edit &gt; Preferences &gt; Mail Preferences &gt; Headers &gt; Show the photograph of sender in the email preview. Deselect this option to disable this feature.</para>
-    <para>By default it searches only in the local address books enabled for autocompletion. If you deselect the option <guilabel>Search for sender photograph only in the local address book</guilabel>, it searches in all the address books enabled for autocompletion. If there are multiple matches for the same contact, it always takes the first one. Consider a contact that has multiple matches - the first one with a photograph and the second without a photo. Here, Evolution takes the first contact regardless of it not having a photograph.</para>
-    <para>This feature is disabled by default as it causes delay in fetching the messages.</para>
-    <formalpara>
-     <title>Configurable Date and Time Format</title>
-     <para>Although Evolution components have a set of predefined date and time formats, an advanced user can write acceptable strftime, with new tag %ad for an abbreviated date to show in tables and date headers.</para>
-    </formalpara>
-    <mediaobject><imageobject><imagedata format="PNG" fileref="figures/evolution_mail_preference.png"/></imageobject></mediaobject>
-   </section>
-
-   <section id="mail-prefs-junk">
-    <title>Junk Mail Preferences</title>
-    <para>You can check your incoming messages for junk content by using Bogofilter and SpamAssassin&z-3rdParty; tools, which have trainable Bayesian filters. You need to enable the Junk plugins to start filtering junk mail.</para>
-    <para>To enable Junk plugins:</para>
-    <orderedlist>
-     <listitem id="b17rdxkm">
-      <para>Select Edit &gt; Plugins.</para>
-     </listitem>
-     <listitem id="b17rdxz8">
-      <para>Select the junk plugins you want. You can select either Bogofilter or SpamAssassin, or you can select both.</para>
-     </listitem>
-    </orderedlist>
-    <formalpara id="b17rdsy5">
-     <title>General:</title>
-     <para>You can check incoming email for junk contents and also decide how often you want to delete junk mail. You also have the option to choose either SpamAssassin or Bogofilter, or you can select both.</para>
-    </formalpara>
-    <formalpara id="bsaz9zd">
-     <title>Checking Incoming Mail for Junk:</title>
-     <para>This option turns automatic junk mail filtering on or off.</para>
-    </formalpara>
-    <formalpara id="b17xmakf">
-     <title>Delete junk mail on exit:</title>
-     <para>This option deletes junk messages when you exit. You can also specify when to delete the junk messages (every time, once per day, once per week, once per month).</para>
-    </formalpara>
-    <formalpara id="b17rfn2y">
-     <title>Default junk plugin:</title>
-     <para>Select either SpamAssassin or Bogofilter, or both, as your junk filter. You can view them only if you have enabled the respective plugins. When you select any option, it also reports if the underlying binary is available or not.</para>
-    </formalpara>
-    <mediaobject id="b17rds6i"><imageobject><imagedata format="PNG" fileref="figures/evo_junk_a.png"/></imageobject></mediaobject>
-    <formalpara id="b17rfjfx">
-     <title>SpamAssassin Options:</title>
-     <para>Remote Test performs junk mail filtering on remote servers. It also includes online tests, like checking for blacklisted message senders and ISPs.</para>
-    </formalpara>
-    <para>This option uses tests that require a network connection, such as checking to see if a message is in a list of known junk messages, or if the sender or gateway are blacklisted by anti-spam organizations. Online tests can make filtering slower, because remote tests add to the amount of time it takes to check for junk mail, but they increase accuracy. When you select this option, you do not need to do any additional setup.</para>
-    <formalpara id="b17rfjnv">
-     <title>Bogofilter Options:</title>
-     <para>Select Convert mail text to Unicode to enable Unicode&z-3rdParty; filtering. For more information on Bogofilter, see the <ulink url="http://bogofilter.sourceforge.net/">Bogofilter site</ulink>.</para>
-    </formalpara>
-    <note>
-     <para>Check new messages for junk contents option under Edit &gt; Preferences &gt; Mail Accounts &gt; Edit &gt; Receiving options is enabled only for IMAP. Check incoming mail for junk option under Edit &gt; Preferences &gt; Mail Preferences &gt; Junk &gt; General refers only to POP and Local Delivery.</para>
-    </note>
-   </section>
-
-   <section id="bxjnb81">
-    <title>Automatic Contacts Preferences</title>
-    <para>There are two items in this section: Automatic Contacts automatically adds people that you respond to into your address book. You can select the default address book for automatic contacts from the list.</para>
-    <para>Instant Messaging Contacts periodically synchronizes contact information and images with your instant messaging program. Currently this only works with Pidgin. Your address book must not be a read-only one for both these features to function properly.</para>
-   </section>
-
-   <section id="bxjncro">
-    <title>Calendar and Tasks Preferences</title>
-    <para>Allows you to delete messages after you have acted on an appointment. It also allows you to select calendars to search for meeting conflicts.</para>
-   </section>
-  </section>
-
-  <section id="config-prefs-mail-composer">
-   <title>Composer Preferences</title>
-   <para>There are three tabs for message composer settings where you can set the composer preferences. The General tab covers assorted behavior, the Signature tab sets your signature, and the Spell Checking tab controls spell checking.</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="bshpixy">General</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bshpjpl">Signature</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bshpjuj">Spell Checking</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="bshpixy">
-    <title>General</title>
-    <para>The following options are available:</para>
-    <formalpara id="bsbhs8n">
-     <title>Default Behavior:</title>
-     <para>Choose how to normally forward and reply to messages, what character set they will use, whether they are in HTML, and whether that HTML can contain graphic emoticons.</para>
-    </formalpara>
-    <para>You can forward messages either as an attachment or inline, or else as quoted. Choose reply style from the drop-down list: Quote original message, Do not quote original message, Attach original message.</para>
-    <formalpara id="b17qahr1">
-     <title>Top Posting Options:</title>
-     <para>When replying, you can choose where to place your signature in the message. You can place the signature either above the original message or at the end of the composer window. Top Posting is not recommended because placing the signature other than at the end of the message is against the mailing standards.</para>
-    </formalpara>
-    <formalpara id="bsbhsf6">
-     <title>Alerts:</title>
-     <para>There are two optional alerts you can select:</para>
-    </formalpara>
-    <itemizedlist>
-     <listitem>
-      <formalpara id="bsbht5d">
-       <title>Prompt When Sending Messages With an Empty Subject Line:</title>
-       <para>The composer warns you if you try to send a message without a subject.</para>
-      </formalpara>
-     </listitem>
-     <listitem>
-      <formalpara id="bsbhto4">
-       <title>Prompt When Sending Messages with Only Bcc Recipients Defined:</title>
-       <para>The composer warns you if you try to send a message that has only Bcc recipients. This is important because some mail servers fail to transmit blind carbon copy if you do not have at least one recipient that is visible to all readers.</para>
-      </formalpara>
-     </listitem>
-    </itemizedlist>
-   </section>
-
-   <section id="bshpjpl">
-    <title>Signature</title>
-    <para>The signature editor allows you to create several different signatures in plain text or in HTML, and to specify which of them will be added to email you create in the message composer. If you prefer to use an alternate signature or none at all, you can select it from the mail composer itself.</para>
-   </section>
-
-   <section id="bshpjuj">
-    <title>Spell Checking</title>
-    <para>To choose a spell-checking language, select it here. You must install enchant and a hunspell language package
-(like for example hunspell-en for english language) for spell-checking to be available in Evolution. Additional dictionaries are available through your package manager and are detected automatically if you have installed them. To have the composer automatically check your spelling while you type, select Check Spelling While I Type. You can set the color for misspelled words.</para>
-   </section>
-  </section>
-
-  <section id="config-prefs-cal">
-   <title>Calendar and Tasks Settings</title>
-   <para>The calendar configuration tool has several pages:</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="bshpskx">General</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bshpsxa">Display</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="CACHCGCI">Alarms</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bxjng8p">Calendar Publishing</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <mediaobject id="b1g4qv16"><imageobject><imagedata format="PNG" fileref="figures/evo_caltasks_a.png"/></imageobject></mediaobject>
-   <section id="bshpskx">
-    <title>General</title>
-    <para>The following options are available:</para>
-    <formalpara id="bsbhukf">
-     <title>Time Zone:</title>
-     <para>The city you're located in, to specify your time zone.</para>
-    </formalpara>
-    <formalpara id="bsbhup9">
-     <title>Time Format:</title>
-     <para>Choose between twelve-hour (AM/PM) and twenty-four-hour time formats.</para>
-    </formalpara>
-    <formalpara id="b1g4qvkl">
-     <title>Second Zone:</title>
-     <para>Specify a location for the second time zone.</para>
-    </formalpara>
-    <para>You can view both the time zones in the calendar view.</para>
-    <formalpara id="bsbhuut">
-     <title>Week Starts:</title>
-     <para>Select the day to display as the first in each week.</para>
-    </formalpara>
-    <formalpara id="bsbhuzl">
-     <title>Day Begins:</title>
-     <para>For Evolution, a normal work day begins at 9 a.m. and ends at 5 p.m. You can select your preferred hours.</para>
-    </formalpara>
-    <formalpara id="bsbhv3n">
-     <title>Day Ends:</title>
-     <para>Sets the end of a normal workday.</para>
-    </formalpara>
-    <formalpara id="bsbhv7r">
-     <title>Alerts:</title>
-     <para>If you want to be warned before you delete any appointment, or to have a reminder automatically appear for each event, select the options here.</para>
-    </formalpara>
-   </section>
-
-   <section id="bshpsxa">
-    <title>Display</title>
-    <para>The Display page lets you choose how your appointments and tasks appear in your calendar.</para>
-    <formalpara id="bsbhvoy">
-     <title>Time Divisions:</title>
-     <para>Sets the time increments shown as fine lines on the daily view in the calendar.</para>
-    </formalpara>
-    <formalpara id="bsbhvt1">
-     <title>Show appointment end times in week and month views:</title>
-     <para>If there is space, Evolution shows the end times in the week and month views for each appointment.</para>
-    </formalpara>
-    <formalpara id="bsbhw0r">
-     <title>Compress weekends in month view:</title>
-     <para>Select this option to display weekends in one box instead of two in the month view.</para>
-    </formalpara>
-    <formalpara id="bsbhw7p">
-     <title>Show week numbers:</title>
-     <para>Shows the week numbers next to the respective weeks in the calendar.</para>
-    </formalpara>
-    <formalpara id="bsbhwdz">
-     <title>Tasks due today:</title>
-     <para>Select the color for tasks due today.</para>
-    </formalpara>
-    <formalpara id="bsbhwj5">
-     <title>Overdue tasks:</title>
-     <para>Select the color for overdue tasks.</para>
-    </formalpara>
-    <formalpara id="bsbhwnw">
-     <title>Hide completed tasks after:</title>
-     <para>Select this option to have completed tasks hidden after a period of time measured in days, hours, or minutes. If you don't select this option, completed tasks remain in your task list, marked as complete.</para>
-    </formalpara>
-     </section>
-
-   <section id="CACHCGCI">
-    <title>Alarms</title>
-    <formalpara id="b101llxc">
-     <title>Select the Calendars for Alarm Notification:</title>
-     <para>Select the calendars for which you want an alarm notification. If you don't select the calendar, you will not have an alarm notification for any event in this calendar.</para>
-    </formalpara>
-    <para>Click Dismiss to close the alarm. Click Dismiss All to close all the alarm notifications.</para>
-   </section>
-
-   <section id="b13yjhw2">
-    <title>Free/Busy</title>
-    <para>You can specify a template to use when posting to the Free/Busy server.</para>
-   </section>
-
-   <section id="bxjng8p">
-    <title>Calendar Publishing</title>
-    <formalpara id="bxpfx0s">
-     <title>Publishing:</title>
-     <para>Allows you to select a URL to post your calendar information to. When you add a URL, you can specify the publishing location, the frequency of publishing, which calendar to publish, and who to authenticate as.</para>
-    </formalpara>
-   </section>
-  </section>
-
-  <section id="b15m55rz">
-   <title>Network Preferences</title>
-   <para>This interface lets you configure your network proxy settings.</para>
-   <para>The following options are available:</para>
-   <formalpara id="b15m5zr2">
-    <title>Use system defaults:</title>
-    <para>Select this option to use the system wide proxy settings configured through Control Center &gt; Network Proxies in GNOME. When this option is selected, Evolution uses the proxy settings in the /system/http_proxy and /system/proxy/gconf keys.</para>
-   </formalpara>
-   <important>
-    <para>If these keys do not reflect the settings configured through Control Center &gt; Network Proxies, Evolution does not work with the proxy and you must either update these gconf keys or choose Manual proxy configuration.</para>
-   </important>
-   <formalpara id="b15m65gt">
-    <title>Direct connection to the Internet:</title>
-    <para> Select this option to connect directly to the internet.</para>
-   </formalpara>
-   <formalpara id="b15m65i4">
-    <title>Manual proxy configuration:</title>
-    <para>This option helps you costomize proxy settings regardless of the desktop you use. Specify hosts and ports for HTTP and optionally for other protocols. In the No Proxy Domain field, specify that comma-separated domain names do not go through the configured proxy server. You can specify patterns like *.example.com or .example.com in the No Proxy Domain list. Specify a username and password, and if the proxy server requires authentication, select Use Authentication to enable the username and password fields. The customized proxy settings are as follows:</para>
-   </formalpara>
-   <informaltable>
-    <tgroup cols="2">
-     <colspec colwidth="2.688*" colname="1" colnum="1"/>
-     <colspec colwidth="2.688*" colname="2" colnum="2"/>
-     <thead valign="top">
-      <row id="b15ot8mi">
-       <entry colname="1">
-        <para>Proxy Configuration Settings</para>
-       </entry>
-       <entry colname="2">
-        <para>Description</para>
-       </entry>
-      </row>
-     </thead>
-     <tbody valign="top">
-      <row id="b15ot8mj">
-       <entry colname="1">
-        <para>HTTP Proxy</para>
-       </entry>
-       <entry colname="2">
-        <para>The machine name to proxy HTTP through.</para>
-       </entry>
-      </row>
-      <row id="b15ot8mk">
-       <entry colname="1">
-        <para>Port</para>
-       </entry>
-       <entry colname="2">
-        <para>The port for the machine defined by the HTTP Proxy field that you proxy through.</para>
-       </entry>
-      </row>
-      <row id="b15ot9cv">
-       <entry colname="1">
-        <para>Secure HTTP Proxy</para>
-       </entry>
-       <entry colname="2">
-        <para>The machine name to proxy secure HTTP through.</para>
-       </entry>
-      </row>
-      <row id="b15ot9e8">
-       <entry colname="1">
-        <para>Port</para>
-       </entry>
-       <entry colname="2">
-        <para>The port for the machine defined by the Secure HTTP Proxy port field.</para>
-       </entry>
-      </row>
-      <row id="b15ot9f9">
-       <entry colname="1">
-        <para>SOCKS Host</para>
-       </entry>
-       <entry colname="2">
-        <para>The machine name to proxy SOCKS through.</para>
-       </entry>
-      </row>
-      <row id="b15ot9g7">
-       <entry colname="1">
-        <para>Port</para>
-       </entry>
-       <entry colname="2">
-        <para>The port for the machine defined by the SOCKS host.</para>
-       </entry>
-      </row>
-      <row id="b15ot9h3">
-       <entry colname="1">
-        <para>No proxy domain</para>
-       </entry>
-       <entry colname="2">
-        <para>This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.example.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask similar to 192.168.0.0/24.</para>
-       </entry>
-      </row>
-      <row id="b15ot9hy">
-       <entry colname="1">
-        <para>Use authentication</para>
-       </entry>
-       <entry colname="2">
-        <para>If this option is enabled, it uses authentication to connect via the proxy server.</para>
-       </entry>
-      </row>
-      <row id="b15ot9j3">
-       <entry colname="1">
-        <para>Username</para>
-       </entry>
-       <entry colname="2">
-        <para>Username used to authenticate when performing an HTTP proxying.</para>
-       </entry>
-      </row>
-      <row id="b15ot9ln">
-       <entry colname="1">
-        <para>Password</para>
-       </entry>
-       <entry colname="2">
-        <para>Password used to authenticate when performing an HTTP proxying.</para>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-  
-  <section id="bshoty0">
-   <title>Certificates</title>
-   <para>Evolution allows you to add certificates for yourself as well as for contacts. This allows you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption.</para>
-   <formalpara id="bshov9m">
-    <title>Your Certificates:</title>
-    <para>Click the Your Certificates tab to display a list of certificates that you own. You can import, view and delete your certificates from this page.</para>
-   </formalpara>
-   <formalpara id="bshovvp">
-    <title>Contact Certificates:</title>
-    <para>Click the Contact Certificates tab to display a list of certificates that you have for contacts. These certificates allow you to decrypt messages as well verify signed messages. You can import, view, edit, and delete your contact certificates from this page.</para>
-   </formalpara>
-   <formalpara id="bshowu7">
-    <title>Authorities:</title>
-    <para>Click the Authorities tab to display a list of trusted certificate authorities who verify that the certificate you have is valid. You can import, view, edit, and delete certificate authorities from this page.</para>
-   </formalpara>
-  </section>
-
-  <section id="config-prefs-contact">
-   <title>Contact Management</title>
-   <para>There are two main tasks for configuring contact information:</para>
-   <itemizedlist>
-    <listitem>
-     <para><link linkend="bxmw6mw">Creating a Contact List</link></para>
-    </listitem>
-    <listitem>
-     <para><link linkend="bxmw6w5">Creating an Address Book</link></para>
-    </listitem>
-   </itemizedlist>
-
-   <section id="bxmw6mw">
-    <title>Creating a Contact List</title>
-    <para>To add a new contact list, either local or remote:</para>
-    <orderedlist>
-     <listitem id="bsbhwyr">
-      <para>Click Contacts in the Switcher.</para>
-     </listitem>
-     <listitem id="bsbhx27">
-      <para>Click the down-arrow next to New.</para>
-     </listitem>
-     <listitem id="bsbhxhp">
-      <para>Select Contact List.</para>
-     </listitem>
-     <listitem id="bsbhxk3">
-      <para>Type a name for the contact list and choose an address book under "Where".</para>
-     </listitem>
-     <listitem id="bsbi2rh">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-
-   <section id="bxmw6w5">
-    <title>Creating an Address Book</title>
-    <orderedlist>
-     <listitem id="bxmw77d">
-      <para>Click File &gt; New &gt; Address Book.</para>
-     </listitem>
-     <listitem id="bxmw7a9">
-      <para>Select the type of Address Book.</para>
-      <formalpara id="bxmw7f3">
-       <title>On This Computer:</title>
-       <para>Creates a local address book on the computer.</para>
-      </formalpara>
-      <formalpara id="bxmw7nv">
-       <title>On LDAP Server:</title>
-       <para>Creates an address book on the LDAP server.</para>
-      </formalpara>
-      <formalpara id="bxmw804">
-       <title>Specific Account:</title>
-       <para>If you have an account that allows you to create an address book on that server, you can select that account.</para>
-      </formalpara>
-     </listitem>
-     <listitem id="bxmw8kf">
-      <para>If you selected On This Computer, specify the name of the address book, and choose whether you want to the new address book as your default folder.</para>
-      <para>or</para>
-      <para> If you are creating an address book on an <link linkend="ldap">LDAP</link> server, enter the server information as requested by the assistant:</para>
-      <formalpara id="bxmwai1">
-       <title>Server Name:</title>
-       <para>The Internet address of the contact server you are using.</para>
-      </formalpara>
-      <formalpara id="bxmwai2">
-       <title>Login Method:</title>
-       <para>Specify whether your login is anonymous, uses an email address, or uses a distinguished name. If the login is not anonymous, specify the email address or distinguished name (DN) required by the server.</para>
-      </formalpara>
-      <formalpara id="bxmwai3">
-       <title>Port:</title>
-       <para>The Internet port Evolution connects to in order to access the LDAP database. This is normally 389.</para>
-      </formalpara>
-      <formalpara id="bxmwai4">
-       <title>Use SSL/TLS:</title>
-       <para>SSL and TLS are security mechanisms. If you select No Encryption, Evolution will send your password unencrypted. By using SSL or TLS, a secure connection will be used and your password will be sent encrypted.</para>
-      </formalpara>
-      <formalpara id="bxmwai5">
-       <title>Details: Search Base:</title>
-       <para>The <link linkend="search-base">search base</link> is the starting point for a directory search. Contact your network administrator for information about the correct settings.</para>
-      </formalpara>
-      <formalpara id="bxmwai6">
-       <title>Search Scope:</title>
-       <para>The <link linkend="search-scope">search scope</link> is the breadth of a given search. The following options are available:</para>
-      </formalpara>
-      <itemizedlist>
-       <listitem>
-        <formalpara id="bxmwai7">
-         <title>One:</title>
-         <para>Searches the Search Base and one entry below it.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bxmwai8">
-         <title>Sub:</title>
-         <para>Searches the Search Base and all entries below it.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bxmwai9">
-         <title>Timeout (minutes):</title>
-         <para>The maximum time Evolution attempts to download data from the server before giving up.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bxmwaia">
-         <title>Download Limit:</title>
-         <para>The maximum number of results for a given search. Most servers refuse to send more than 500, but you can set the number lower if you want to shorten downloads for very broad searches.</para>
-        </formalpara>
-       </listitem>
-       <listitem>
-        <formalpara id="bxmwaib">
-         <title>Display Name:</title>
-         <para>The name you want to use as a label for this folder. It can be any name you choose.</para>
-        </formalpara>
-       </listitem>
-      </itemizedlist>
-      <formalpara id="b1012vdq">
-       <title>Search Filter:</title>
-       <para>The search filter can be set here for all the LDAP queries. For example:</para>
-      </formalpara>
-      <para>ObjectClass=*: Lists all the objects from the server.ObjectClass=User: Lists only the users. Filter (|(ObjectClass=User)(ObjectClass=groupOfNames)): Retrieves the User and Contact List objects.(&amp;(mail=*)(ObjectClass=*)): Lists the objects associated with the email addresses.</para>
-      <note>
-       <para>If you change any LDAP address book configurations, Evolution and the Evolution Data Server need to be restarted in order to see the changes.</para>
-      </note>
-      <para>or</para>
-      <para>If you are creating the address book for a specific account, type the name of the address book if you want the address book stored locally when offline, and if you want the address book to be your default folder.</para>
-     </listitem>
-     <listitem id="bxmw9v2">
-      <para>Click OK.</para>
-     </listitem>
-    </orderedlist>
-   </section>
-  </section>
-  
-  <section id="b1a4ol61">
-   <title>Debug Logs</title>
-   <para>Evolution allows you to view the error logs and set the display duration for the error messages that appear in the statusbar. When an error occurs, statusbar displays the error message for the specified time, then it is moved to the debug file.</para>
-   <orderedlist>
-    <listitem id="b1a4opqg">
-     <para>From the Help menu, select Debug Logs.</para>
-     </listitem>
-    <listitem id="b1a4orv0">
-     <para>Specify for how long error messages will be displayed in the statusbar.</para>
-    </listitem>
-   </orderedlist>
-   <note>
-    <para>The <inlinegraphic format="PNG" fileref="figures/evo_dialog-warning.png"/> icon indicates that the error message is a warning. The <inlinegraphic format="PNG" fileref="figures/evo_dialog-info.png"/> icon indicates an informational message.</para>
-   </note>
-  </section>
- </chapter>
-
- <chapter id="config-sync">
-  <title>Synchronizing Your Handheld Device</title>
-  <para>Synchronization presents you with three issues you need to address. First, you need to enable synchronization. Second, your computer needs to recognize and access your handheld. At this time, <trademark>Evolution</trademark> only supports Palm OS devices like the PalmPilot&z-3rdParty; and the Handspring Visor. Third, you should decide what sort of synchronization behavior you want.</para>
-  <itemizedlist>
-   <listitem>
-    <para><link linkend="bshq58g">Enabling Synchronization</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bshq7hl">Selecting Conduits</link></para>
-   </listitem>
-   <listitem>
-    <para><link linkend="bshq2qn">Synchronizing Information</link></para>
-   </listitem>
-  </itemizedlist>
-
-  <section id="bshq58g">
-   <title>Enabling Synchronization</title>
-   <para>If you haven't used a handheld device with your computer before, you need to run the GNOME Control Center by clicking System &gt; Settings, and make sure that Pilot Link is properly configured. Make sure that you have read and write permissions on the device, which is normally in /dev/pilot. If that does not work, check in /dev/ttyS0 if you have a serial connection, or in /dev/ttyUSB1 for a USB connection. You can do this by becoming root and adding your username to the group that owns this device node. For a USB device on sync, two device nodes are created, ttyUSB0 and ttyUSB1. The second node is the one to be used in configuring the device.</para>
-  </section>
-
-  <section id="bshq7hl">
-   <title>Selecting Conduits</title>
-   <para>After your computer and your Palm OS device are communicating, select the <link linkend="conduit">conduits</link> you want under the Pilot Conduits section of the Control Center. You can use conduits to synchronize data with several applications; the Evolution conduits are labeled EAddress, for the contacts in your address book; ECalendar, for your calendar; and ETodo, for your task list.</para>
-   <para>Click Enable, then click Settings to change what the conduit does when activated. Your options can vary depending on the conduit, but typically they are as follows:</para>
-   <formalpara id="bsbi551">
-    <title>Disabled:</title>
-    <para>Do nothing.</para>
-   </formalpara>
-   <formalpara id="bsbi5aa">
-    <title>Synchronize:</title>
-    <para>Copy new data from the computer to the handheld, and from the handheld to the computer. Remove items that were on both systems but have been deleted on one.</para>
-   </formalpara>
-   <formalpara id="bsbi5es">
-    <title>Copy From Pilot:</title>
-    <para>If there is any new data on the handheld device, copy it to the computer.</para>
-   </formalpara>
-   <formalpara id="bsbi5k1">
-    <title>Copy To Pilot:</title>
-    <para>Copy new data from the computer to the handheld.</para>
-   </formalpara>
-   <para>Select the behavior you want for each conduit you choose to use. If you're not sure, use Synchronize.</para>
-  </section>
-
-  <section id="bshq2qn">
-   <title>Synchronizing Information</title>
-   <para>Use the following procedure to synchronize the data on your Palm OS device with the data you store in Evolution.</para>
-   <para>If you want to back up your information before synchronizing, make a copy of the <command>.evolution</command> directory inside your home directory.</para>
-   <orderedlist>
-    <listitem id="bshq1vg">
-     <para>Put your handheld device in its cradle and press the HotSync button.</para>
-     <para>If you use Palm OS v. 4.0 and have password protection turned on for your handheld device, you might encounter trouble synchronizing. If this happens, try turning off password protection on your handheld, synchronize it with your desktop computer, and then re-enable password protection on your handheld.</para>
-    </listitem>
-   </orderedlist>
-   <para>If you have followed the setup instructions properly, your Palm OS device will synchronize data with Evolution.</para>
-  </section>
- </chapter>
-
- <appendix id="outlook-migration">
-  <title>Migration from Outlook to Evolution</title>
-  <para>If you are using Microsoft Outlook, but not Microsoft Exchange, this section helps you switch to <trademark>Evolution</trademark>.</para>
-
-  <section id="outlook-migration-mail">
-   <title>Migrating Local Outlook Mail Folders</title>
-   <para>Exchange and IMAP mail is stored on the server, so you do not need to migrate it to your Linux&z-3rdParty; partition. However, if you have stored mail on your computer, you might want to make it accessible to Evolution.</para>
-   <para>First, while using Windows, prepare your messages for import:</para>
-   <orderedlist>
-    <listitem id="bshqe24">
-     <para>Clean up your mail. Delete messages and folders you do not need, and click File &gt; Folders &gt; Properties &gt; Advanced &gt; Compact to erase old, deleted messages from your PST file.</para>
-    </listitem>
-    <listitem id="bshqe4g">
-     <para>If you nest your folders one inside another, you might want to rename subfolders so that you can tell which folder they belong to. You must re-nest them after you load them into Evolution.</para>
-    </listitem>
-    <listitem id="bshqe6i">
-     <para>Import the files into Mozilla Mail (or another mailer, such as Netscape or Eudora, that uses the standard mbox format).</para>
-     <para>Linux mailers cannot do this task, because it requires a library available only under Windows. In Mozilla, import by selecting Window Mail &amp; Newsgroups Tools Import.</para>
-    </listitem>
-   </orderedlist>
-   <para>Mozilla creates a set of files in the directory<command> Windows\Application_Data\Mozilla\Profiles\(UserName)\(Random Letters)\Mail\Local Folders\OutlookMail\</command>. The data files are those that have no file extension.</para>
-   <para>If you are using Windows Vista&z-3rdParty;, Windows XP&z-3rdParty; or Windows 2000&z-3rdParty;, your Windows hard drive is probably in the NTFS format, which some Linux systems cannot read without additional software. You might find it simpler to copy the mail folders to a different drive or to burn a CD.</para>
-   <para>When you have your mail in a format Evolution can understand, reboot to Linux. Then continue with the following procedure. To create new folders for your files:</para>
-   <orderedlist>
-    <listitem id="bshqeej">
-     <para>Mount your Windows drive or the disk where you saved the mail files.</para>
-    </listitem>
-    <listitem id="bshqegg">
-     <para>Copy all the mail files into your home directory or another convenient place.</para>
-    </listitem>
-    <listitem id="bshqeia">
-     <para>Start Evolution.</para>
-    </listitem>
-    <listitem id="bshqejx">
-     <para>Select File &gt; New &gt; Mail Folder to create the folders you want.</para>
-    </listitem>
-   </orderedlist>
-   <para>To import the data files:</para>
-   <orderedlist>
-    <listitem id="bshqep7">
-     <para>In Evolution, open the File Import assistant by clicking File &gt; Import.</para>
-    </listitem>
-    <listitem id="bshqera">
-     <para>Click Next, then select Import a single file.</para>
-    </listitem>
-    <listitem id="bshqesz">
-     <para>Click on the filechooser to select the data file.</para>
-     <para>Remember, the data files are the files that have no file extension.</para>
-    </listitem>
-    <listitem id="bshqeuv">
-     <para>Select the folder where you want to put the imported data file.</para>
-    </listitem>
-    <listitem id="bshqg85">
-     <para>Click OK.</para>
-    </listitem>
-    <listitem id="bshqex9">
-     <para>Repeat the import steps until you have imported all your mail.</para>
-    </listitem>
-   </orderedlist>
-  </section>
- </appendix>
-
- <appendix id="menuref">
-  <title>Quick Reference</title>
-  <para>You can print this section to use it as a quick reference for most of the things you want to do with <trademark>Evolution</trademark> by selecting Help &gt; Quick Reference in the Menubar.</para>
-   <mediaobject id="b17sanky"><imageobject><imagedata format="PNG" fileref="figures/quick_reference.png"/></imageobject></mediaobject>
- </appendix>
-
- <appendix id="bugs">
-  <title>Known Bugs and Limitations</title>
-  <para><trademark>Evolution</trademark> bug tracking is done at the <ulink url="http://bugzilla.gnome.org">GNOME bug tracking System</ulink>. You can use that, or the GNOME Bug Report Tool (known as bug-buddy at the command line) if you find bugs or want to request new features.</para>
-  <para>A complete list of feature requests and other issues with Evolution is available online in the GNOME bug tracking system. You can learn more about the Evolution development process at the <ulink url="http://gnome.org/projects/evolution/developer.shtml">Evolution Developer site</ulink>.</para>
- </appendix>
-
- <appendix id="authors">
-  <title>Authors</title>
-  <para>Evolution was written by the <trademark>Evolution</trademark> team and numerous other dedicated GNOME programmers. You can see their names by clicking Help &gt; About from the main Evolution window.</para>
-  <para>The Evolution code owes a great debt to the GNOME-pim and GNOME-Calendar applications, and to KHTMLW. The developers of Evolution acknowledge the efforts and contributions of all who worked on those projects.</para>
-  <para>For more information please visit the Evolution <ulink url="http://www.gnome.org/projects/evolution">Web page</ulink>. Please send all comments, suggestions, and bug reports to the <ulink url="http://bugzilla.gnome.org">bug tracking database</ulink>. Instructions for submitting bug reports can be found on-line at the same location. You can also use the GNOME bug report tool, bug-buddy, to submit your defect reports.</para>
-  <para>This manual was written by:</para>
-  <itemizedlist>
-   <listitem>
-    <para>Radhika PC (pradhika@novell.com)</para>
-   </listitem>
-   <listitem>
-    <para>Srinivasa Ragavan (sragavan@novell.com)</para>
-   </listitem>
-   <listitem>
-    <para>Andre Klapper (ak-47@gmx.net)</para>
-   </listitem>
-   <listitem>
-    <para>Francisco Javier F. Serrador (serrador@tecknolabs.com)</para>
-   </listitem>
-   <listitem>
-    <para>Mark Moulder (mmoulder@novell.com)</para>
-   </listitem>
-   <listitem>
-    <para>Jessica Prabhakar (jprabhakar@novell.com)</para>
-   </listitem>
-   <listitem>
-    <para>Aaron Weber (aaron@ximian.com)</para>
-   </listitem>
-   <listitem>
-    <para>Kevin Breit (mrproper@ximian.com)</para>
-   </listitem>
-   <listitem>
-    <para>Duncan Mak (duncan@ximian.com)</para>
-   </listitem>
-   <listitem>
-    <para>Ettore Perazzoli (ettore@ximian.com)</para>
-    </listitem>
-    <listitem>
-    <para>Akhil Laddha (lakhil@novell.com)</para>
-    </listitem> 
-    <listitem>
-    <para>With the help of the application programmers and the GNOME Documentation Project.</para>
-   </listitem>
-  </itemizedlist>
-  <para>Please file comments and suggestions for this manual as bugs in the GNOME bug tracking system. If you contributed to this project but do not see your name here, please contact Radhika PC (pradhika@novell.com) or Srinivasa Ragavan (sragavan@novell.com) and either of them will list you.</para>
- </appendix>
-
- <glossary id="apx-gloss">
-  <title>Glossary</title>
-  <para>This glossary contains terms that are frequently used in this guide as well as in <trademark>Evolution</trademark>.</para>
-  <glossentry id="assistant">
-   <glossterm>Assistant</glossterm>
-   <glossdef>
-    <para>A tool that guides a user through a series of steps, usually to configure or set up a program. Equivalent to Wizard and Druid.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="attachment">
-   <glossterm>attachment</glossterm>
-   <glossdef>
-    <para>Any file sent with an email. Attachments can be embedded in a message or appended to it.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="automatic-indexing">
-   <glossterm>automatic indexing</glossterm>
-   <glossdef>
-    <para>A feature which allows Evolution to quickly find and sort data.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="bsi89la">
-   <glossterm>Bcc (Blind Carbon Copy)</glossterm>
-   <glossdef>
-    <para>Blind copy recipients (Bcc) receive a copy of an item. Other recipients receive no information about blind copies. Only the sender and the blind copy recipient know that a blind copy was sent. If a recipient replies and chooses Reply to All, the blind copy recipient does not receive the reply.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="cc">
-   <glossterm>Cc (Carbon Copy)</glossterm>
-   <glossdef>
-    <para>Carbon copy recipients (CC) receive a copy of an item. CC recipients are users who would benefit from the information in an item, but are not affected by or directly responsible for it. All recipients can see that a carbon copy was sent. They can also see the names of the CC recipients.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="conduit">
-   <glossterm>conduit</glossterm>
-   <glossdef>
-    <para>A small application that controls the transfer of data between a handheld device and a desktop computer.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="evolution">
-   <glossterm>Evolution</glossterm>
-   <glossdef>
-    <para>The GNOME groupware application.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="execute">
-   <glossterm>execute</glossterm>
-   <glossdef>
-    <para>To run a program. Any file that can be run is called an executable. Evolution can download executable attachments, but before they can be run, the files must be marked as executable with a shell or file manager. This security precaution prevents the automatic or accidental execution of malicious programs. For more information on executables and file permissions, see the documentation for your file manager or shell.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="expunge">
-   <glossterm>expunge</glossterm>
-   <glossdef>
-    <para>When messages are marked for deletion, they remain until they are expunged. When a message is expunged, it is permanently deleted, as long as it was marked for deletion.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="filetree">
-   <glossterm>file tree</glossterm>
-   <glossdef>
-    <para>A way of describing a group of files on a computer. The top of the tree is called the root directory, and is denoted by <command>/</command>. The rest of the branches spread downward from the root. Don't confuse the root directory with the root account or root's home directory, normally <command>/root</command>.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="filter">
-   <glossterm>filter</glossterm>
-   <glossdef>
-    <para>Within Evolution, a filter is a method of sorting mail automatically when it is downloaded. You can create filters to perform one or more actions on a message that meets any (or all) of a wide range of criteria.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="forward">
-   <glossterm>forward</glossterm>
-   <glossdef>
-    <para>Forwards a copy of the message and any additional comments to a different email address.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="groupware">
-   <glossterm>groupware</glossterm>
-   <glossdef>
-    <para>A term describing an application that helps groups of people work together. Typically, a groupware application has several productivity features built into one program, including email, calendar, and address book tools.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="html">
-   <glossterm>HTML</glossterm>
-   <glossdef>
-    <para>Hypertext Markup Language (HTML) is a language for describing page layout in electronic documents such as Web pages, help files, and email messages. HTML can be used in email and news posts to insert images and apply text treatments.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="ical">
-   <glossterm>iCal</glossterm>
-   <glossdef>
-    <para>iCal is a protocol that Evolution uses to manage the calendar section.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="imap">
-   <glossterm>IMAP</glossterm>
-   <glossdef>
-    <para>Internet Mail Access Protocol. It allows access to email that is typically stored remotely on a server rather than on a local hard disk. Often contrasted with POP.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="inline">
-   <glossterm>inline</glossterm>
-   <glossdef>
-    <para>Displayed as part of a message or other document, rather than attached as a separate file. Contrast with <emphasis>attachment</emphasis>.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="ldap">
-   <glossterm>LDAP</glossterm>
-   <glossdef>
-    <para>Lightweight Directory Access Protocol. Allows a client to search through a large database of addresses, phone numbers, and people stored on a server.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="mail-client">
-   <glossterm>mail client</glossterm>
-   <glossdef>
-    <para>The application with which a person reads and sends email. Its counterparts are the various types of mail servers, which handle user authentication and direct messages from the sender to the recipient.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="pop">
-   <glossterm>POP</glossterm>
-   <glossdef>
-    <para>Post Office Protocol. A mechanism for email transport. In contrast to IMAP, it is used only to get mail from a server and store it locally on your hard disk.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="protocol">
-   <glossterm>protocol</glossterm>
-   <glossdef>
-    <para>An agreed-upon method of communication, especially one for sending particular types of information between computer systems. Examples include POP (Post Office Protocol), for email, and HTTP (HyperText Transfer Protocol) for Web pages.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="public-key-encryption">
-   <glossterm>public key encryption</glossterm>
-   <glossdef>
-    <para>A strong encryption method that uses a set of two keys, one of which is made public, and one of which is kept private. Data encrypted using the public key can only be decrypted using the private key. The longer the keys, the more difficult it is to break the encryption.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="regular-expression">
-   <glossterm>regular expression</glossterm>
-   <glossdef>
-    <para>A regular expression (regex) is a way of describing a string of text using metacharacters or wildcard symbols. For example, the statement fly.*so[au]p means any phrase beginning with <quote>fly</quote> and ending in <quote>soup</quote> or <quote>soap.</quote> If you searched for that expression, you'd find both <quote>fly in my soup</quote> and <quote>fly in my soap.</quote> For more information, enter <command>man grep</command> from the command line.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="script">
-   <glossterm>script</glossterm>
-   <glossdef>
-    <para>A program written in an interpreted (rather than compiled) language. Often used as a synonym for macro, to denote a series of prerecorded commands or actions within an application. Scripts are used to accomplish repetitive and tedious tasks, to save the user time.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="search-base">
-   <glossterm>search base</glossterm>
-   <glossdef>
-    <para>LDAP can break contact lists into many groups. The search base tells LDAP the top group to use. How much of the Search Base to search is set by the Search Scope option.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="vfolder">
-   <glossterm>search folder</glossterm>
-   <glossdef>
-    <para>An email organization tool. Search folders allow you to create a folder that contains the results of a complex search. Search folder contents are updated dynamically.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="search-scope">
-   <glossterm>search scope</glossterm>
-   <glossdef>
-    <para>Search Scope states how much of the search base to search.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="sendmail">
-   <glossterm>Sendmail</glossterm>
-   <glossdef>
-    <para>A program that sends mail. Evolution can use it instead of SMTP; some people prefer it because it offers more flexibility; however, it is more difficult to set up.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="shortcut-bar">
-   <glossterm>switcher</glossterm>
-   <glossdef>
-    <para>An area of Evolution that offers users fast access to the most frequently used features of the application.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="signature">
-   <glossterm>signature</glossterm>
-   <glossdef>
-    <para>Text placed at the end of every email sent, similar to a hand-written signature at the bottom of a written letter. A signature can be anything from a favorite quotation to a link to a Web page; courtesy dictates that it be fewer than four lines long.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="smtp">
-   <glossterm>SMTP</glossterm>
-   <glossdef>
-    <para>Simple Mail Transfer Protocol. The most common way of transporting mail messages from your computer to the server.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="tooltip">
-   <glossterm>tooltip</glossterm>
-   <glossdef>
-    <para>A small box of explanatory text that appears when the mouse pointer is held over a button or other interface element.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="virus">
-   <glossterm>virus</glossterm>
-   <glossdef>
-    <para>A program that inserts itself into other files or programs. When executed, it spreads to more programs and other computers. A virus can cause substantial damage by clogging networks or disk drives, deleting files, or opening security holes.</para>
-   </glossdef>
-  </glossentry>
-  <glossentry id="vcard">
-   <glossterm>vCard</glossterm>
-   <glossdef>
-    <para>A file format for the exchange of contact information. When you get an address card attached to an email, it is probably in vCard format.</para>
-   </glossdef>
-  </glossentry>
- </glossary>
-
-  <appendix>
-<title>Legal Notices</title>
-   <simplelist>
-    <member>Novell, Inc. makes no representations or warranties with respect to the contents or use of this documentation, and specifically disclaims any express or implied warranties of merchantability or fitness for any particular purpose. Further, Novell, Inc. reserves the right to revise this publication and to make changes to its content, at any time, without obligation to notify any person or entity of such revisions or changes.</member>
-    <member>Further, Novell, Inc. makes no representations or warranties with respect to any software, and specifically disclaims any express or implied warranties of merchantability or fitness for any particular purpose. Further, Novell, Inc. reserves the right to make changes to any and all parts of Novell software, at any time, without any obligation to notify any person or entity of such changes.</member>
-   </simplelist>
-   <simplelist>
-    <member>You may not use, export, or re-export this product in violation of any applicable laws or regulations including, without limitation, U.S. export regulations or the laws of the country in which you reside.</member>
-   </simplelist>
-   <simplelist>
-    <member>Copyright 2007 Novell, Inc. Permission is granted to copy, distribute, and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.3 or any later version and Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0). GFDL is published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the GFDL can be found at http://www.fsf.org/licenses/fdl.html. A copy of CC BY-SA 3.0 is available at http://creativecommons.org/licenses/by-sa/3.0/legalcode </member>
-    <member>THIS DOCUMENT AND MODIFIED VERSIONS OF THIS DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT:</member>
-    <member>1. THE DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND</member>
-    <member>2. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.</member>
-   </simplelist>
-   <simplelist>
-    <member>Novell, Inc.</member>
-    <member>404 Wyman Street, Suite 500</member>
-    <member>Waltham, MA  02451</member>
-    <member>U.S.A.</member>
-    <member>www.novell.com</member>
-   </simplelist>
-   <para id="Bktitle">Evolution &appversion; User Guide</para>
-   <para>July 2007</para>
-   <simplelist>
-    <member>To access the online documentation for this and other Novell products, and to get updates, see www.novell.com/documentation</member>
-   </simplelist>
-   <simplelist>
-    <member>Evolution is a trademark of Novell, Inc.</member>
-    <member>GroupWise is a registered trademark of Novell, Inc. in the United States and other countries.</member>
-    <member>Novell is a registered trademark of Novell, Inc. in the United States and other countries.</member>
-    <member>SUSE is a registered trademark of SUSE AG, a Novell company.</member>
-    <member>Ximian is a registered trademark of Novell, Inc. in the United States and other countries.</member>
-   </simplelist>
-   <simplelist>
-    <member>All third-party trademarks are the property of their respective owners.</member>
-   </simplelist>
-  </appendix>
-</book>
diff --git a/help/C/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page
new file mode 100644
index 0000000000..7703786b80
--- /dev/null
+++ b/help/C/exchange-connectors-overview.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="exchange-connectors-overview">
+
+  <info>
+    <desc>Which additional package to install in order to connect to an Exchange server.</desc>
+
+    <link type="guide" xref="exchange-placeholder"/>
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Choosing the right connector</title>
+
+<p>Depending on the version of the Microsoft Exchange server that you would like to connect to it is required to make sure that an additional package is installed that provides this functionality.</p>
+
+<p>For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of Exchange that use Outlook Web Access) it is recommended to use the package evolution-exchange. <link action="install:evolution-exchange" href="http://projects.gnome.org/evolution/download">Install evolution-exchange now.</link>
+</p>
+<p>For Microsoft Exchange 2007 (and possibly earlier versions that support MAPI) it is recommended to use the package evolution-mapi. <link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download">Install evolution-mapi now.</link></p>
+<p>For Microsoft Exchange 2010 it is recommended to use the package evolution-ews which is currently still under development and might not be available yet for your distribution. evolution-ews also supports Microsoft Exchange 2007. <link action="install:evolution-ews" href="http://projects.gnome.org/evolution/download">Install evolution-ews now.</link></p>
+
+<note style="tip"><p>If you are unsure which Microsoft Exchange server version is used, you may want to contact your system administrator for more information.</p></note>
+
+<!-- TODO:POST-3-2:
+<mbarnes> actually, a table in the docs would make it crystal clear  (Exchange version x Evolution backend)
+<seanius> also, a feature matrix of what works in the particular releases might be helpful, though maybe hard to visualize in a compact manner
+-->
+
+</page>
+
diff --git a/help/C/exchange-placeholder.page b/help/C/exchange-placeholder.page
new file mode 100644
index 0000000000..6833146e40
--- /dev/null
+++ b/help/C/exchange-placeholder.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="exchange-placeholder">
+
+  <info>
+    <desc>Connecting to Exchange Servers</desc>
+
+    <link type="guide" xref="index#corporate-environments-exchange" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-21" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Connecting to Exchange Servers</title>
+
+<p>For topics not covered here please refer to the <link href="http://library.gnome.org/users/evolution/2.32/usage-exchange.html.en">old Evolution manual</link>.</p>
+</page>
diff --git a/help/C/exporting-data-calendar.page b/help/C/exporting-data-calendar.page
new file mode 100644
index 0000000000..fca7460e44
--- /dev/null
+++ b/help/C/exporting-data-calendar.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="exporting-data-calendar">
+
+  <info>
+    <desc>How to export calendar data from <em>Evolution</em>.</desc>
+
+    <link type="guide" xref="exporting-data" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Exporting calendar data</title>
+
+<p>To export a complete calendar, right-click on the calendar in the list of calendars and click <gui>Save as</gui>. Available formats are iCalendar format (ICS, recommended), comma seperated values (CSV), and RDF format.</p>
+<p>If you want to export only one appointment, right-click on the appointment and click <gui>Save as iCalendar...</gui>.</p>
+
+</page>
diff --git a/help/C/exporting-data-contacts.page b/help/C/exporting-data-contacts.page
new file mode 100644
index 0000000000..0f61cfb8a6
--- /dev/null
+++ b/help/C/exporting-data-contacts.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="exporting-data-contacts">
+
+  <info>
+    <desc>How to export contacts data from <em>Evolution</em>.</desc>
+
+    <link type="guide" xref="exporting-data" />
+
+    <revision pkgversion="3.1.4" version="0.1" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#fourth-step -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Exporting contacts data</title>
+
+<p>Contacts files are stored in a database, but can be saved as a vCard file.</p>
+<p>To export a complete address book, click <guiseq><gui>File</gui><gui>Save Address Book As vCard</gui></guiseq>.</p>
+<p>If you want to export only one contact, click <guiseq><gui>File</gui><gui>Save Contact as VCard</gui></guiseq> or right-click on the contact and click <gui>Save as vCard</gui>.</p>
+
+</page>
diff --git a/help/C/exporting-data-mail.page b/help/C/exporting-data-mail.page
new file mode 100644
index 0000000000..27772b40b3
--- /dev/null
+++ b/help/C/exporting-data-mail.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="exporting-data-mail">
+
+  <info>
+    <desc>How to export mail data from <em>Evolution</em>.</desc>
+
+    <link type="guide" xref="exporting-data" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Exporting mail data</title>
+
+<p>To save an email to a file in <link href="https://secure.wikimedia.org/wikipedia/en/wiki/Mbox">mbox</link> format, select an email and click <guiseq><gui>File</gui><gui>Save as mbox...</gui></guiseq> or right-click on the message and click <gui>Save as mbox...</gui>.</p>
+
+<p>The same steps apply to save a complete mail folder, but you have to mark all messages in it first.</p>
+<p>You can select all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>.</p>
+
+</page>
diff --git a/help/C/exporting-data.page b/help/C/exporting-data.page
new file mode 100644
index 0000000000..109ce84739
--- /dev/null
+++ b/help/C/exporting-data.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="exporting-data">
+
+  <info>
+    <desc>How to export data from <em>Evolution</em>.</desc>
+
+    <link type="guide" xref="index#data-migration-and-sync" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2010-12-09" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Exporting data from <em>Evolution</em></title>
+
+</page>
diff --git a/help/C/express-mode.page b/help/C/express-mode.page
new file mode 100644
index 0000000000..41257ec951
--- /dev/null
+++ b/help/C/express-mode.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="express-mode">
+
+  <info>
+    <desc>What to do when using a small screen or netbook.</desc>
+    
+    <link type="guide" xref="index#common-other-problems" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Some windows are too large for small screens.</title>
+
+<p>This is a known problem and hard to solve for a complex application with many settings such as Evolution.</p>
+<p>You can use the Express version which is targeted for mobile and small-screen devices. This is available from version 2.30 on and can be enabled by starting <code>evolution --express</code> from the terminal window.</p>
+
+</page>
diff --git a/help/C/figures/attach_reminder_a.png b/help/C/figures/attach_reminder_a.png
deleted file mode 100644
index ece72f24ee..0000000000
--- a/help/C/figures/attach_reminder_a.png
+++ /dev/null
diff --git a/help/C/figures/calendar_preference_display.png b/help/C/figures/calendar_preference_display.png
deleted file mode 100644
index 6a8e881dc9..0000000000
--- a/help/C/figures/calendar_preference_display.png
+++ /dev/null
diff --git a/help/C/figures/categories_a.png b/help/C/figures/categories_a.png
deleted file mode 100644
index 7127146383..0000000000
--- a/help/C/figures/categories_a.png
+++ /dev/null
diff --git a/help/C/figures/color-204a87.png b/help/C/figures/color-204a87.png
new file mode 100644
index 0000000000..56496ca9fb
--- /dev/null
+++ b/help/C/figures/color-204a87.png
diff --git a/help/C/figures/color-2e3436.png b/help/C/figures/color-2e3436.png
new file mode 100644
index 0000000000..102928c4d4
--- /dev/null
+++ b/help/C/figures/color-2e3436.png
diff --git a/help/C/figures/color-4e9a06.png b/help/C/figures/color-4e9a06.png
new file mode 100644
index 0000000000..04398e3b34
--- /dev/null
+++ b/help/C/figures/color-4e9a06.png
diff --git a/help/C/figures/color-5c3566.png b/help/C/figures/color-5c3566.png
new file mode 100644
index 0000000000..ffeee15ef1
--- /dev/null
+++ b/help/C/figures/color-5c3566.png
diff --git a/help/C/figures/color-8f5902.png b/help/C/figures/color-8f5902.png
new file mode 100644
index 0000000000..a13383214b
--- /dev/null
+++ b/help/C/figures/color-8f5902.png
diff --git a/help/C/figures/color-a40000.png b/help/C/figures/color-a40000.png
new file mode 100644
index 0000000000..463e2898bd
--- /dev/null
+++ b/help/C/figures/color-a40000.png
diff --git a/help/C/figures/color-c4a000.png b/help/C/figures/color-c4a000.png
new file mode 100644
index 0000000000..aeb131ed6d
--- /dev/null
+++ b/help/C/figures/color-c4a000.png
diff --git a/help/C/figures/color-ce5c00.png b/help/C/figures/color-ce5c00.png
new file mode 100644
index 0000000000..070781e2c0
--- /dev/null
+++ b/help/C/figures/color-ce5c00.png
diff --git a/help/C/figures/contacts_mainwindow_a.png b/help/C/figures/contacts_mainwindow_a.png
deleted file mode 100755
index ded41b76c2..0000000000
--- a/help/C/figures/contacts_mainwindow_a.png
+++ /dev/null
diff --git a/help/C/figures/delgt-add.png b/help/C/figures/delgt-add.png
deleted file mode 100644
index c4657bbbfc..0000000000
--- a/help/C/figures/delgt-add.png
+++ /dev/null
diff --git a/help/C/figures/evo_Wcal_prop_a.png b/help/C/figures/evo_Wcal_prop_a.png
deleted file mode 100644
index 28b628bad2..0000000000
--- a/help/C/figures/evo_Wcal_prop_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_adv_search_a.png b/help/C/figures/evo_adv_search_a.png
deleted file mode 100644
index 17de355d8d..0000000000
--- a/help/C/figures/evo_adv_search_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_attachreminder_plugin.png b/help/C/figures/evo_attachreminder_plugin.png
deleted file mode 100644
index 82528d6567..0000000000
--- a/help/C/figures/evo_attachreminder_plugin.png
+++ /dev/null
diff --git a/help/C/figures/evo_blink.png b/help/C/figures/evo_blink.png
deleted file mode 100644
index 95e29161ba..0000000000
--- a/help/C/figures/evo_blink.png
+++ /dev/null
diff --git a/help/C/figures/evo_cal_callout_a.png b/help/C/figures/evo_cal_callout_a.png
deleted file mode 100644
index ac735a14f6..0000000000
--- a/help/C/figures/evo_cal_callout_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_calender_appointmnt.png b/help/C/figures/evo_calender_appointmnt.png
deleted file mode 100644
index 8bad9818b6..0000000000
--- a/help/C/figures/evo_calender_appointmnt.png
+++ /dev/null
diff --git a/help/C/figures/evo_calstatus_a.png b/help/C/figures/evo_calstatus_a.png
deleted file mode 100644
index d42f53e973..0000000000
--- a/help/C/figures/evo_calstatus_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_caltasks_a.png b/help/C/figures/evo_caltasks_a.png
deleted file mode 100644
index 4714f480c0..0000000000
--- a/help/C/figures/evo_caltasks_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_contacteditor_a.png b/help/C/figures/evo_contacteditor_a.png
deleted file mode 100755
index 109e2a1ef8..0000000000
--- a/help/C/figures/evo_contacteditor_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_delegate_permission_a.png b/help/C/figures/evo_delegate_permission_a.png
deleted file mode 100644
index b2d01272e9..0000000000
--- a/help/C/figures/evo_delegate_permission_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_dialog-info.png b/help/C/figures/evo_dialog-info.png
deleted file mode 100644
index 38efded55c..0000000000
--- a/help/C/figures/evo_dialog-info.png
+++ /dev/null
diff --git a/help/C/figures/evo_dialog-warning.png b/help/C/figures/evo_dialog-warning.png
deleted file mode 100644
index 3995c22b12..0000000000
--- a/help/C/figures/evo_dialog-warning.png
+++ /dev/null
diff --git a/help/C/figures/evo_edit_search.png b/help/C/figures/evo_edit_search.png
deleted file mode 100644
index 3c83f02104..0000000000
--- a/help/C/figures/evo_edit_search.png
+++ /dev/null
diff --git a/help/C/figures/evo_exchng_mapi.png b/help/C/figures/evo_exchng_mapi.png
deleted file mode 100644
index 1840d0b477..0000000000
--- a/help/C/figures/evo_exchng_mapi.png
+++ /dev/null
diff --git a/help/C/figures/evo_flag_follow_up_a.png b/help/C/figures/evo_flag_follow_up_a.png
deleted file mode 100644
index c33468bb1f..0000000000
--- a/help/C/figures/evo_flag_follow_up_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_gwreceive_a.png b/help/C/figures/evo_gwreceive_a.png
deleted file mode 100644
index 90180a147f..0000000000
--- a/help/C/figures/evo_gwreceive_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_gwstatustrack.png b/help/C/figures/evo_gwstatustrack.png
deleted file mode 100644
index 5494044fd2..0000000000
--- a/help/C/figures/evo_gwstatustrack.png
+++ /dev/null
diff --git a/help/C/figures/evo_imapreceive_a.png b/help/C/figures/evo_imapreceive_a.png
deleted file mode 100644
index 752db2a9f1..0000000000
--- a/help/C/figures/evo_imapreceive_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_junk_a.png b/help/C/figures/evo_junk_a.png
deleted file mode 100644
index 146c97bc48..0000000000
--- a/help/C/figures/evo_junk_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_label_a.png b/help/C/figures/evo_label_a.png
deleted file mode 100644
index d7070ca380..0000000000
--- a/help/C/figures/evo_label_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_labels_a.png b/help/C/figures/evo_labels_a.png
deleted file mode 100644
index 08e64e16ed..0000000000
--- a/help/C/figures/evo_labels_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_mail_a.png b/help/C/figures/evo_mail_a.png
deleted file mode 100644
index 6b7ce62c5d..0000000000
--- a/help/C/figures/evo_mail_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_mail_callout_a.png b/help/C/figures/evo_mail_callout_a.png
deleted file mode 100755
index 2a033c0d87..0000000000
--- a/help/C/figures/evo_mail_callout_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_maildirreceive_a.png b/help/C/figures/evo_maildirreceive_a.png
deleted file mode 100644
index f6f6862447..0000000000
--- a/help/C/figures/evo_maildirreceive_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_mboxreceive_a.png b/help/C/figures/evo_mboxreceive_a.png
deleted file mode 100644
index 785239b5f6..0000000000
--- a/help/C/figures/evo_mboxreceive_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_memo_a.png b/help/C/figures/evo_memo_a.png
deleted file mode 100644
index e9203e3c1a..0000000000
--- a/help/C/figures/evo_memo_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_mhreceive_a.png b/help/C/figures/evo_mhreceive_a.png
deleted file mode 100644
index f6dc4f3327..0000000000
--- a/help/C/figures/evo_mhreceive_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_newmail.png b/help/C/figures/evo_newmail.png
deleted file mode 100644
index 323fb738cf..0000000000
--- a/help/C/figures/evo_newmail.png
+++ /dev/null
diff --git a/help/C/figures/evo_newmess_a.png b/help/C/figures/evo_newmess_a.png
deleted file mode 100755
index 45ab302800..0000000000
--- a/help/C/figures/evo_newmess_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_offline.png b/help/C/figures/evo_offline.png
deleted file mode 100644
index 5bc9122b7c..0000000000
--- a/help/C/figures/evo_offline.png
+++ /dev/null
diff --git a/help/C/figures/evo_popreceive_a.png b/help/C/figures/evo_popreceive_a.png
deleted file mode 100644
index 50ede5dc79..0000000000
--- a/help/C/figures/evo_popreceive_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_proxyadd_a.png b/help/C/figures/evo_proxyadd_a.png
deleted file mode 100644
index b0d53f2895..0000000000
--- a/help/C/figures/evo_proxyadd_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_rule_a.png b/help/C/figures/evo_rule_a.png
deleted file mode 100755
index cb6ab6f82b..0000000000
--- a/help/C/figures/evo_rule_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_send_option_a.png b/help/C/figures/evo_send_option_a.png
deleted file mode 100644
index eb514076d8..0000000000
--- a/help/C/figures/evo_send_option_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_send_setup_a.png b/help/C/figures/evo_send_setup_a.png
deleted file mode 100755
index c9ee79e949..0000000000
--- a/help/C/figures/evo_send_setup_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_sendstatus_a.png b/help/C/figures/evo_sendstatus_a.png
deleted file mode 100644
index 6c748b6fc8..0000000000
--- a/help/C/figures/evo_sendstatus_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_shd_memo_a.png b/help/C/figures/evo_shd_memo_a.png
deleted file mode 100644
index 3556c8c5aa..0000000000
--- a/help/C/figures/evo_shd_memo_a.png
+++ /dev/null
diff --git a/help/C/figures/evo_usereceive_a.png b/help/C/figures/evo_usereceive_a.png
deleted file mode 100644
index e6df018789..0000000000
--- a/help/C/figures/evo_usereceive_a.png
+++ /dev/null
diff --git a/help/C/figures/evolution_contact_preference.png b/help/C/figures/evolution_contact_preference.png
deleted file mode 100644
index 7d9b554bb5..0000000000
--- a/help/C/figures/evolution_contact_preference.png
+++ /dev/null
diff --git a/help/C/figures/evolution_mail_preference.png b/help/C/figures/evolution_mail_preference.png
deleted file mode 100644
index 9f5f475ac0..0000000000
--- a/help/C/figures/evolution_mail_preference.png
+++ /dev/null
diff --git a/help/C/figures/evolutionlogo.png b/help/C/figures/evolutionlogo.png
new file mode 100644
index 0000000000..929964baba
--- /dev/null
+++ b/help/C/figures/evolutionlogo.png
diff --git a/help/C/figures/exchng-rec-mails.png b/help/C/figures/exchng-rec-mails.png
deleted file mode 100644
index 8e909a60ae..0000000000
--- a/help/C/figures/exchng-rec-mails.png
+++ /dev/null
diff --git a/help/C/figures/exchng-rec-options.png b/help/C/figures/exchng-rec-options.png
deleted file mode 100644
index 7b1ea061a8..0000000000
--- a/help/C/figures/exchng-rec-options.png
+++ /dev/null
diff --git a/help/C/figures/filter-new-fig.png b/help/C/figures/filter-new-fig.png
deleted file mode 100644
index 063cdb781b..0000000000
--- a/help/C/figures/filter-new-fig.png
+++ /dev/null
diff --git a/help/C/figures/folder_plus.png b/help/C/figures/folder_plus.png
deleted file mode 100644
index 0c174a93ca..0000000000
--- a/help/C/figures/folder_plus.png
+++ /dev/null
diff --git a/help/C/figures/google_cal_view.png b/help/C/figures/google_cal_view.png
deleted file mode 100644
index cfd4868ca3..0000000000
--- a/help/C/figures/google_cal_view.png
+++ /dev/null
diff --git a/help/C/figures/groupwise_resend.png b/help/C/figures/groupwise_resend.png
deleted file mode 100644
index e23689bfc5..0000000000
--- a/help/C/figures/groupwise_resend.png
+++ /dev/null
diff --git a/help/C/figures/groupwise_resend_retract.png b/help/C/figures/groupwise_resend_retract.png
deleted file mode 100644
index 92068c61cb..0000000000
--- a/help/C/figures/groupwise_resend_retract.png
+++ /dev/null
diff --git a/help/C/figures/local_ics_calendar.png b/help/C/figures/local_ics_calendar.png
deleted file mode 100644
index 97017b3a04..0000000000
--- a/help/C/figures/local_ics_calendar.png
+++ /dev/null
diff --git a/help/C/figures/mailer_preferences.png b/help/C/figures/mailer_preferences.png
deleted file mode 100644
index 6707699aac..0000000000
--- a/help/C/figures/mailer_preferences.png
+++ /dev/null
diff --git a/help/C/figures/meeting.png b/help/C/figures/meeting.png
deleted file mode 100644
index 6880921fa8..0000000000
--- a/help/C/figures/meeting.png
+++ /dev/null
diff --git a/help/C/figures/minus.png b/help/C/figures/minus-icon.png
index 9d5c21b242..9d5c21b242 100644
--- a/help/C/figures/minus.png
+++ b/help/C/figures/minus-icon.png
diff --git a/help/C/figures/new-mail-notification.png b/help/C/figures/new-mail-notification.png
new file mode 100644
index 0000000000..fdd8b50c26
--- /dev/null
+++ b/help/C/figures/new-mail-notification.png
diff --git a/help/C/figures/new-mail-switcher.png b/help/C/figures/new-mail-switcher.png
new file mode 100644
index 0000000000..eee3f4c903
--- /dev/null
+++ b/help/C/figures/new-mail-switcher.png
diff --git a/help/C/figures/plus.png b/help/C/figures/plus-icon.png
index cf200a04d5..cf200a04d5 100644
--- a/help/C/figures/plus.png
+++ b/help/C/figures/plus-icon.png
diff --git a/help/C/figures/quick_add_a.png b/help/C/figures/quick_add_a.png
deleted file mode 100644
index abeb47f6b9..0000000000
--- a/help/C/figures/quick_add_a.png
+++ /dev/null
diff --git a/help/C/figures/quick_reference.png b/help/C/figures/quick_reference.png
deleted file mode 100644
index eda091a30a..0000000000
--- a/help/C/figures/quick_reference.png
+++ /dev/null
diff --git a/help/C/figures/stock_search.png b/help/C/figures/search-icon.png
index 26d6945263..26d6945263 100644
--- a/help/C/figures/stock_search.png
+++ b/help/C/figures/search-icon.png
diff --git a/help/C/figures/ver_view_a.png b/help/C/figures/ver_view_a.png
deleted file mode 100644
index ee552028c5..0000000000
--- a/help/C/figures/ver_view_a.png
+++ /dev/null
diff --git a/help/C/figures/window-overview-layers.png b/help/C/figures/window-overview-layers.png
new file mode 100644
index 0000000000..bdbd79bc78
--- /dev/null
+++ b/help/C/figures/window-overview-layers.png
diff --git a/help/C/google-services.page b/help/C/google-services.page
new file mode 100644
index 0000000000..5efea6e6ef
--- /dev/null
+++ b/help/C/google-services.page
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="google-services">
+
+  <info>
+    <desc>Using Google services.</desc>
+
+    <revision pkgversion="3.0.1" version="0.1" date="2011-07-22" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using Google services</title>
+
+</page>
diff --git a/help/C/groupwise-placeholder.page b/help/C/groupwise-placeholder.page
new file mode 100644
index 0000000000..46127a3a1d
--- /dev/null
+++ b/help/C/groupwise-placeholder.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="groupwise-placeholder">
+
+  <info>
+    <desc>Connecting to GroupWise</desc>
+
+    <link type="guide" xref="index#corporate-environments-groupwise" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-21" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Connecting to GroupWise</title>
+
+<p>For topics not covered here please refer to the <link href="http://library.gnome.org/users/evolution/2.32/usage-groupwise.html.en">old Evolution manual</link>.</p>
+</page>
diff --git a/help/C/import-apps-mozilla.page b/help/C/import-apps-mozilla.page
new file mode 100644
index 0000000000..7ba4cfab9e
--- /dev/null
+++ b/help/C/import-apps-mozilla.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="import-apps-mozilla">
+
+  <info>
+    <desc>Importing data from Mozilla Thunderbird.</desc>
+    
+    <link type="guide" xref="import-data#import-from-apps" />
+
+    <revision pkgversion="2.32.2" version="0.2" date="2011-07-30" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+  <title>Mozilla</title>
+<!-- TODO:DEVELOPERS: Does <guiseq><gui>File</gui><gui>Import</gui><gui>Import data and settings from older programs</gui></guiseq> recognize Outlook and Thunderbird? If yes, "Evolution searches for old mail programs and, if possible, imports the data from them." -->
+<!-- TODO: This really needs some testing in 3.1 -->
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
+<item><p>In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>.</p></item>
+<item><p>Choose the Thunderbird files that you would like to import.</p><p>The file type will be automatically determined.</p></item>
+<item><p>Choose the destination (e.g. the folder in Evolution) for the imported data.</p></item>
+<item><p>Repeat the import steps until you have imported all your data.</p></item>
+</steps>
+</page>
diff --git a/help/C/import-apps-outlook.page b/help/C/import-apps-outlook.page
new file mode 100644
index 0000000000..1b9a242c6d
--- /dev/null
+++ b/help/C/import-apps-outlook.page
@@ -0,0 +1,69 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="import-apps-outlook">
+
+  <info>
+    <desc>Importing data from Microsoft Outlook.</desc>
+    
+    <link type="guide" xref="import-data#import-from-apps" />
+
+    <revision pkgversion="3.0.2" version="0.4" date="2011-08-02" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/outlook-migration-mail.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+  <title>Outlook</title>
+<!-- "Import data and settings from older programs" cannot recognize Outlook, as there obviously is no default storage location for Outlook *under Linux* -->
+
+<p>These steps refer to locally stored data such as POP accounts. For remote data (like IMAP) this is not necessary, since the data is still on the server and does not need to be manually transfered. You can set up the corresponding account in Evolution and the data will be downloaded.</p>
+
+<section id="prerequisites">
+<title>Prerequisites under Windows</title>
+<p>First, while using Microsoft Windows, prepare your messages for import:</p>
+<steps>
+<item><p>Find your Outlook files (they normally have the file ending <file>.pst</file> or <file>.ost</file>):</p>
+<table frame="all" rules="all">
+  <tr>
+    <td></td><td><p>Windows 7, Windows Vista</p></td><td><p>Windows XP</p></td>
+  </tr>
+  <tr>
+    <td>Outlook 2010</td><td><p><file>C:\Users\username\My Documents\Outlook Files</file></p></td><td><p><file>C:\Documents and Settings\username\My Documents\Outlook Files</file></p></td>
+  </tr>
+  <tr>
+    <td>Outlook 2007 and earlier</td><td><p><file>C:\Users\username\AppData\Local\Microsoft\Outlook</file></p></td><td><p><file>C:\Documents and Settings\username\AppData\Local\Microsoft\Outlook</file></p></td>
+  </tr>
+</table>
+<p>(Replace "username" by your username.)</p>
+</item>
+<!-- File locations taken from http://support.microsoft.com/kb/2291280 and http://answers.microsoft.com/en-us/windows/forum/windows_7-files/where-is-location-of-outlookpst-file-in-windows-7/3a4c03c3-e8ad-4912-9e37-f1c62057d1f9 -->
+<item><p>Copy the Outlook files to the system or partition that Evolution is installed on.</p>
+<p>As your Windows hard drive is probably in the NTFS format, some Linux systems cannot read it without additional software. You might find it simpler to copy the mail folders to a USB drive or to burn a CD.</p></item>
+<item><p>Mount your Windows drive or the disk where you saved the mail files.</p></item>
+<item><p>Copy all the mail files into your home directory or another convenient place.</p></item>
+<item><p>Start Evolution.</p></item>
+<item><p>Optionally select <guiseq><gui>File</gui><gui>New</gui><gui>Mail Folder</gui></guiseq> to create the <link xref="mail-folders">folders</link> you want.</p></item>
+</steps>
+</section>
+
+<section id="prerequisites">
+<title>Importing into Evolution</title>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
+<item><p>In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>.</p></item>
+<item><p>Choose the Outlook personal folders (.pst) file that you would like to import.</p><p>The file type will be automatically determined.</p></item>
+<note style="tip"><p>If the option to import Outlook personal folders (.pst files) is not available under <guiseq><gui>File</gui><gui>Import</gui><gui>Import single file</gui><gui>File type</gui></guiseq>, your distribution might have not enabled this functionality.</p></note>
+<item><p>Choose the destination (e.g. the folder in Evolution) for the imported data.</p></item>
+<item><p>Repeat the import steps until you have imported all your data.</p></item>
+</steps>
+
+</section>
+
+</page>
diff --git a/help/C/import-data.page b/help/C/import-data.page
new file mode 100644
index 0000000000..79a930e75d
--- /dev/null
+++ b/help/C/import-data.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="import-data">
+
+  <info>
+    <desc>Importing data from another application.</desc>
+
+    <link type="guide" xref="index#data-migration-and-sync"/>
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Importing data from another application</title>
+
+  <section id="import-from-apps" style="2column">
+    <title>Applications</title>
+  </section>
+
+</page>
diff --git a/help/C/import-single-files.page b/help/C/import-single-files.page
new file mode 100644
index 0000000000..6c87d45485
--- /dev/null
+++ b/help/C/import-single-files.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="import-single-files">
+
+  <info>
+    <desc>Importing single files.</desc>
+    
+    <link type="guide" xref="import-data" />
+
+    <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+  <title>Importing single files</title>
+
+<p>To import single files (mail, calendar data or contacts):</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
+<item><p>In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>.</p></item>
+<item><p>Choose the file.</p><p>The file type will be automatically determined.</p></item>
+<item><p>Choose the destination (e.g. the folder in Evolution) for the imported data.</p></item>
+</steps>
+
+<note style="tip"><p>You can also import contacts that you have received as a vCard attachment of an email from its attachment menu.</p></note>
+
+</page>
diff --git a/help/C/import-supported-file-formats.page b/help/C/import-supported-file-formats.page
new file mode 100644
index 0000000000..31eee35261
--- /dev/null
+++ b/help/C/import-supported-file-formats.page
@@ -0,0 +1,87 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="import-supported-file-formats">
+
+  <info>
+    <desc>Supported file formats for importing data.</desc>
+    
+    <link type="guide" xref="import-data" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/importing-mail-and-settings.html.en#importing-mail -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+  <title>Supported file formats</title>
+
+<p>Evolution can import the following types of files:</p>
+
+<section id="mail">
+<title>Mail</title>
+<list>
+<item><p>
+Berkeley Mailbox (.mbox or no extension):</p>
+<p>The email format used by Mozilla, Netscape, Evolution (for local folders until version 2.32), Eudora, and many other email clients.
+</p></item>
+<item><p>
+Maildir (no extension):</p>
+<p>The format used by Evolution (for local folders since version 3.0). There is no need to import Maildir files as you can <link xref="mail-account-manage-maildir-format-directories">configure a Maildir account</link> in Evolution and point to the folder where the Maildir files are stored.
+</p></item>
+<item><p>
+Outlook Express 5/6 Personal Folders (.dbx):</p>
+<p>The email file format used by Microsoft Outlook Express 5/6. For newer versions PST import is recommended.
+</p></item>
+</list>
+</section>
+
+<section id="calendar">
+<title>Calendar</title>
+<list>
+<item><p>
+vCalendar (.vcs):</p>
+<p>A format for storing calendar files, which is generally used by Evolution, Microsoft Outlook, Sunbird, and Korganizer.
+</p></item>
+<item><p>
+iCalendar or iCal (.ics):</p>
+<p>A format for storing calendar files. iCalendar is used by Evolution, Microsoft Outlook, Palm OS handhelds, and others.
+</p></item>
+</list>
+</section>
+
+<section id="contacts">
+<title>Contacts</title>
+<list>
+<item><p>
+LDAP Data Interchange Format (.ldif):</p>
+<p>A standard data format for contact cards.
+</p></item>
+<item><p>
+vCard (.vcf, .gcrd):</p>
+<p>The address book format used by the GNOME, KDE, and many other contact management applications. You should be able to export to vCard format from any address book application.
+</p></item>
+</list>
+</section>
+
+<section id="misc">
+<title>Miscelleanous</title>
+<list>
+<item><p>
+Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):</p>
+<p>CSV (Comma-separated values) or Tabulator files saved by using Evolution, Microsoft Outlook and Mozilla.
+</p></item>
+<item><p>
+Personal Storage Table (.pst):</p>
+<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook.
+</p></item>
+</list>
+</section>
+
+</page>
diff --git a/help/C/index.page b/help/C/index.page
new file mode 100644
index 0000000000..0303827379
--- /dev/null
+++ b/help/C/index.page
@@ -0,0 +1,91 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="index">
+
+  <info>
+    <desc>Evolution</desc>
+
+    <revision pkgversion="3.2.0" version="0.4" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title><media type="image" src="./figures/evolutionlogo.png">Evolution logo</media>
+Evolution Mail and Calendar</title>
+
+  <section id="getting-started" style="2column">
+    <title>Getting Started</title>
+  </section>
+
+  <section id="mail-basic" style="2column">
+    <title>Mail Management</title>
+      <section id="mail-advanced" style="2column">
+        <title>Advanced Mail Management</title>
+          <section id="mail-advanced-imap" style="2column">
+            <title>IMAP</title>
+          </section>
+      </section>
+  </section>
+
+  <section id="mail-composing" style="2column">
+    <title>Mail Composing</title>
+      <section id="mail-composing-advanced" style="2column">
+        <title>Advanced Mail Composing</title>
+    </section>
+  </section>
+
+  <section id="calendar" style="2column">
+    <title>Calendar Management</title>
+      <section id="calendar-advanced" style="2column">
+        <title>Advanced Calendar Management</title>
+    </section>
+  </section>
+
+  <section id="contacts" style="2column">
+    <title>Contacts Management</title>
+  </section>
+
+  <section id="memos-and-tasks" style="2column">
+    <title>Memos and Tasks Management</title>
+  </section>
+
+  <section id="data-migration-and-sync" style="2column">
+    <title>Data Migration and Synchronization</title>
+  </section>
+
+  <section id="corporate-environments" style="2column">
+    <title>Corporate Environments</title>
+      <section id="corporate-environments-exchange" style="2column">
+        <title>Microsoft Exchange</title>
+      </section>
+      <section id="corporate-environments-groupwise" style="2column">
+        <title>Novell Groupwise</title>
+      </section>
+  </section>
+
+  <section id="tracking-down-problems" style="2column">
+    <title>Tracking down Problems</title>
+  </section>
+
+  <section id="common-mail-problems" style="2column">
+    <title>Common Mail Questions and Problems</title>
+  </section>
+
+  <section id="common-other-problems" style="2column">
+    <title>Common Other Questions and Problems</title>
+  </section>
+
+  <section id="further-reading" style="2column">
+    <title>Further reading</title>
+  </section>
+
+</page>
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
new file mode 100644
index 0000000000..92b5613988
--- /dev/null
+++ b/help/C/intro-first-run.page
@@ -0,0 +1,108 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="intro-first-run">
+
+  <info>
+    <desc>Running Evolution for the very first time.</desc>
+
+    <link type="guide" xref="index#getting-started"/>
+
+    <revision pkgversion="2.30.2" version="0.1" date="2010-12-09" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Starting <em>Evolution</em> for the first time</title>
+
+<p>The first time you run Evolution, it opens the First-Run Assistant to help you set up email accounts and <link xref="import-data">import data from other applications.</link></p>
+
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="restore">
+<title>Restore from backup</title>
+<p>You will get asked whether to restore from a backup of a previous version. If you have such a backup, continue <link xref="backup-restore#restore">here</link>. Otherwise, go to the next page.</p>
+</section>
+
+<section id="receiving">
+<title>Receiving Email</title>
+<p>First, choose the server type from the <gui>Server Type</gui> dropdown-list.</p>
+<p>If you are unsure about the type of server to choose, ask your system administrator or Internet Service Provider.</p>
+
+
+<section id="common-server-types">
+<title>Common server types</title>
+<p>The most common available server types for normal users are:</p>
+<list>
+<item><p>None: If you do not plan to use Evolution for receiving email.</p><p>Continue <link xref="#sending">here</link> for configuration.</p></item>
+<item><p>IMAP: Keeps the mail on the server so you can access your mail from multiple systems.</p><p>Continue <link xref="mail-receiving-options-imap">here</link> for configuration.</p></item>
+<!-- TODO:DEVELOPERS: So what's the difference between IMAP and IMAP+, and what is recommended, dear developers? -->
+<item><p>IMAP+: Keeps the mail on the server so you can access your mail from multiple systems.</p><p>Continue <link xref="mail-receiving-options-imap-plus">here</link> for configuration.</p></item>
+<item><p>POP: Downloads your email to your hard disk.</p><p>Continue <link xref="mail-receiving-options-pop">here</link> for configuration.</p></item>
+<item><p>USENET News: Connects to a news server and downloads a list of available news digests.</p><p>Continue <link xref="mail-receiving-options-usenet-news">here</link> for configuration.</p></item>
+</list>
+</section>
+
+<section id="corporate-server-types">
+<title>Corporate server types</title>
+<p>Available server types for corporate users are:</p>
+<!-- TODO:POST-3-2: Add evolution-ews once it is stable -->
+<list>
+<item><p>Exchange MAPI: For connecting to a Microsoft Exchange 2007/2010 or OpenChange server.</p><p>Continue <link xref="mail-receiving-options-exchange-mapi">here</link> for configuration.</p>
+<note style="tip"><p>This requires having the evolution-mapi package installed. <link action="install:evolution-mapi" href="http://ftp.gnome.org/pub/gnome/sources/evolution-mapi/">Install evolution-mapi now.</link></p></note>
+</item>
+<item><p>Microsoft Exchange: For connecting to a Microsoft Exchange 2000 or 2003 server.</p><p>Continue <link xref="mail-receiving-options-evolution-exchange">here</link> for configuration.</p>
+<note style="tip"><p>This requires having the evolution-exchange package installed. <link action="install:evolution-exchange" href="http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/">Install evolution-exchange now.</link></p></note>
+</item>
+<item><p>Novell Groupwise: For connecting to a Novell GroupWise server.</p><p>Continue <link xref="mail-receiving-options-novell-groupwise">here</link> for configuration.</p></item>
+</list>
+</section>
+
+<section id="local-account-server-types">
+<title>Local account server types</title>
+<p>Available local account server types for advanced users are:</p>
+<list>
+<item><p>Local delivery: If you want to move email from the spool (the location where mail waits for delivery) and store it in your home directory. You need to provide the path to the mail spool you want to use. If you want to leave email in your system's spool files, choose the <gui>Standard Unix Mbox Spool</gui> option instead.</p><p>Continue <link xref="mail-receiving-options-local-delivery">here</link> for configuration.</p></item>
+
+<item><p>MH-Format Mail Directories: For downloading email using MH or another MH-style program.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-mh-format-directories">here</link> for configuration.</p></item>
+
+<item><p>Maildir-Format Mail Directories: For downloading your email using Qmail or another Maildir-style program.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-maildir-format-directories">here</link> for configuration.</p></item>
+
+<item><p>Standard Unix mbox spool file: For reading and storing email in the mail spool file on your local system.</p><p>Continue <link xref="mail-receiving-options-unix-mbox-spool-file">here</link> for configuration.</p><p>You need to provide the path to the mail spool file you want to use.</p></item>
+
+<item><p>Standard Unix mbox spool directory: For reading and storing email in the mail spool directory on your local system.</p><p>You need to provide the path to the directory you want to use.</p><p>Continue <link xref="mail-receiving-options-unix-mbox-spool-directory">here</link> for configuration.</p></item>
+</list>
+
+<note style="tip"><p>Later on, if you want to change an account, or if you want to create another one, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>. Select the account you want to change, then click <gui style="button">Edit</gui>. Alternately, add a new account by clicking <gui style="button">Add</gui>.</p></note>
+</section>
+
+</section>
+
+<section id="sending"> <!-- Do not rename, we link to it from the subpages -->
+<title>Sending mail</title>
+<p>Available server types are:</p>
+<list>
+<item><p>SMTP: Sends mail using an outbound mail server. This is the most common choice for sending mail.</p><p>Continue <link xref="mail-sending-options-smtp">here</link> for configuration.</p></item>
+<item><p>Sendmail: Uses the Sendmail program to send mail from your system. It is not easy to configure, so you should select this option only if you know how to set up a Sendmail service.</p></item>
+</list>
+</section>
+
+<section id="account-information">
+<title>Account Information</title>
+<p>Give the account any name you prefer.</p>
+</section>
+
+<section id="account-import">
+<title>Importing Mail (Optional)</title>
+<p>Continue with <link xref="import-data">Importing data from another application</link>.</p>
+</section>
+
+</page>
diff --git a/help/C/intro-main-window.page b/help/C/intro-main-window.page
new file mode 100644
index 0000000000..bae6b59a2f
--- /dev/null
+++ b/help/C/intro-main-window.page
@@ -0,0 +1,158 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="intro-main-window">
+
+  <info>
+    <desc>An explanation of the areas shown in the Evolution window.</desc>
+
+    <link type="guide" xref="index#getting-started"/>
+    <link type="seealso" xref="calendar-layout"/>
+    <link type="seealso" xref="mail-layout-changing"/>
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-01-06" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Barbara M. Tobias</name>
+      <email>barbtobias09@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/ui-intro.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>The <em>Evolution</em> main window</title>
+
+<section id="e-mail">
+<title>E-Mail</title>
+
+<media type="image" src="./figures/window-overview-layers.png" width="600">
+  <p>The Evolution mail main window</p>
+</media>
+
+<p>Corresponding elements in the mail main window:</p>
+<table frame="all" rules="all">
+  <tr>
+    <td colspan="2"><p><media type="image" src="./figures/color-c4a000.png" width="10"/> Menu bar</p></td>
+  </tr>
+  <tr>
+    <td colspan="2"><p><media type="image" src="./figures/color-ce5c00.png" width="10" /> Tool bar</p></td>
+  </tr>
+  <tr>
+    <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Folder list</p></td>
+    <td><p><media type="image" src="./figures/color-4e9a06.png" width="10" /> Search bar</p></td>
+  </tr>
+  <tr>
+    <td><p><media type="image" src="./figures/color-204a87.png" width="10" /> Message list</p></td>
+  </tr>
+  <tr>
+    <td><p><media type="image" src="./figures/color-a40000.png" width="10" /> Switcher</p></td>
+    <td><p><media type="image" src="./figures/color-5c3566.png" width="10" /> Preview pane</p></td>
+  </tr>
+  <tr>
+    <td colspan="2"><p><media type="image" src="./figures/color-2e3436.png" width="10" /> Status bar</p></td>
+  </tr>
+</table>
+
+<terms>
+<item>
+<title>Folder list</title>
+<p>The folder list gives you a list of the available folders for each account. To see the contents of a folder, click the folder name and its contents are displayed in the message list.</p>
+<note style="tip"><p>For more information see <link xref="mail-folders">Using Folders</link>.</p></note>
+</item>
+<item>
+<title>Message List</title>
+<p>The message list displays all the read and unread messages that you have in the chosen folder. To view an email in the preview pane, click the message in the message list.</p>
+</item>
+<item>
+<title>Switcher</title>
+<p>The switcher at the bottom of the side bar lets you switch between the Evolution tools:  Mail, Contacts, Calendars, Memos and Tasks.</p><p>For more information see <link xref="change-switcher-appearance">Changing the Switcher appearance</link>.</p>
+<note style="tip"><p>You can disable the folder list and the switcher side bar by toggling <guiseq><gui>View</gui><gui>Layout</gui><gui>Show Side Bar</gui></guiseq>.</p></note>
+</item>
+<item>
+<title>Preview Pane</title>
+<p>The preview pane displays the message that is currently chosen in the message list.</p>
+<note style="tip"><p>You can disable the preview pane by toggling <guiseq><gui>View</gui><gui>Preview</gui><gui>Show Message Preview</gui></guiseq>.</p></note>
+</item>
+</terms>
+</section>
+
+<section id="calendar">
+<title>Calendar</title>
+<p>Elements in the calendar main window:</p>
+<table frame="all" rules="all">
+  <tr>
+    <td colspan="3"><p><media type="image" src="./figures/color-c4a000.png" width="10"/> Menu bar</p></td>
+  </tr>
+  <tr>
+    <td colspan="3"><p><media type="image" src="./figures/color-ce5c00.png" width="10" /> Tool bar</p></td>
+  </tr>
+  <tr>
+    <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Folder list</p></td>
+    <td colspan="2"><p><media type="image" src="./figures/color-4e9a06.png" width="10" /> Search bar</p></td>
+  </tr>
+  <tr>
+    <td rowspan="3"><p><media type="image" src="./figures/color-204a87.png" width="10" /> Appointment list</p></td>
+    <td><p>Task list</p></td>
+  </tr>
+  <tr>
+    <td><p>Month pane</p></td>
+    <td rowspan="2"><p>Memo list</p></td>
+  </tr>
+  <tr>
+    <td><p><media type="image" src="./figures/color-a40000.png" width="10" /> Switcher</p></td>
+  </tr>
+  <tr>
+    <td colspan="3"><p><media type="image" src="./figures/color-2e3436.png" width="10" /> Status bar</p></td>
+  </tr>
+</table>
+<terms>
+<item>
+<title>Appointment List</title>
+<p>The appointment list displays all your scheduled appointments in the time frame selected.</p>
+</item>
+<item>
+<title>Month Pane</title>
+<p>The month pane is a small view of a calendar month. To display additional months, drag the column border to the right. You can also select a range of days in the month pane to display a custom range of days in the appointment list.</p>
+</item>
+<item>
+<title>Task list and Memo list</title>
+<p>Tasks and memos are just displayed for your convience and are not associated to any appointments. Use the <gui>switcher</gui> to go to their main windows.</p>
+</item>
+</terms>
+
+</section>
+
+<section id="contacts">
+<title>Contacts</title>
+<p>Elements in the calendar main window:</p>
+<table frame="all" rules="all">
+  <tr>
+    <td colspan="2"><p><media type="image" src="./figures/color-c4a000.png" width="10"/> Menu bar</p></td>
+  </tr>
+  <tr>
+    <td colspan="2"><p><media type="image" src="./figures/color-ce5c00.png" width="10" /> Tool bar</p></td>
+  </tr>
+  <tr>
+    <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Folder list</p></td>
+    <td><p><media type="image" src="./figures/color-4e9a06.png" width="10" /> Search bar</p></td>
+  </tr>
+  <tr>
+    <td><p><media type="image" src="./figures/color-204a87.png" width="10" /> Contacts list</p></td>
+  </tr>
+  <tr>
+    <td><p><media type="image" src="./figures/color-a40000.png" width="10" /> Switcher</p></td>
+    <td><p><media type="image" src="./figures/color-5c3566.png" width="10" /> Contact preview</p></td>
+  </tr>
+  <tr>
+    <td colspan="2"><p><media type="image" src="./figures/color-2e3436.png" width="10" /> Status bar</p></td>
+  </tr>
+</table>
+<note style="tip"><p>You can disable the contact preview by toggling <guiseq><gui>View</gui><gui>Preview</gui><gui>Contact Preview</gui></guiseq>.</p></note>
+</section>
+</page>
diff --git a/help/C/mail-access-gmail-imap-account.page b/help/C/mail-access-gmail-imap-account.page
new file mode 100644
index 0000000000..810c598161
--- /dev/null
+++ b/help/C/mail-access-gmail-imap-account.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="email-access-gmail-imap-account">
+
+  <info>
+    <desc>How to set up a GMail IMAP Account.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+    <link type="guide" xref="google-services"/>
+    <link type="seealso" xref="mail-account-manage-imap"/>
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<!-- Page only exists for the <note>, apart from that nothing special. -->
+
+<title>Access a GMail IMAP Account via Evolution</title>
+
+<p>Please refer to the <link xref="mail-account-manage-imap">IMAP mail account settings</link>.</p>
+
+<note><p>To access GMail via IMAP you must turn on IMAP in your Google account. See the <link href="https://mail.google.com/support/bin/answer.py?answer=77695">GMail Help</link> for more information.</p></note>
+</page>
+
diff --git a/help/C/mail-access-gmail-pop-account.page b/help/C/mail-access-gmail-pop-account.page
new file mode 100644
index 0000000000..c624502715
--- /dev/null
+++ b/help/C/mail-access-gmail-pop-account.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="email-access-gmail-pop-account">
+
+  <info>
+    <desc>How to set up a GMail POP Account.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+    <link type="guide" xref="google-services"/>
+    <link type="seealso" xref="mail-account-manage-pop"/>
+
+    <revision pkgversion="2.28.3" version="0.1" date="2010-10-16" status="review"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+
+
+<title>Access a GMail POP Account via Evolution</title>
+
+<p>Follow these steps to set up your GMail POP Account in Evolution:</p>
+
+<steps>
+<item><p>Log in to your gmail account.</p></item>
+<item><p>Go to <guiseq><gui>Settings</gui><gui>Forwarding and POP/IMAP</gui></guiseq>. Refer to the POP Download section.</p></item>
+<item><p>Enable the POP download feature by ticking the radio button that corresponds to either of these options:</p>
+    <list>
+    <item><p>Enable POP for all mail (even mail that's already been downloaded)</p></item>
+    <item><p>Enable POP for mail that arrives from now on</p></item>
+    </list>
+</item>
+<item><p>Specify the other required settings for this Gmail feature.</p></item>
+<item><p>To know the Gmail Account settings, click on <guiseq><gui>Configuration instructions</gui><gui>Other</gui><gui>Standard Instructions</gui></guiseq>.</p></item>
+<item><p>On your Evolution client, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>. Click <gui style="button">Add</gui>. </p></item>
+<item><p>Provide the required information. For the account settings, refer to Step 5 </p></item>
+</steps>
+</page>
+
diff --git a/help/C/mail-account-manage-imap-plus.page b/help/C/mail-account-manage-imap-plus.page
new file mode 100644
index 0000000000..5de420bca4
--- /dev/null
+++ b/help/C/mail-account-manage-imap-plus.page
@@ -0,0 +1,60 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-imap-plus">
+
+  <info>
+    <desc>Add and edit an IMAP+ mail account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-common-account-types"/>
+
+    <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>IMAP+ mail account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+<!-- TODO:DEVELOPERS: No "IMAP Headers" tab for IMAP+ under Edit>Prefs>MailAccounts>Edit existing in 3.1.4. Is that intended? IMAP provides it. -->
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+<!-- TODO:DEVELOPERS: Find out if there are any different settings between IMAP and IMAP+. If not, merge with mail-account-manage-imap! -->
+</page>
diff --git a/help/C/mail-account-manage-imap.page b/help/C/mail-account-manage-imap.page
new file mode 100644
index 0000000000..5437b7ec16
--- /dev/null
+++ b/help/C/mail-account-manage-imap.page
@@ -0,0 +1,61 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-imap">
+
+  <info>
+    <desc>Add and edit an IMAP mail account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-common-account-types"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-29" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>IMAP mail account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+<section id="imap-headers">
+<title>IMAP Headers</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-local-delivery.page b/help/C/mail-account-manage-local-delivery.page
new file mode 100644
index 0000000000..697c941209
--- /dev/null
+++ b/help/C/mail-account-manage-local-delivery.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-local-delivery">
+
+  <info>
+    <desc>Add and edit a Local Delivery account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+    <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Local Delivery account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-maildir-format-directories.page b/help/C/mail-account-manage-maildir-format-directories.page
new file mode 100644
index 0000000000..547118e9c3
--- /dev/null
+++ b/help/C/mail-account-manage-maildir-format-directories.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-maildir-format-directories">
+
+  <info>
+    <desc>Add and edit a Maildir Format Mail Directories account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+    <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Maildir Format Mail Directories account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui>Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-mh-format-directories.page b/help/C/mail-account-manage-mh-format-directories.page
new file mode 100644
index 0000000000..637d6d39fe
--- /dev/null
+++ b/help/C/mail-account-manage-mh-format-directories.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-mh-format-directories">
+
+  <info>
+    <desc>Add and edit a MH Format Mail Directories account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+    <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>MH Format Mail Directories account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
new file mode 100644
index 0000000000..606dd785f4
--- /dev/null
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-microsoft-exchange-evo-ews">
+
+  <info>
+    <desc>Add and edit a Microsoft Exchange 2010 account in Evolution.</desc>
+
+  <link type="guide" xref="mail-account-manage-microsoft-exchange"/>
+
+    <revision pkgversion="3.1.5" version="0.1" date="2011-07-30" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Exchange Web Services account settings</title>
+<!-- TODO: Write once evo-ews is stable. Copy structure from other Exchange account types if applicable. -->
+
+<p>This documentation section will be added once the currently developed evolution-ews has become stable and mature.</p>
+</page>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-exchange.page b/help/C/mail-account-manage-microsoft-exchange-evo-exchange.page
new file mode 100644
index 0000000000..66510e758c
--- /dev/null
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-exchange.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-microsoft-exchange-evo-exchange">
+
+  <info>
+    <desc>Add and edit a Microsoft Exchange 2000/2003 account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-manage-microsoft-exchange"/>
+
+    <revision pkgversion="3.0.2" version="0.4" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Microsoft Exchange account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="exchange-settings">
+<title>Exchange Settings</title>
+<p>In this section you can define your "Out of Office" status, change the password for your Exchange account, and manage the delegation settings.</p><p>You can also view the size of all Exchange folders.</p>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<!-- <section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section> -->
+
+</page>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
new file mode 100644
index 0000000000..fc6c478b87
--- /dev/null
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-microsoft-exchange-evo-mapi">
+
+  <info>
+    <desc>Add and edit a Microsoft Exchange 2007 account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-manage-microsoft-exchange"/>
+
+    <revision pkgversion="3.0.2" version="0.4" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Exchange MAPI account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="exchange-settings">
+<title>Exchange Settings</title>
+<p>In this section you can view the size of all Exchange folders.</p>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<!-- <section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section> -->
+
+</page>
diff --git a/help/C/mail-account-manage-microsoft-exchange.page b/help/C/mail-account-manage-microsoft-exchange.page
new file mode 100644
index 0000000000..4bfb9026cd
--- /dev/null
+++ b/help/C/mail-account-manage-microsoft-exchange.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-microsoft-exchange">
+
+  <info>
+    <desc>Add and edit a Microsoft Exchange account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-corporate-account-types"/>
+    <link type="guide" xref="exchange-placeholder"/>
+
+    <revision pkgversion="2.30.2" version="0.3" date="2011-07-30" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Microsoft Exchange account settings</title>
+
+<note><p>Please first read <link xref="exchange-connectors-overview">Choosing the right connector</link> to find out about the right Exchange account type for you.</p></note>
+
+</page>
diff --git a/help/C/mail-account-manage-novell-groupwise.page b/help/C/mail-account-manage-novell-groupwise.page
new file mode 100644
index 0000000000..3273a0a813
--- /dev/null
+++ b/help/C/mail-account-manage-novell-groupwise.page
@@ -0,0 +1,61 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-novell-groupwise">
+
+  <info>
+    <desc>Add and edit a Novell Groupwise account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-corporate-account-types"/>
+    <link type="guide" xref="groupwise-placeholder"/>
+
+    <revision pkgversion="3.0.2" version="0.4" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Novell Groupwise account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+<!-- TODO:NOACCESS: Cannot document Advanced Send Options stuff as this needs an active Groupwise account. -->
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+<section id="proxy">
+<title>Proxy</title>
+<p>Settings for having somebody else handle your account.</p>
+<!-- TODO:NOACCESS: Cannot document Proxy stuff as this needs an active Groupwise account. -->
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<!-- <section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section> -->
+
+</page>
diff --git a/help/C/mail-account-manage-pop.page b/help/C/mail-account-manage-pop.page
new file mode 100644
index 0000000000..d1f39572f6
--- /dev/null
+++ b/help/C/mail-account-manage-pop.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-pop">
+
+  <info>
+    <desc>Add and edit a POP mail account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-common-account-types"/>
+
+    <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>POP mail account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-unix-mbox-spool-directory.page b/help/C/mail-account-manage-unix-mbox-spool-directory.page
new file mode 100644
index 0000000000..be7a7ad593
--- /dev/null
+++ b/help/C/mail-account-manage-unix-mbox-spool-directory.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-unix-mbox-spool-directory">
+
+  <info>
+    <desc>Add and edit a Standard Unix mbox Spool Directory account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+    <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Standard Unix mbox Spool Directory account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-unix-mbox-spool-file.page b/help/C/mail-account-manage-unix-mbox-spool-file.page
new file mode 100644
index 0000000000..98cfc74aae
--- /dev/null
+++ b/help/C/mail-account-manage-unix-mbox-spool-file.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-unix-mbox-spool-file">
+
+  <info>
+    <desc>Add and edit a Standard Unix mbox Spool File account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-local-account-types"/>
+
+    <revision pkgversion="2.30.2" version="0.2" date="2011-01-06" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Standard Unix mbox Spool File account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-manage-usenet-news.page b/help/C/mail-account-manage-usenet-news.page
new file mode 100644
index 0000000000..7a95b14266
--- /dev/null
+++ b/help/C/mail-account-manage-usenet-news.page
@@ -0,0 +1,57 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-manage-usenet-news">
+
+  <info>
+    <desc>Add and edit a Usenet news account in Evolution.</desc>
+
+    <link type="guide" xref="mail-account-management#mail-common-account-types"/>
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Usenet news account settings</title>
+
+<section id="account-editor">
+<title>Account Editor</title>
+<p>Mail accounts can be added via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
+<p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq>. The following settings are available when editing an existing account:</p>
+
+<section id="identity">
+<title>Identity</title>
+<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
+</section>
+
+<section id="receiving-email">
+<title>Receiving Email and Receiving options</title>
+</section>
+
+<section id="sending-email">
+<title>Sending Email</title>
+</section>
+
+<section id="defaults">
+<title>Defaults</title>
+</section>
+
+<section id="security">
+<title>Security</title>
+</section>
+
+</section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
+
+<section id="other-settings">
+<title>Other settings</title>
+<p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
+</section>
+
+</page>
diff --git a/help/C/mail-account-management.page b/help/C/mail-account-management.page
new file mode 100644
index 0000000000..4e6bf0c574
--- /dev/null
+++ b/help/C/mail-account-management.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-account-management">
+
+  <info>
+    <desc>Adding, editing and managing mail accounts.</desc>
+
+    <link type="guide" xref="index#mail-basic" />
+
+    <revision pkgversion="2.28.3" version="0.3" date="2010-12-09" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Account Management</title>
+
+  <section id="mail-common-account-types" style="2column">
+    <title>Common Account Types</title>
+  </section>
+
+  <section id="mail-local-account-types" style="2column">
+    <title>Local Account Types</title>
+  </section>
+
+  <section id="mail-corporate-account-types" style="2column">
+    <title>Corporate Account Types</title>
+  </section>
+
+</page>
diff --git a/help/C/mail-attachments-received.page b/help/C/mail-attachments-received.page
new file mode 100644
index 0000000000..610a49889f
--- /dev/null
+++ b/help/C/mail-attachments-received.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-attachments-received">
+
+  <info>
+    <desc>Saving and opening files that are attached to received emails.</desc>
+
+    <link type="guide" xref="mail-displaying-message" />
+    <link type="guide" xref="mail-attachments" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from Reuse http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-get-attach-actions -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Handling attachments in received mail</title>
+
+<p>If you receive an email message with one or more file attachments, Evolution displays the number of attachments and a <gui style="button">Save</gui> or <gui style="button">Save All</gui> button between the email header and the content of the email.</p>
+
+<p>A list of attachments is also available at the bottom of the email.</p>
+<p>To save an attachment to disk, click the down-arrow next to the attachment icon and click <gui>Save As</gui>.</p>
+<p>To open an attachment in another application, click the down-arrow next to the attachment icon and choose one of the available applications.</p>
+
+<p>The options available for an attachment vary depending on the type of attachment and the applications that are installed on your system. For example, image files can be opened in the <gui>Image Viewer</gui> application or in the <gui>GIMP</gui> graphics editor.</p>
+
+</page>
diff --git a/help/C/mail-attachments-sending.page b/help/C/mail-attachments-sending.page
new file mode 100644
index 0000000000..35ad0bd5b4
--- /dev/null
+++ b/help/C/mail-attachments-sending.page
@@ -0,0 +1,55 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-attachments-sending">
+
+  <info>
+    <desc>Attaching files to emails you want to send.</desc>
+
+    <link type="guide" xref="index#mail-composing" />
+    <link type="guide" xref="mail-attachments" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-compose and http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#b17rcxmf -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Adding attachments to an email</title>
+
+<section id="attaching">
+<title>Attaching files</title>
+<p>To attach a file to your email in the composer:</p>
+<steps>
+<item><p>Click <gui>Add Attachment...</gui>, or click <guiseq><gui>Insert</gui><gui>Attachment</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>M</key></keyseq>.</p></item>
+<item><p>Select the file you want to attach.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+<p>You can also drag a file to the attachment bar of the composer window.</p>
+
+<p>When you send the message, a copy of the attached file goes with it. Be aware that large attachments can take a long time to send and receive.</p>
+</section>
+
+<section id="reminders">
+<title>Attachment Reminder</title>
+
+<p>Evolution has an Attachment Reminder plugin you can use to remind yourself to attach a file to an email. If it determines that you have not attached the file, it displays a reminder window before the email is sent.</p>
+
+<p>To enable the Attachment Reminder:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>.</p></item>
+<item><p>Enable <gui>Attachment Reminder</gui>.</p></item>
+<item><p>Click the <gui>Configuration</gui> tab.</p></item>
+<item><p>Click <gui style="button">Add</gui>, then enter keywords in your language such as "Attach" or "enclosed".</p></item>
+</steps>
+<p>Based on the keywords you have added, Evolution searches the text of every mail you are going to send. If it finds any of the keywords in your email and there is no actual attached file, the reminder window is displayed.</p>
+
+</section>
+
+</page>
diff --git a/help/C/mail-attachments.page b/help/C/mail-attachments.page
new file mode 100644
index 0000000000..27e7b9faa6
--- /dev/null
+++ b/help/C/mail-attachments.page
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-attachments">
+
+  <info>
+    <desc>Handling of file attachments for writing and reading mail</desc>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-05-02" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Managing attachments</title>
+
+</page>
diff --git a/help/C/mail-calendar-sending-invitations.page b/help/C/mail-calendar-sending-invitations.page
new file mode 100644
index 0000000000..b18143141b
--- /dev/null
+++ b/help/C/mail-calendar-sending-invitations.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-calendar-sending-invitations">
+
+  <info>
+    <desc>Sending invitations for appointments to contacts via email.</desc>
+
+    <link type="guide" xref="index#mail-advanced" />
+    <link type="guide" xref="index#calendar" />
+    <!-- TODO:POST-3-2: Finding a better place to link this against would be welcome. -->
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/rsvp-stuff.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Sending invitations by email</title>
+
+<p>If you create an event in the calendar component, you can then send invitations to the attendee list through the Evolution email tool. The invitation card is sent as an attachment in iCal format.</p>
+
+<p>To send an invitation, right-click on the entry in the calendar and choose <gui>Forward as iCalendar</gui>.</p>
+
+<p>When you receive an invitation, you have several options:</p>
+
+<list>
+<item><p>
+Accept:</p><p>Indicates you will attend the meeting. When you click the OK button, the meeting is entered into your calendar.
+</p></item>
+<item><p>
+Tentatively Accept:</p><p>Indicates you will probably attend the meeting. When you click the OK button, the meeting is entered into your calendar, but is marked as tentative.
+</p></item>
+<item><p>
+Decline:</p><p>Indicates you are unable to attend the meeting. The meeting is not entered into your calendar when you click OK, although your response is sent to the meeting host if you have selected the Send reply to sender option.
+</p></item>
+<item><p>
+Send reply to sender:</p><p>Select this option if you want your response sent to the meeting organizers.
+</p></item>
+</list>
+ 
+</page>
diff --git a/help/C/mail-cannot-see.page b/help/C/mail-cannot-see.page
new file mode 100644
index 0000000000..086b27c5dd
--- /dev/null
+++ b/help/C/mail-cannot-see.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-cannot-see">
+
+  <info>
+    <desc>If you received or sent an email, but you cannot find it anywhere.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2010-10-09" status="candidate"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>I cannot see some emails, where are they?</title>
+
+<list>
+ <item>
+  <p>Check whether you are using filters on incoming (or outgoing) messages. These could be automatically moving your messages to another destination.</p>
+ </item>
+ <item>
+  <p>Check your search view in the search bar right above the message list. Perhaps the <gui>Show</gui> dropdown list is set to a filter like <gui>Read Messages</gui>, or the text input filed contains some value. Click the broom icon to clear the search field.</p>
+ </item>
+ <item>
+  <p>If you cannot see any emails at all in a folder, check that you have not maximized the message preview (so the message list pane is hidden). To do this, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Show Message Preview</gui></guiseq>.</p>
+ </item>
+ <item>
+  <p>Look in the <gui>Junk</gui> folder. Messages that are marked as Junk disappear from the original folder and are moved to the Junk folder.
+  </p>
+ </item>
+ <!-- Does the following option still exist? -->
+ <item>
+  <p>Click <guiseq><gui>Edit</gui><gui>Show Hidden Messages</gui></guiseq> to make sure all messages are visible.</p>
+ </item>
+ <item>
+  <p>Check your default folder under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Email Accounts</gui><gui>Edit</gui><gui>Defaults</gui></guiseq>. Perhaps it is set to some other folder then the folder you thought of.</p>
+ </item>
+</list>
+
+</page>
diff --git a/help/C/mail-change-columns-in-message-list.page b/help/C/mail-change-columns-in-message-list.page
new file mode 100644
index 0000000000..8dc76001da
--- /dev/null
+++ b/help/C/mail-change-columns-in-message-list.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-change-columns-in-message-list">
+
+  <info>
+    <desc>Editing the columns displayed in the list of messages.</desc>
+    
+    <link type="guide" xref="mail-layout-changing" />
+
+    <revision pkgversion="2.32.2" version="0.2" date="2011-07-21" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+  <title>Changing the message list columns</title>
+
+<p>If you want to change the columns in the mail message list, right-click on the column headers and choose either <gui>Add a Column...</gui> or <gui>Remove This Column</gui>.</p>
+<note style="tip"><p>If you have a small display, you can replace the <gui>Subject</gui> column by the <gui>Subject - Trimmed</gui> which will remove prefixes such as "Re:", or you can replace the <gui>From</gui> column which displays the sender's name and email address by the <gui>Sender</gui> column which will only display the sender's name.</p></note>
+
+</page>
diff --git a/help/C/mail-change-time-format.page b/help/C/mail-change-time-format.page
new file mode 100644
index 0000000000..494994e095
--- /dev/null
+++ b/help/C/mail-change-time-format.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-change-time-format">
+
+  <info>
+    <desc>Changing the date and time format in the message list.</desc>
+    <link type="guide" xref="mail-layout-changing" />
+
+    <revision pkgversion="2.32.2" version="0.1" date="2011-07-22" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+  <title>Format of dates and time</title>
+<p>You can change the format of the <gui>Date</gui> column by setting your prefered format under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Headers</gui><gui>Date/Time format</gui></guiseq>.</p><p>The placeholders in the format expression are strftime variables.</p>
+<!-- TODO:POST-3-2: Where to get a list of strftime variables? -->
+<!-- TODO: Time formats settings for Calendar (calendar-layout-appointment-display), Contacts (Edit>Prefs>Contacts) are split everywhere, probably introduce a guide page linking to these three pages -->
+</page>
diff --git a/help/C/mail-composer-change-quotation-string.page b/help/C/mail-composer-change-quotation-string.page
new file mode 100644
index 0000000000..0ba34cd4c8
--- /dev/null
+++ b/help/C/mail-composer-change-quotation-string.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-change-quotation-string">
+
+  <info>
+    <desc>It is not possible to change the quotation introduction added when answering mail.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+    <link type="seealso" xref="mail-composer-reply" />
+    <link type="seealso" xref="mail-composer-forward" />
+
+    <revision pkgversion="2.32.1" version="0.2" date="2010-12-15" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Changing the "On <em>date, person</em> wrote:" string when replying</title>
+
+<p>Advanced users can change this string by editing the gconf key <file>/apps/evolution/mail/composer/message_attribution</file> via gconf-editor.<!-- Codebase: evolution/mail/em-composer-utils.c --></p>
+<!-- TODO: Outdated once Evolution switches to GSettings -->
+</page>
+
diff --git a/help/C/mail-composer-custom-header-lines.page b/help/C/mail-composer-custom-header-lines.page
new file mode 100644
index 0000000000..1ba4545019
--- /dev/null
+++ b/help/C/mail-composer-custom-header-lines.page
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-composer-custom-header-lines">
+
+  <info>
+    <desc>Using custom fields in the header of composed messages</desc>
+
+    <link type="guide" xref="index#mail-composing-advanced" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#b1a5azam -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Custom Header Lines</title>
+
+<p>You can add arbitrary header lines to outgoing emails.</p>
+
+<section id="managing">
+<title>Enabling and managing custom headers</title>
+<p>To set up the Custom Header plugin:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>.</p></item>
+<item><p>Enable <gui>Custom Header</gui>.</p></item>
+<item><p>Click the <gui>Configuration</gui> tab.</p></item>
+<item><p>You can add, edit, or remove the header fields. For every header field you add, you can specify the keys and values. The key is used as the title of the Custom Header. You can enter multiple values for the keys. You must use a semicolon to separate every value you enter.</p></item>
+</steps>
+</section>
+
+<section id="inserting">
+<title>Inserting custom headers in a message</title>
+<steps>
+<item><p>Click <guiseq><gui>New</gui><gui>Mail Message</gui></guiseq> or press <keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq> to open the message composer window.</p></item>
+<item><p>Select <guiseq><gui>Insert</gui><gui>Custom Header</gui></guiseq>.</p>
+<p>In the <gui>Email Custom Header</gui> window, you can view all the defined header fields and values.</p></item>
+<item><p>Set the values for the header fields by using the dropdown list.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/mail-composer-forward-as-attachment.page b/help/C/mail-composer-forward-as-attachment.page
new file mode 100644
index 0000000000..a0b1a00bd8
--- /dev/null
+++ b/help/C/mail-composer-forward-as-attachment.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-forward-as-attachment">
+
+  <info>
+    <desc>How to forward a message with its attachments.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+    <link type="seealso" xref="mail-composer-forward" />
+
+    <revision pkgversion="2.30.2" version="0.2" date="2010-12-08" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Forwarding a message with its attachments</title>
+
+<p>Click <guiseq><gui>Message</gui><gui>Forward as...</gui></guiseq> and choose <gui>Attachment</gui>, so the forwarded email and also its attachments get attached to the email you want to send.</p>
+
+<note>
+<p>If you want to have this setting by default, set <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Forward Style</gui></guiseq> to <gui>Attachment</gui>.</p>
+</note>
+</page>
+
diff --git a/help/C/mail-composer-forward.page b/help/C/mail-composer-forward.page
new file mode 100644
index 0000000000..3a51868864
--- /dev/null
+++ b/help/C/mail-composer-forward.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-forward">
+
+  <info>
+    <desc>Forwarding a received email to somebody.</desc>
+    
+    <link type="guide" xref="index#mail-composing" />
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-fwd -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Forwarding a message</title>
+
+<p>When you receive an email, you can forward it to other individuals or groups that might be interested.</p>
+<p>You can forward a message as an attachment to a new message (this is the default setting, see <link xref="#default-settings">Default settings</link>), inline (in your message without the &gt; character before each line), or quoted (with &gt; character before each line).</p>
+<p>Attachment forwarding is best if you want to send the full, unaltered message to someone else. Inline or Quoted forwarding is best if you want to send portions of a message, or if you have a large number of comments on different sections of the message you are forwarding.</p>
+
+<p>To forward a message that you are reading:</p>
+<steps>
+<item><p>Click <guiseq><gui>Message</gui><gui>Forward</gui></guiseq>, the <gui>Forward</gui> button in the toolbar, or press <keyseq><key>Ctrl</key><key>F</key></keyseq> to use the default forwarding method. In case you want to use a different forward method, click <guiseq><gui>Message</gui><gui>Forward as</gui></guiseq> or the small dropdown arrow next to the <gui>Forward</gui> button in the toolbar to choose the method.</p></item>
+<item><p>Select a recipient for the message. The subject is already entered, although you can alter it if you want.</p></item>
+<item><p>Add your comments on the message in the text field.</p></item>
+<item><p>Click <gui style="button">Send</gui> or press <keyseq><key>Ctrl</key><key>Return</key></keyseq>.</p></item>
+</steps>
+
+<p>Attachments to a message you are forwarding are forwarded only when you send the original message as an attachment. Inline messages do not forward any attachments.</p>
+
+<section id="default-settings">
+<title>Default settings</title>
+<p>The default settings for replying and forwarding can be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Forward style</gui></guiseq>.</p>
+</section>
+
+</page>
+
diff --git a/help/C/mail-composer-html-image.page b/help/C/mail-composer-html-image.page
new file mode 100644
index 0000000000..44e4d71c95
--- /dev/null
+++ b/help/C/mail-composer-html-image.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-html-image">
+
+  <info>
+    <desc>Embed a picture in the mail composer.</desc>
+    <link type="guide" xref="mail-composer-html#formatting-options" />
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#bsait2b -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+<title>Inserting an Image in HTML</title>
+
+<p>You can insert an image into the email (at the current position of the cursor):</p>
+<steps>
+<item><p>Click <guiseq><gui>Insert</gui><gui>Image...</gui></guiseq> in the menubar.</p></item>
+<item><p>Browse to and select the file.</p></item>
+<item><p>Click <gui>Open</gui>.</p></item>
+</steps>
+
+<note>Alternately, you can also drag an image into the text area of the message composer.</note>
+
+</page>
+
diff --git a/help/C/mail-composer-html-link.page b/help/C/mail-composer-html-link.page
new file mode 100644
index 0000000000..309d43f476
--- /dev/null
+++ b/help/C/mail-composer-html-link.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-html-link">
+
+  <info>
+    <desc>Insert a link to a website in the mail composer.</desc>
+    <link type="guide" xref="mail-composer-html#formatting-options" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#bsait2a -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+<title>Inserting a Link in HTML</title>
+
+
+<p>You can insert links into the email:</p>
+<steps>
+<item><p>Select the text that you want to turn into a link.</p></item>
+<item><p>Either click <guiseq><gui>Insert</gui><gui>Link...</gui></guiseq> in the menubar, or right-click on the selected text and click <gui>Insert Link</gui>.</p></item>
+<item><p>Enter the address in the <gui>URL</gui> field.</p></item>
+<item><p>Click <gui>Close</gui>.</p></item>
+</steps>
+
+<p>If you do not want a special link text you can just enter the address of the link directly. It will be automatically recognized as a link.</p>
+</page>
+
diff --git a/help/C/mail-composer-html-rule.page b/help/C/mail-composer-html-rule.page
new file mode 100644
index 0000000000..026a9dac4a
--- /dev/null
+++ b/help/C/mail-composer-html-rule.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-html-rule">
+
+  <info>
+    <desc>Insert a horizontal line in the mail composer.</desc>
+    <link type="guide" xref="mail-composer-html#formatting-options" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#bsait2c -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+<title>Inserting a Rule in HTML</title>
+
+<p>You can insert a horizontal line into the email (at the current position of the cursor) to help divide two sections:</p>
+<steps>
+<item><p>Click <guiseq><gui>Insert</gui><gui>Rule...</gui></guiseq> in the menubar.</p></item>
+<item><p>Select width, size, and alignment.</p></item>
+<item><p>Select <gui>Shaded</gui> if wanted.</p></item>
+<item><p>Click <gui>Close</gui>.</p></item>
+</steps>
+
+</page>
+
diff --git a/help/C/mail-composer-html-table.page b/help/C/mail-composer-html-table.page
new file mode 100644
index 0000000000..fd58dc3f84
--- /dev/null
+++ b/help/C/mail-composer-html-table.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-html-table">
+
+  <info>
+    <desc>Insert a table in the mail composer.</desc>
+    <link type="guide" xref="mail-composer-html#formatting-options" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#bsait2d -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+<title>Inserting a Table in HTML</title>
+
+<p>You can insert a table into the email (at the current position of the cursor):</p>
+<steps>
+<item><p>Click <guiseq><gui>Insert</gui><gui>Table...</gui></guiseq> in the menubar.</p></item>
+<item><p>Select the number of rows and columns.</p></item>
+<item><p>Define the type of layout for the table.</p></item>
+<item><p>Optionally: Select a background color or image for the table.</p></item>
+<item><p>Click <gui>Close</gui>.</p></item>
+</steps>
+
+</page>
+
diff --git a/help/C/mail-composer-html-text.page b/help/C/mail-composer-html-text.page
new file mode 100644
index 0000000000..11b8fbdb9b
--- /dev/null
+++ b/help/C/mail-composer-html-text.page
@@ -0,0 +1,82 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-html-text">
+
+  <info>
+    <desc>Format Text in the mail composer.</desc>
+    <link type="guide" xref="mail-composer-html#formatting-options" />
+
+    <revision pkgversion="3.0.2" version="0.3" date="2011-08-01" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-html -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+<title>Formatting Text in HTML</title>
+
+<!-- TODO: These instructions are partially WRONG in 3.0.2 as the tool bar has been split into two. Needs an update. Maybe we also need a way to describe the non-HTML-only functions for plain text mail somewhere. -->
+
+     <p>HTML formatting tools are located in the two tool bars just above the area where you actually write the message. They also appear in the <gui>Insert</gui> and <gui>Format</gui> menus.</p>
+     <p>The icons in the tool bar are explained in tooltips which appear when you hold your mouse pointer over the buttons. The buttons fall into five categories:</p>
+
+<section id="headers-and-lists">
+ <title>Headers and Lists:</title>
+ <p>At the left of the upper tool bar, you can choose <gui>Normal</gui> for a default text style or <gui>Header 1</gui> through <gui>Header 6</gui> for varying sizes of header from large (1) to tiny (6). Other styles include <gui>Preformat</gui>, to use the HTML tag for preformatted blocks of text, and three types of bullet points for lists.</p>
+ <p>For instance, instead of using asterisks to mark a bulleted list, you can use the <gui>Bulleted List</gui> style from the style dropdown list. Evolution uses different bullet styles, and handles word wrap and multiple levels of indentation.</p>
+</section>
+
+<section id="alignment">
+      <title>Alignment:</title>
+      <p>Located next to the Headers and Lists dropdown, the three paragraph icons should be familiar to users of most word processing software. The left-most button aligns your text to the left, the center button centers text, and the right button aligns the text to the right.</p>
+</section>
+
+<section id="indentation-rules">
+      <title>Indentation Rules:</title>
+      <p>The button with the arrow pointing left decreases a paragraph's indentation, and the right arrow increases its indentation.</p>
+</section>
+
+<section id="text-styles">
+      <title>Text Styles:</title>
+      <p>Use these buttons in the lower tool bar to determine the way your email looks. If you have text selected, the style applies to the selected text. If you do not have text selected, the style applies to whatever you type next.</p>
+
+<table frame="all" rules="all">
+  <tr>
+    <td><p>Button</p></td>
+    <td><p>Description</p></td>
+  </tr>
+  <tr>
+    <td><p>TT</p></td>
+    <td><p>Typewriter text, which is similar to a monospace font.</p></td>
+  </tr>
+  <tr>
+    <td><p>Bold A</p></td>
+    <td><p>Bolds the text.</p></td>
+  </tr>
+  <tr>
+    <td><p>Italic A</p></td>
+    <td><p>Italicizes the text.</p></td>
+  </tr>
+  <tr>
+    <td><p>Underlined A</p></td>
+    <td><p>Underlines the text.</p></td>
+  </tr>
+  <tr>
+    <td><p>Strike through A</p></td>
+    <td><p>Marks a line through the text.</p></td>
+  </tr>
+</table>
+</section>
+
+<section id="color-selection">
+      <title>Color Selection:</title>
+      <p>At the left in the lower tool bar is the color section tool, where a box displays the current text color. To choose a new color, click the arrow button to the right. If you have text selected, the color applies to the selected text. If you do not have text selected, the color applies to whatever you type next. You can select a background color or image by right-clicking the message background, then selecting <guiseq><gui>Style</gui><gui>Page Style</gui></guiseq>.</p>
+</section>
+
+</page>
+
diff --git a/help/C/mail-composer-html.page b/help/C/mail-composer-html.page
new file mode 100644
index 0000000000..520b7269d4
--- /dev/null
+++ b/help/C/mail-composer-html.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-composer-html">
+
+  <info>
+    <desc>Format emails by using HTML instead of plain text.</desc>
+    <link type="guide" xref="index#mail-composing" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-html -->
+    </credit>
+  </info>
+
+<title>Using HTML format to enhance emails</title>
+
+<p>Normally, you cannot set text styles or insert pictures in email. However, most newer email programs can display images and text styles in addition to basic alignment and paragraph formatting. They do this with HTML, just like web pages do.</p>
+
+<p>Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, Evolution sends plain text unless you explicitly ask for HTML.</p>
+
+<p>You can change the format of an email message from plain text to HTML by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar.</p>
+<p>To send all your mail as HTML by default, enable <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default Behavior</gui><gui>Format messages in HTML</gui></guiseq>.</p>
+
+  <section id="formatting-options" style="2column">
+    <title>HTML Formatting Options</title>
+  </section>
+
+</page>
+
diff --git a/help/C/mail-composer-mail-signatures-manage.page b/help/C/mail-composer-mail-signatures-manage.page
new file mode 100644
index 0000000000..4a5703172c
--- /dev/null
+++ b/help/C/mail-composer-mail-signatures-manage.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-mail-signatures-manage">
+
+  <info>
+    <desc>Add, change, edit or delete email signatures.</desc>
+    
+    <link type="guide" xref="mail-composer-mail-signatures" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Managing signatures</title>
+
+<p>You can add, edit and delete all your signatures under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer preferences</gui><gui>Signatures</gui></guiseq>.</p>
+<p>Assigning a default signature to an email account has to be done in the <link xref="mail-composer-mail-signatures-per-account">account settings</link>.</p>
+
+</page>
diff --git a/help/C/mail-composer-mail-signatures-per-account.page b/help/C/mail-composer-mail-signatures-per-account.page
new file mode 100644
index 0000000000..e68b5abfd5
--- /dev/null
+++ b/help/C/mail-composer-mail-signatures-per-account.page
@@ -0,0 +1,38 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-mail-signatures-per-account">
+
+  <info>
+    <desc>Setting a default signature for an email account.</desc>
+    
+    <link type="guide" xref="mail-composer-mail-signatures" />
+    <link type="guide" xref="mail-account-manage-imap#identity"/>
+    <link type="guide" xref="mail-account-manage-imap-plus#identity"/>
+    <link type="guide" xref="mail-account-manage-local-delivery#identity"/>
+    <link type="guide" xref="mail-account-manage-maildir-format-directories#identity"/>
+    <link type="guide" xref="mail-account-manage-mh-format-directories#identity"/>
+    <link type="guide" xref="mail-account-manage-microsoft-exchange#identity"/>
+    <link type="guide" xref="mail-account-manage-novell-groupwise#identity"/>
+    <link type="guide" xref="mail-account-manage-pop#identity"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#identity"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#identity"/>
+    <link type="guide" xref="mail-account-manage-usenet-news#identity"/>
+    <!-- TODO:POST-3-2: Having 13 guide links here looks really ugly -->
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Default account signature</title>
+
+<p>You can define a default <link xref="mail-composer-mail-signatures">signature</link> for each of your mail accounts. This can be edited under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui>Edit</gui><gui>Identity</gui><gui>Optional Information</gui></guiseq>.</p>
+
+<p>If you have a signature for your account defined but exceptionally do not want to use it for one message, or want to use a different signature, you can change it via the dropdown menu in the right upper corner in the email composer window.</p>
+
+</page>
diff --git a/help/C/mail-composer-mail-signatures.page b/help/C/mail-composer-mail-signatures.page
new file mode 100644
index 0000000000..1c8e60a156
--- /dev/null
+++ b/help/C/mail-composer-mail-signatures.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-composer-mail-signatures">
+
+  <info>
+    <desc>Using email signatures at the bottom of a message you send.</desc>
+    
+    <link type="guide" xref="index#mail-composing" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+
+<title>Working with email signatures</title>
+
+<p>A signature consists of one or more lines of text (or even a picture) that will be added at the end of an email that you send. It can contain contact information or other things. A signature always begins with two dashes and a space (<code>-- </code>).</p>
+<note><p>The term "signature" is also differently used in terms of <link xref="mail-encryption">encryption</link>.</p></note>
+</page>
+
diff --git a/help/C/mail-composer-message-templates.page b/help/C/mail-composer-message-templates.page
new file mode 100644
index 0000000000..9b593c2a5d
--- /dev/null
+++ b/help/C/mail-composer-message-templates.page
@@ -0,0 +1,99 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+type="topic" id="mail-composer-message-templates">
+
+  <info>
+ <desc>Message templates to reuse in the composer.</desc>
+
+ <link type="guide" xref="index#mail-composing-advanced" />
+
+ <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="stub"/>
+ <credit type="author">
+   <name>Andre Klapper</name>
+   <email>ak-47@gmx.net</email>
+ </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/b1dlaazl.html.en -->
+ </credit>
+ <license>
+   <p>Creative Commons Share Alike 3.0</p>
+ </license> 
+
+  </info>
+
+<title>Message Templates</title>
+<p>A message template is a standard message that you can use at any time to send mail with the same pattern.</p>
+<p>To enable the Message Template Plugin, click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq> and enable <gui>Templates</gui>.</p>
+
+<!-- TODO: Check correctness of all these steps in 3.1. --> 
+<!-- TODO:POST-3-2: Split this into subpages maybe, and turn this into a guide page! -->
+
+<section id="create">
+<title>Creating a Message Template from an existing Message</title>
+<steps>
+  <item><p>Select the message.</p></item>
+  <item><p>Right-click the message and choose <gui>Move to folder</gui> or <gui>Copy to folder</gui>.</p></item>
+  <item><p>Select the <gui>Templates</gui> folder under <gui>On This Computer</gui>.</p></item>
+</steps>
+<p>You can also edit an existing message and save it as a template:</p>
+<steps>
+  <item><p>Open the message and click <gui>Reply</gui>.</p></item>
+  <item><p>Edit the message body or the addresses according to your requirements.</p></item>
+  <item><p>Select <guiseq><gui>File</gui><gui>Save as Template</gui></guiseq>.</p></item>
+ </steps>
+</section>
+
+<section id="save">
+ <title>Saving a New Message as a Template</title>
+ <steps>
+  <item>
+<p>Click <gui>New</gui> and enter in the composer window what you need for the template.</p>
+  </item>
+  <item>
+<p>Select <guiseq><gui>File</gui><gui>Save as Template</gui></guiseq>.</p>
+  </item>
+ </steps>
+</section>
+
+<section id="reply">
+ <title>Using a Message Template as a Reply</title>
+ <steps>
+  <item>
+<p>Right-click the message you are replying to, then click <gui>Templates</gui>.</p>
+<p>This option lists all the message templates in the <gui>Templates</gui> folder.</p>
+  </item>
+  <item>
+<p>Select the message template of your choice. Make changes if required in the email composer window that will open.</p>
+  </item>
+  <item>
+<p>Click <gui>Send</gui>.</p>
+<p>When you select a message template for replying, the subject of the reply is preserved.</p>
+  </item>
+ </steps>
+</section>
+
+<section id="configure">	
+<title>Configuring Message Templates</title>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>.</p></item>
+<item><p>Click <gui>Templates</gui>.</p></item>
+<item><p>Click the <gui>Configuration</gui> tab.</p></item>
+<item><p>You can add, edit or remove the key-value pairs. You can specify any number of key-value pairs.</p></item>
+</steps>
+ <p>In any template, the occurrence of every $key is replaced by the value it has in the configuration. For example, if you set the key to Manager and the value to Harry, any occurrence of $Manager is replaced by Harry in the message.</p>
+ <p>Assume that you have 1000 message templates with your current manager's name in them. When the current manager is replaced by a new one, it is not easy for you to manually replace the manager's name in all the 1000 messages. If the messages have a $Manager key value, you can reset the value in the Configuration tab of this plugin.</p>
+ <p>By default, the entire environment variables are used as a key-value pair. An occurrence of $env_variable is replaced by the value it carries. For example, an occurrence of $PATH in your template is replaced by its value when the template is used.</p>
+ <p>The replacement process uses the following order of precedence:</p>
+ <steps>
+  <item>
+<p>$key is replaced by the value set for it in the Configuration tab of the Templates plugin.</p>
+  </item>
+  <item>
+<p>If the key is not found, it is then replaced with the value of its environment variable.</p>
+  </item>
+  <item>
+<p>If key is neither a configuration option nor an environment variable, no changes are made.</p>
+  </item>
+ </steps>
+</section>
+
+</page>
diff --git a/help/C/mail-composer-priority.page b/help/C/mail-composer-priority.page
new file mode 100644
index 0000000000..6f984da57b
--- /dev/null
+++ b/help/C/mail-composer-priority.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-composer-priority">
+
+  <info>
+    <desc>Setting a priority for messages to be sent.</desc>
+
+    <link type="guide" xref="index#mail-composing-advanced" />
+
+    <revision pkgversion="2.32.2" version="0.1" date="2011-07-22" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#BJEHCDFA -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Prioritizing outgoing messages</title>
+
+<p>You can prioritize a message to be sent, so that the recipient sees its relative importance. To prioritize a message, click <guiseq><gui>Insert</gui><gui>Prioritize Message</gui></guiseq> in the composer window.</p>
+
+<note style="tip"><p>Evolution will ignore the message priority of incoming messages because the recipient should decide whether the message is important or not. You can set the "Important" flag for any messages.</p></note>
+
+</page>
diff --git a/help/C/mail-composer-reply.page b/help/C/mail-composer-reply.page
new file mode 100644
index 0000000000..e8a0b8ce36
--- /dev/null
+++ b/help/C/mail-composer-reply.page
@@ -0,0 +1,58 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-reply">
+
+  <info>
+    <desc>Answering a received email.</desc>
+    
+    <link type="guide" xref="index#mail-composing" />
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-reply -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Replying to a message</title>
+
+<section id="keyboard-shortcuts">
+<title>Replying to Email Messages</title>
+<p>To reply to a message, select the message to reply to in the message list and click the Reply button in the toolbar, or right-click within the message and select Reply to Sender. This opens the message composer. The <gui>To:</gui> and <gui>Subject:</gui> fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the &gt; character before each line (in plain text mode), to indicate that it is part of the previous message.</p>
+<p>If you are reading a message with several recipients, you can use <gui>Reply to All</gui> instead of <gui>Reply</gui>. If there are large numbers of people in the <gui>Cc:</gui> or <gui>To:</gui> fields, this can save substantial amounts of time.</p>
+</section>
+
+<section id="reply-to-all">
+<title>Using the Reply To All Feature</title>
+<p>Susan sends an email to a client and sends copies to Tim and to an internal company mailing list of co-workers. If Tim wants to make a comment for all of them to read, he uses <gui>Reply to All</gui>, but if he just wants to tell Susan that he agrees with her, he uses <gui>Reply</gui>. His reply does not reach anyone that Susan put on her Bcc list, because that list is not shared with anyone.</p>
+<p>If you subscribe to a mailing list, and want your reply to go just to the list rather than to the sender, select <gui>Reply to List</gui> instead of <gui>Reply</gui> or <gui>Reply to All</gui>.</p>
+</section>
+
+<section id="keyboard-shortcuts">
+<title>Keyboard shortcuts</title>
+<table frame="all" rules="all">
+ <tr>
+  <td><p>Action</p></td><td><p>Shortcut keys</p></td>
+ </tr><tr>
+  <td><p>Reply to Sender</p></td><td><p><keyseq><key>Ctrl</key><key>R</key></keyseq></p></td>
+ </tr><tr>
+  <td><p>Reply to Mailing List</p></td><td><p><keyseq><key>Ctrl</key><key>L</key></keyseq></p></td>
+ </tr><tr>
+  <td><p>Reply to All</p></td><td><p><keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq></p></td>
+ </tr>
+</table>
+</section>
+
+<section id="default-settings">
+<title>Default settings</title>
+<p>The default settings for replying and forwarding can be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>General</gui><gui>Replies and Forwards</gui><gui>Forward style</gui></guiseq>.</p>
+</section>
+
+</page>
+
diff --git a/help/C/mail-composer-search.page b/help/C/mail-composer-search.page
new file mode 100644
index 0000000000..4e1d87da6b
--- /dev/null
+++ b/help/C/mail-composer-search.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-search">
+
+  <info>
+    <desc>Searching for text in the mail composer.</desc>
+    
+    <link type="guide" xref="index#mail-composing" />
+    <link type="guide" xref="searching-items" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Searching in the mail composer</title>
+
+<p>Under the <gui>Edit</gui> menu in the message composer there are several text searching features available.</p>
+
+<list>
+<item><p><gui>Find</gui>:
+</p><p>
+Enter a word or phrase, and Evolution finds it in your message.</p></item>
+
+<item><p><gui>Find Again</gui>:
+</p><p>
+Select this item to repeat the last search you performed.</p></item>
+
+<item><p><gui>Replace</gui>:
+</p><p>
+Find a word or phrase, and replace it with something else.</p></item>
+</list>
+
+<p>For all of these menu items you can choose whether to search backwards in the document from the point where your cursor is. You can also determine whether the search is to be case sensitive in determining a match</p>
+<p>If you have a technical background you can also select the option to use <link href="https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression">Regular expressions</link> for searching.</p>
+
+</page>
diff --git a/help/C/mail-composer-several-recipients.page b/help/C/mail-composer-several-recipients.page
new file mode 100644
index 0000000000..9c3bc29105
--- /dev/null
+++ b/help/C/mail-composer-several-recipients.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-several-recipients">
+
+  <info>
+    <desc>Sending to more than one person and using CC or BCC.</desc>
+    
+    <link type="guide" xref="index#mail-composing" />
+    <link type="seealso" xref="mail-composer-reply" />
+    <link type="seealso" xref="mail-composer-forward" />
+    <link type="seealso" xref="mail-composer-write-new-message" />
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-to-types and http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-to -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Sending a message to several recipients</title>
+
+<p>To send a message to more than one person, enter the addresses in the composer by seperating them with commas or semicolons.</p>
+
+<section id="to-cc-bcc-meaning">
+<title>Recipient types</title>
+<p>Email messages can have three different types of recipients. The simplest way is to put the email address or addresses in the <gui>To:</gui> text field. The <gui>Cc:</gui> text field is used for recipients that are meant to receive a copy of your message but are not the primary recipients.</p>
+
+<p>Addresses in the <gui>Bcc:</gui> text field are hidden from the other recipients of the message. It can be used to send mail to large groups of people, especially if they do not know each other or if privacy is a concern. If the <gui>Bcc:</gui> text field is not shown, click <guiseq><gui>View</gui><gui>Bcc Field</gui></guiseq>.</p>
+</section>
+
+<section id="autocompletion">
+<title>Autocompletion</title>
+<p>It is recommended to use the <link xref="contacts-autocompletion">Autocompletion</link> feature of the Evolution address book for entering addresses. By using this you avoid typos and save time.</p>
+</section>
+
+<section id="to-cc-bcc-buttons">
+<title>Using the buttons</title>
+
+<p>Instead of typing the recipients' names you can also click the <gui style="button">To:</gui>, <gui style="button">Cc:</gui>, or <gui style="button">Bcc:</gui> buttons to get a list of the email addresses in your address books. Select the addresses and click the arrow buttons to move them into the appropriate address columns (To:, Cc:, Bcc:).</p>
+</section>
+
+<note><p>If you frequently write email to the same groups of people, you can create <link xref="contacts-using-contact-lists">contact lists</link> to send them mail as though they have a single address.</p></note>
+
+</page>
+
diff --git a/help/C/mail-composer-spellcheck.page b/help/C/mail-composer-spellcheck.page
new file mode 100644
index 0000000000..0e344a391b
--- /dev/null
+++ b/help/C/mail-composer-spellcheck.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-spellcheck">
+
+  <info>
+    <desc>On spell checking your mail in the composer.</desc>
+    
+    <link type="guide" xref="index#mail-composing" />
+
+    <revision pkgversion="3.0.2" version="0.3" date="2011-07-29" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Spell checking</title>
+
+<!-- Instructions are only valid from Evolution 2.24 on -->
+
+<section id="required-packages">
+<title>Prerequirements</title>
+<p>To use spell checking for the emails that you write you first need to make sure that the <em>hunspell</em> package for your specific language and the <em>enchant</em> package are installed via the software management tool of your distribution.</p>
+<p><link action="install:hunspell" href="http://hunspell.sourceforge.net/">Install hunspell now.</link></p>
+<p><link action="install:enchant" href="http://www.abisource.com/projects/enchant/">Install enchant now.</link></p>
+</section>
+
+<section id="global-preferences">
+<title>Global Preferences</title>
+
+<p>Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Spell Checking</gui><gui>Options</gui></guiseq> you can define whether your spelling is checked while you type and which color is used for underlining words that are misspelled.</p>
+
+<p>You can also define which installed languages are used for spell checking in the list available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Spell Checking</gui><gui>Languages</gui></guiseq>.</p>
+</section>
+
+<section id="composer">
+<title>Manual spell checking in the composer</title>
+<p>If you do not have <gui>Checking spelling while I type</gui> enabled in the <link xref="#global-preferences">Composer Preferences</link> you can run a spell check in the email composer by clicking <guiseq><gui>Edit</gui><gui>Spell Checking</gui></guiseq> or by pressing <key>F7</key>.</p>
+</section>
+
+</page>
diff --git a/help/C/mail-composer-write-new-message.page b/help/C/mail-composer-write-new-message.page
new file mode 100644
index 0000000000..8c8746febc
--- /dev/null
+++ b/help/C/mail-composer-write-new-message.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-composer-write-new-message">
+
+  <info>
+    <desc>Writing a new email to send to a recipient.</desc>
+    
+    <link type="guide" xref="index#mail-composing" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Composing a new message</title>
+
+<p>You can start writing a new email message by clicking <guiseq><gui>File</gui><gui>New</gui><gui>Mail Message</gui></guiseq>, by pressing <keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq>, or by clicking <gui>New</gui> in the toolbar.</p>
+
+<p>Enter an email address in the <gui>To:</gui> field. If you want to enter multiple addresses, separate them by commas. See <link xref="mail-composer-several-recipients"></link> for more information on sending messages to more than one person.</p>
+
+<p>After you have written your message, click <gui>Send</gui> or press <keyseq><key>Ctrl</key><key>Return</key></keyseq>.</p>
+</page>
+
diff --git a/help/C/mail-default-CC-and-BCC.page b/help/C/mail-default-CC-and-BCC.page
new file mode 100644
index 0000000000..9eb4bc7cd7
--- /dev/null
+++ b/help/C/mail-default-CC-and-BCC.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-default-CC-and-BCC">
+
+  <info>
+    <desc>Make somebody always receive copies of your sent mail.</desc>
+
+    <link type="guide" xref="mail-account-manage-imap#defaults"/>
+    <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
+    <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
+    <link type="guide" xref="mail-account-manage-maildir-format-directories#defaults"/>
+    <link type="guide" xref="mail-account-manage-mh-format-directories#defaults"/>
+    <link type="guide" xref="mail-account-manage-pop#defaults"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#defaults"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#defaults"/>
+    <link type="guide" xref="mail-account-manage-usenet-news#defaults"/>
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Default CC and BCC</title>
+
+<p>You can set email addresses that should always receive copies of your sent mail (either as CC visible for all recipients, or BCC not visible for other recipients) in the <gui>Defaults</gui> section of the mail account editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui></guiseq>).</p>
+
+
+</page>
diff --git a/help/C/mail-default-folder-locations.page b/help/C/mail-default-folder-locations.page
new file mode 100644
index 0000000000..675ede3b8a
--- /dev/null
+++ b/help/C/mail-default-folder-locations.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-default-folder-locations">
+
+  <info>
+    <desc>Changing the location of the Draft folder and Sent folder.</desc>
+
+    <link type="guide" xref="mail-account-manage-imap#defaults"/>
+    <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
+    <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
+    <link type="guide" xref="mail-account-manage-maildir-format-directories#defaults"/>
+    <link type="guide" xref="mail-account-manage-mh-format-directories#defaults"/>
+    <link type="guide" xref="mail-account-manage-pop#defaults"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#defaults"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#defaults"/>
+    <link type="guide" xref="mail-account-manage-usenet-news#defaults"/>
+    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#defaults"/>
+    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#defaults"/>
+    <link type="guide" xref="mail-account-manage-novell-groupwise#defaults"/>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Mail folder locations</title>
+
+<p>You can set a different place where to store messages in your Draft folder and Sent folder in the <gui>Defaults</gui> section of the mail account editor (<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui></guiseq>).</p>
+<p>For remote account types (accounts such as IMAP) you can also set a Trash folder and Junk folder on the mail server so Evolution's local virtual folders will not be used for it, but folders on the mail server.</p>
+
+</page>
diff --git a/help/C/mail-delete-and-undelete.page b/help/C/mail-delete-and-undelete.page
new file mode 100644
index 0000000000..a21fdb32af
--- /dev/null
+++ b/help/C/mail-delete-and-undelete.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-delete-and-undelete">
+
+  <info>
+    <desc>Deleting, expunging, and undeleting mail.</desc>
+
+    <link type="guide" xref="index#mail-basic" />
+    <link type="seealso" xref="mail-moving-emails" />
+    <link type="seealso" xref="deleting-emails" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-delete and http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-undelete -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Deleting and undeleting messages</title>
+
+<section id="delete">
+<title>Deleting Messages</title>
+
+<p>To delete a message, select it and press the <key>Delete</key> key, or click the <gui style="button">Delete</gui> button in the toolbar, or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or right-click the message and click <gui>Delete</gui>.</p>
+
+<p>When you press Delete or click the Trash folder, your mail is not actually deleted, but is marked for deletion. You can see all message marked for deletion in the Trash folder. To show deleted messages, click <guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq>. You can view the messages striken off for later deletion.</p>
+
+<p>To permanently erase all the deleted messages in a folder, click <guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>.</p>
+</section>
+
+<section id="undelete">
+<title>Undeleting Messages</title>
+
+<p>You can undelete a message that has been deleted but not expunged yet. To undelete a message, select the message, click <guiseq><gui>Edit</gui><gui>Undelete message</gui></guiseq>. Note that <guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq> must be enabled for this.</p>
+
+<p>If you have marked a message for deletion, undeleting it unmarks it, and the message is not shown anymore in the Trash folder.</p>
+</section>
+
+</page>
diff --git a/help/C/mail-displaying-character-encodings.page b/help/C/mail-displaying-character-encodings.page
new file mode 100644
index 0000000000..56330b8f90
--- /dev/null
+++ b/help/C/mail-displaying-character-encodings.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-displaying-character-encodings">
+
+  <info>
+    <desc>When characters in an email are not shown correctly or missing.</desc>
+
+    <link type="guide" xref="mail-displaying-message" />
+
+    <revision pkgversion="3.0.2" version="0.3" date="2011-08-02" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Character Encodings and Sets</title>
+
+<!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=655021 is fixed -->
+
+<p>If the email program of the sender is broken or misconfigured, plain text emails might not include information about the character encoding used. If you receive such messages, choose <guiseq><gui>View</gui><gui>Character Encoding</gui></guiseq> from the main menu and change the currently chosen character encoding to an appropriate one that might be the encoding used by the sender. You have to make this change every time you view the message.</p>
+<p>To constantly change this setting, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</gui><gui>Message Display</gui><gui>Default character encoding</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/mail-displaying-collapsible-headers.page b/help/C/mail-displaying-collapsible-headers.page
new file mode 100644
index 0000000000..59ae299ec5
--- /dev/null
+++ b/help/C/mail-displaying-collapsible-headers.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-displaying-collapsible-headers">
+
+  <info>
+    <desc>Display less email recipients of a specific message.</desc>
+
+    <link type="guide" xref="mail-displaying-message" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#b131oj36 though the setting itself has been removed in 3.1 -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Collapsible Message Headers</title>
+
+<p>Evolution compresses the To, Cc and Bcc headers of received mail and shows only five addresses in the message preview.</p>
+
+<p>To see all recipients, click the <media type="image" src="./figures/plus-icon.png"></media> icon next to the <gui>To:</gui> or <gui>Cc:</gui> line, or click the ellipsis (...) at the end of the five displayed addresses.</p>
+
+<p>To collapse all of the message headers and just display the subject and sender in one line, click the icon <media type="image" src="./figures/minus-icon.png"></media> next to the <gui>From:</gui> line. This is helpful on small screens.</p>
+ 
+</page>
diff --git a/help/C/mail-displaying-images-in-html.page b/help/C/mail-displaying-images-in-html.page
new file mode 100644
index 0000000000..d911c523bd
--- /dev/null
+++ b/help/C/mail-displaying-images-in-html.page
@@ -0,0 +1,55 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-displaying-images-in-html">
+
+  <info>
+    <desc>On embedded pictures in received HTML messages.</desc>
+
+    <link type="guide" xref="mail-displaying-message" />
+    <link type="seealso" xref="mail-downloading-images" />
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-31" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-get-attach-html -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Images in HTML messages</title>
+
+<p>When someone sends you HTML mail that includes an image in the body of the message (for example, the welcome message in your Inbox), Evolution displays the image inside the message.</p>
+
+<section id="loading">
+<title>Loading images</title>
+<p>Some images are links in a message, rather than being part of the message. Evolution can download those images from the Internet, but does not do so unless you request it. This is because remotely hosted images can be slow to load and display, and can even be used by spammers to track who reads the email. Not automatically loading images helps protect your privacy.</p>
+
+<p>To load the images for one message, click <guiseq><gui>View</gui><gui>Load Images</gui></guiseq> or press <keyseq><key>Ctrl</key><key>I</key></keyseq>.</p>
+
+<p>To set the default action for loading images, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>HTML Messages</gui><gui>Loading Images</gui></guiseq>.</p>
+</section>
+
+<section id="automatically-download">
+<title>Automatically download images in emails from people you know</title>
+
+<p>You can download images from emails sent by your contacts. To do this, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>HTML Messages</gui><gui>Loading Images</gui></guiseq>. Enable the <gui>Load images only in messages from contacts</gui> option.</p>
+
+<p>Next, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq>. Enable autocompletion by ticking the <gui>Always show address of the autocompleted contact</gui> checkbox.</p>
+</section>
+
+<section id="saving">
+<title>Saving images</title>
+<p>You currently cannot save images to disk that are embedded in HTML emails.</p>
+<!-- TODO: Fix once https://bugzilla.gnome.org/show_bug.cgi?id=655669 is fixed -->
+</section>
+
+</page>
diff --git a/help/C/mail-displaying-message.page b/help/C/mail-displaying-message.page
new file mode 100644
index 0000000000..02b35626cd
--- /dev/null
+++ b/help/C/mail-displaying-message.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-displaying-message">
+
+  <info>
+    <desc>Rendering an email and handling its attachments.</desc>
+
+    <link type="guide" xref="index#mail-basic" />
+
+    <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Display of a message</title>
+
+</page>
diff --git a/help/C/mail-displaying-no-css.page b/help/C/mail-displaying-no-css.page
new file mode 100644
index 0000000000..10be900797
--- /dev/null
+++ b/help/C/mail-displaying-no-css.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-displaying-no-css">
+
+  <info>
+    <desc>When a received message looks weird or is hard to read.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+    <link type="seealso" xref="mail-displaying-message" />
+
+    <revision pkgversion="3.2.0" version="0.1" date="2011-07-25" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>HTML emails are not correctly displayed</title>
+
+<p>If an HTML message is not correctly displayed in Evolution it might be that the formatting of the message is specified as <link href="http://en.wikipedia.org/wiki/Cascading_Style_Sheets">CSS</link>. CSS is currently not supported by gtkhtml (the part that is used to display HTML).</p>
+<p>This will likely be fixed in version 3.2 or 3.4.</p>
+<p>For developers only: In future versions, Evolution will use WebKit instead of gtkhtml for displaying HTML. There is a branch named "<link href="http://git.gnome.org/browse/evolution?h=webkit">webkit</link>" in Evolution's code repository to test.</p>
+
+<note style="tip"><p>For missing characters in emails, see <link xref="mail-displaying-character-encodings">Character Encodings and Sets</link>.</p></note>
+
+</page>
diff --git a/help/C/mail-displaying-sender-photograph.page b/help/C/mail-displaying-sender-photograph.page
new file mode 100644
index 0000000000..e709585bf0
--- /dev/null
+++ b/help/C/mail-displaying-sender-photograph.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-displaying-sender-photograph">
+
+  <info>
+    <desc>Display a picture of the sender in the message header area.</desc>
+
+    <link type="guide" xref="mail-displaying-message" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-mail.html.en#mail-prefs-headers -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Photograph Message Headers</title>
+
+<!-- TODO: Check and describe whether this requires enabling <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>Face</gui></guiseq>! -->
+ 
+<p>The photograph of the sender of an email can be shown at the right side of the message preview if the sender is in one of your address books and has a photograph.</p>
+
+<p>To enable this functionality, select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Headers</gui><gui>Show the photograph of sender in the message preview</gui></guiseq>.</p>
+
+<p>By default only local address books are used for searching the photograph as accessing remote address books can cause delays. You can disable this by deselecting the option <gui>Search for sender photograph only in local address books</gui>.</p>
+
+<p>If there are multiple matches for a contact, the first one is always used.</p>
+</page>
diff --git a/help/C/mail-duplicates.page b/help/C/mail-duplicates.page
new file mode 100644
index 0000000000..88a537081d
--- /dev/null
+++ b/help/C/mail-duplicates.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-duplicates">
+
+  <info>
+    <desc>How to handle duplicated email messages</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="3.0.2" version="0.4" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Duplicate emails get downloaded</title>
+
+<section id="remove">
+<title>Removing duplicate emails</title>
+<p>To remove duplicate emails in a folder, click <guiseq><gui>Message</gui><gui>Remove Duplicate Messages</gui></guiseq>.</p>
+<!-- available by default since 2.91, as per http://mail.gnome.org/archives/evolution-list/2011-August/msg00000.html -->
+</section>
+
+<section id="reasons">
+<title>Reasons</title>
+<p>Downloading duplicate emails may be due to one of the following reasons:</p>
+<list>
+<item><p>There are several copies of the same message in the mailbox</p></item>
+<item><p>Evolution is having a problem with the UIDL extension.</p></item>
+<item><p>The cache files located at <file>$HOME/.local/share/evolution/mail/pop/</file> are not writable.</p></item>
+</list>
+</section>
+
+</page>
+
diff --git a/help/C/mail-encryption-gpg-create-key.page b/help/C/mail-encryption-gpg-create-key.page
new file mode 100644
index 0000000000..a99004abc5
--- /dev/null
+++ b/help/C/mail-encryption-gpg-create-key.page
@@ -0,0 +1,53 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-encryption-gpg-create-key">
+
+  <info>
+    <desc>Signing or encrypting messages via GPG that you send.</desc>
+
+    <link type="guide" xref="mail-encryption#gpg"/>
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#encryption-keygen -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Creating a GPG key</title>
+
+<note>These steps are very technical. For average users we nowadays recommend using the Seahorse application for managing GPG keys.</note>
+<!-- TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
+
+<p>Before you can get or send GPG encrypted mail, you need to generate your public and private keys with GPG.</p>
+<steps>
+<item><p>Open a terminal window and enter <code>gpg --gen-key</code>.</p></item>
+<item><p>Select an algorithm, then press Enter.</p></item>
+<item><p>Select a key length, then press Enter.</p></item>
+<item><p>Enter how long your key should be valid for.</p></item>
+<item><p>Type your real name, then press Enter.</p></item>
+<item><p>Type your email address, then press Enter.</p></item>
+<item><p>(Optional) Type a comment, then press Enter.</p></item>
+<item><p>Review your selected user ID. If it is correct, press O.</p></item>
+<item><p>Type a passphrase, then press Enter.</p></item>
+<item><p>Move your mouse randomly to generate the keys.</p></item>
+</steps>
+
+<p>After the keys are generated, you can view your key information by entering <code>gpg --list-keys</code>. You should see something similar to this:  <code> /home/you/.gnupg/pubring.gpg ----------------------------  pub 1024D/32j38dk2 2001-06-20 you &lt;you@example.com&gt;  sub 1024g/289sklj3 2011-06-20 [expires: 2012-11-14]</code></p>
+<p>GPG creates one list, or keyring, for your public keys and one for your private keys. All the public keys you know are stored in the file <file>~/.gnupg/pubring.gpg</file>. If you want to give other people your key, send them that file.</p>
+<p>If you want, you can upload your keys to a key server:</p>
+<steps>
+<item><p>Check your public key ID with <code>gpg --list-keys</code>. It is the string after <code>1024D</code> on the line beginning with <code>pub</code>. In the example above, it is <code>32j38dk2</code>.</p></item>
+<item><p>Enter the command <code>gpg --send-keys --keyserver wwwkeys.pgp.net <varname>32j38dk2</varname></code>. Substitute your key ID for <quote>32j38dk2</quote>. You need your password to do this.</p></item>
+</steps>
+
+<p>Key servers store your public keys for you so that your friends can decrypt your messages. If you choose not to use a key server, you can manually send your public key, include it in your signature file, or put it on your own Web page. However, it is easier to publish a key once, and then let people download it from a central place when they want.</p>
+<p>If you don't have a key to unlock or encrypt a message, you can set your encryption tool to look it up automatically. If it cannot find the key, an error message appears.</p>
+
+</page>
diff --git a/help/C/mail-encryption-gpg-decrypting.page b/help/C/mail-encryption-gpg-decrypting.page
new file mode 100644
index 0000000000..f5649e6be7
--- /dev/null
+++ b/help/C/mail-encryption-gpg-decrypting.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-encryption-gpg-decrypting">
+
+  <info>
+    <desc>Decrypting and checking the signature of received GPG messages.</desc>
+
+    <link type="guide" xref="mail-encryption#gpg"/>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#unencrypting -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Receiving messages encrypted or signed via GPG</title>
+
+<section id="decryption">
+<title>Decrypting a received message</title>
+<p>If you receive an encrypted message, you need to decrypt it before you can read it.</p>
+<p>When you view the message, Evolution prompts you for your PGP password. Enter it, and the unencrypted message is displayed.</p>
+<note style="tip"><p>Senders must have your GPG public key before they can send you an encrypted message.</p></note>
+</section>
+
+<section id="signature">
+<title>Checking the signature of a received message</title>
+<p>To check the sender's signature of a received message, scroll down to the bottom of the message and click the logo. Evolution will display <gui>Security Information</gui> for the message.</p>
+</section>
+</page>
diff --git a/help/C/mail-encryption-gpg-getting-keys.page b/help/C/mail-encryption-gpg-getting-keys.page
new file mode 100644
index 0000000000..9613fca391
--- /dev/null
+++ b/help/C/mail-encryption-gpg-getting-keys.page
@@ -0,0 +1,31 @@
+ <page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-encryption-gpg-getting-keys">
+
+  <info>
+    <desc>Getting and Using GPG Public Keys.</desc>
+
+    <link type="guide" xref="mail-encryption#gpg"/>
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#encrypt-getting-key -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Getting and using GPG public keys</title>
+<!-- TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
+
+<p>To send an encrypted message, you need to use the recipient's public key in combination with your private key. Evolution handles the encryption, but you need to get the public key and add it to your keyring.</p>
+
+<p>To get public keys from a public key server, enter the command <code>gpg --recv-keys --keyserver wwwkeys.pgp.net keyid</code>, substituting <code>keyid</code> by your recipient's ID. You need to enter your password, and the ID is automatically added to your keyring.</p>
+
+<p>If someone sends you a public key directly, save it as a plain text file and enter the command <code>gpg --import</code> to add it to your keyring.</p>
+</page>
diff --git a/help/C/mail-encryption-gpg-set-up.page b/help/C/mail-encryption-gpg-set-up.page
new file mode 100644
index 0000000000..d1bc94b51a
--- /dev/null
+++ b/help/C/mail-encryption-gpg-set-up.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-encryption-gpg-set-up">
+
+  <info>
+    <desc>Setting up GPG for your mail account to sign and/or encrypt and decrypt messages.</desc>
+
+    <link type="guide" xref="mail-encryption#gpg"/>
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#encrypt-evo-integ -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Setting up GPG for your mail account</title>
+<!-- TODO:POST-3-2: Update and rewrite using Seahorse. Needs a complete rewrite once https://bugzilla.gnome.org/show_bug.cgi?id=508744 is fixed. -->
+
+<note style="tip"><p>You need a GPG key to do this. If you do not have one yet, please refer to <link xref="mail-encryption-gpg-create-key">Creating a GPG key</link>.</p></note>
+
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>.</p></item>
+<item><p>Select the account you want to use securely, then click <gui style="button">Edit</gui>.</p></item>
+<item><p>Click the <gui>Security</gui> tab.</p></item>
+<item><p>Specify your key ID in the <gui>PGP/GPG Key ID</gui> field.</p></item>
+<note style="tip"><p>Below the field you can choose whether to always sign outgoing messages when using this account, and other options.</p></note>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+<item><p>Click <gui style="button">Close</gui>.</p></item>
+</steps>
+<p>Evolution requires that you know your key ID. If you do not remember it, you can find it by typing <code>gpg --list-keys</code> in a terminal window. Your key ID is an eight-character string with random numbers and letters.</p>
+
+</page>
diff --git a/help/C/mail-encryption-gpg-signing-encrypting.page b/help/C/mail-encryption-gpg-signing-encrypting.page
new file mode 100644
index 0000000000..1df689603b
--- /dev/null
+++ b/help/C/mail-encryption-gpg-signing-encrypting.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-encryption-gpg-signing-encrypting">
+
+  <info>
+    <desc>Signing or encrypting messages via GPG that you send.</desc>
+
+    <link type="guide" xref="mail-encryption#gpg"/>
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#bspya9p -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Signing or encrypting messages</title>
+
+<p>After you have <link xref="mail-encryption-gpg-set-up">set up your GPG key</link>, you can sign or encrypt a message by clicking <guiseq><gui>Options</gui><gui>PGP Sign</gui></guiseq> or <gui>PGP Encrypt</gui> from the message composer menu.</p>
+<note style="tip"><p>The Subject line of the message will not be encrypted and should not be used for sensitive information.</p></note>
+
+<p>To have every message signed or encrypted:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>.</p></item>
+<item><p>Select the mail account to encrypt the messages in.</p></item>
+<item><p>Click <gui style="button">Edit</gui>.</p></item>
+<item><p>Click <gui>Security</gui>.</p></item>
+<item><p>Select <gui>Always sign outgoing messages when using this account</gui>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+<item><p>Click <gui style="button">Close</gui>.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/mail-encryption-s-mime-manage.page b/help/C/mail-encryption-s-mime-manage.page
new file mode 100644
index 0000000000..f146fb78fd
--- /dev/null
+++ b/help/C/mail-encryption-s-mime-manage.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-encryption-s-mime-manage">
+
+  <info>
+    <desc>Adding, editing, viewing and deleting S/MIME certificates.</desc>
+
+    <link type="guide" xref="mail-encryption#s-mime"/>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bshoty0.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Managing S/MIME certificates</title>
+
+<p>Certificates allow you to communicate with others securely over an encrypted connection, or sign a message confirming your identity to the contact. These settings only apply to S/MIME encryption.</p>
+<p>You can import, view, edit (except for your own certificates), and delete your certificates under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Certificates</gui></guiseq>.</p>
+<p><gui>Your Certificates</gui> displays a list of certificates that you own. To add a signing certificate, click <gui style="button">Import</gui>, select the file to import, then click <gui style="button">Open</gui> and enter a password.</p>
+<p><gui>Contact Certificates</gui> displays a list of certificates that you have for contacts. These certificates allow you to decrypt messages as well verify signed messages.</p>
+<p><gui>Authorities</gui> displays a list of trusted certificate authorities who verify that your own certificate is valid.</p>
+</page>
diff --git a/help/C/mail-encryption-s-mime-signing-encrypting.page b/help/C/mail-encryption-s-mime-signing-encrypting.page
new file mode 100644
index 0000000000..a976bb8ac2
--- /dev/null
+++ b/help/C/mail-encryption-s-mime-signing-encrypting.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-encryption-s-mime-signing-encrypting">
+
+  <info>
+    <desc>Signing or encrypting messages via S/MIME that you send.</desc>
+
+    <link type="guide" xref="mail-encryption#s-mime"/>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/encryption.html.en#bsqbdkv -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Signing or encrypting messages</title>
+
+<p>After you have <link xref="mail-encryption-s-mime-manage">added your certificate</link>, you can sign or encrypt a message by clicking <guiseq><gui>Options</gui><gui>S/MIME Sign</gui></guiseq> or <gui>S/MIME Encrypt</gui> from the message composer menu.</p>
+<p>To have every message signed or encrypted:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>.</p></item>
+<item><p>Select the mail account to encrypt the messages in.</p></item>
+<item><p>Click <gui style="button">Edit</gui>.</p></item>
+<item><p>Click <gui>Security</gui>.</p></item>
+<item><p>In the <gui>Secure MIME (S/MIME)</gui> section, click <gui style="button">Select</gui> next to <gui>Signing Certificate</gui> and specify the path to your signing certificate, or click <gui style="button">Select</gui> next to <gui>Encryption Certificate</gui> and specify the path to your encryption certificate.</p></item>
+<item><p>Select the appropriate options.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+<note style="tip"><p>The Subject line of the message will not be encrypted and should not be used for sensitive information.</p></note>
+</page>
diff --git a/help/C/mail-encryption.page b/help/C/mail-encryption.page
new file mode 100644
index 0000000000..65d8b33681
--- /dev/null
+++ b/help/C/mail-encryption.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-encryption">
+
+  <info>
+    <desc>Sending and receiving encrypted mail.</desc>
+
+    <link type="guide" xref="index#mail-advanced"/>
+    <link type="guide" xref="mail-account-manage-imap#security"/>
+    <link type="guide" xref="mail-account-manage-imap-plus#security"/>
+    <link type="guide" xref="mail-account-manage-local-delivery#security"/>
+    <link type="guide" xref="mail-account-manage-maildir-format-directories#security"/>
+    <link type="guide" xref="mail-account-manage-mh-format-directories#security"/>
+    <link type="guide" xref="mail-account-manage-microsoft-exchange#security"/>
+    <link type="guide" xref="mail-account-manage-novell-groupwise#security"/>
+    <link type="guide" xref="mail-account-manage-pop#security"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#security"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#security"/>
+    <link type="guide" xref="mail-account-manage-usenet-news#security"/>
+    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#security"/>
+    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#security"/>
+
+    <revision pkgversion="2.32.1" version="0.3" date="2011-01-06" status="candidate"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Mail encryption and certificates</title>
+
+<p>Evolution offers GPG Encryption and S/MIME Encryption for signing and encrypting email messages. S/MIME is used most often in corporate environments.</p>
+
+  <section id="gpg" style="2column">
+    <title>GPG</title>
+  </section>
+
+  <section id="s-mime" style="2column">
+    <title>S/MIME</title>
+  </section>
+
+</page>
diff --git a/help/C/mail-error-failed-to-append-to-sent-folder.page b/help/C/mail-error-failed-to-append-to-sent-folder.page
new file mode 100644
index 0000000000..7cc5923c38
--- /dev/null
+++ b/help/C/mail-error-failed-to-append-to-sent-folder.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-error-failed-to-append-to-sent-folder">
+
+  <info>
+    <desc>What to do when this error is shown.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-21" status="final"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Error message "Failed to append to..." after sending message</title>
+
+<p>If the error message "Your message was sent, but an error occurred during post-processing. The reported error was "Failed to append to mbox:///home/user/.local/share/evolution/mail/local#Sent: Cannot get folder 'Sent': folder does not exist. Appending to local 'Sent' folder instead."." is shown, you can fix the problem by editing your default folder settings under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui><gui>Folder for sent messages</gui></guiseq>.</p>
+<p>This bug is fixed in Evolution versions higher than 3.0.2 (stable series) and 3.1.3 (unstable development series). If this is not the case, please add a comment to the corresponding <link href="https://bugzilla.gnome.org/show_bug.cgi?id=638307">bug report</link>.</p>
+
+
+
+</page>
+
diff --git a/help/C/mail-error-folder-mismatch.page b/help/C/mail-error-folder-mismatch.page
new file mode 100644
index 0000000000..8154e4b20a
--- /dev/null
+++ b/help/C/mail-error-folder-mismatch.page
@@ -0,0 +1,52 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-error-folder-mismatch">
+
+  <info>
+    <desc>What to do when this error is shown.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="3.1.5" version="0.4" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Error message "Summary and folder mismatch" after synchronizing folders</title>
+
+<p>If the error message: <gui>Error while Expunging folder. Error storing `~/.local/share/evolution/mail/local/Inbox (mbox)': Summary and folder mismatch, even after a sync.</gui> pops up, perform the following steps:</p>
+
+<note><p>These steps apply to the versions 3.0 and 3.2. Note that Evolution's file locations in 2.30 and 2.32 are different (<file>~/.evolution/mail/local/</file> instead of <file>~/.local/share/evolution/mail/local/</file>).</p></note>
+
+<list>
+<item><p>Open the Terminal application (category <gui>System Tools</gui>) and type in the command <code>evolution --force-shutdown</code>. This command stops Evolution and all the processes related to it.</p></item>
+<item><p>Remove the files ending in:</p>
+ <list>
+  <item><p><file>.ev-summary</file></p></item>
+  <item><p><file>.ibex.index</file></p></item>
+ </list>
+ <p>To do this, navigate to the hidden directory <file>~/.local/share/evolution/mail/local/</file> and locate the specified files. You can do this in the GNOME File Manager (Nautilus) by either showing hidden files, or by entering the directory via <guiseq><gui>Go</gui><gui>Location...</gui></guiseq> from the menu bar.</p>
+</item>
+
+<item><p>Restart Evolution. Note that restarting the application may take some time since it will need to rebuild the indexes deleted in the previous step.</p></item>
+</list>
+
+<note>
+<p>You may lose your mail labels when performing this operation.</p>
+</note>
+
+<note>
+<p>This problem is expected to be fixed in version 3.0 according to the corresponding <link href="https://bugzilla.gnome.org/show_bug.cgi?id=550414">bug report</link>. Please add a comment if this is not the case.</p> <!-- TODO:POST-3-2: Remove from docs once really fixed -->
+</note>
+
+</page>
+
diff --git a/help/C/mail-error-no-provider-available.page b/help/C/mail-error-no-provider-available.page
new file mode 100644
index 0000000000..308a5ff6fb
--- /dev/null
+++ b/help/C/mail-error-no-provider-available.page
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-error-no-provider-available">
+
+  <info>
+    <desc>What to do when this error is shown.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="2.28.3" version="0.2" date="2010-12-08" status="review"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Error message "No provider available for protocol email"</title>
+
+<p>This error message may be displayed for a number of reasons:</p>
+<list>
+
+<item>
+<p>The filters used do not match the account they are associated with.</p>
+<p>This happens when the <file>filters.xml</file> file is copied and used on a fresh install of Evolution on a new machine.</p>
+<p>Accounts have unique ID numbers, and filters refer to these accounts directly. Simply copying the <file>filters.xml</file> file will cause a version mismatch with Evolution, affecting the filter rules.</p>
+
+</item>
+<item><p>The account settings may not have been copied properly.</p></item>
+<item><p>The account settings were modified.</p></item>
+</list>
+
+<p>To fix this problem, edit the email filters and re-select the folder for each Copy/Move filter. To do this:</p>
+<steps>
+<item><p>Go to <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>.</p></item>
+<item><p>Select the Copy/Move filter and click <gui>Edit</gui>.</p></item>
+<item><p>Refer to the list of folders associated with that particular filter. Click on the button that allows you to modify the folders assigned for that filter. Set the folders again. </p></item>
+</steps>
+
+<note>
+<p>Advanced users may also be interested in this write up: <link href="https://thomas.apestaart.org/thomas/trac/wiki/Evolution">How to keep the Evolution filters in sync on multiple machines by Thomas Vander Stichele </link>
+</p>
+</note>
+
+<!-- The guide referenced above might make a useful addition to the docs. We should consider asking Thomas for permission to include it, if it seems suitable. -->
+
+</page>
diff --git a/help/C/mail-filters-actions.page b/help/C/mail-filters-actions.page
new file mode 100644
index 0000000000..2c8fccd8cc
--- /dev/null
+++ b/help/C/mail-filters-actions.page
@@ -0,0 +1,72 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-filters-actions">
+
+  <info>
+    <desc>Available actions for setting up filtering.</desc>
+
+    <link type="seealso" xref="mail-filters"/>
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-filters.html.en#usage-mail-org-filters-new -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+    
+  </info>
+
+  <title>Available Filter conditions</title>
+
+<list>
+<item><p>Move to Folder:</p>
+<p>Moves the message into a folder you specify.</p></item>
+
+<item><p>Copy to Folder:</p>
+<p>Puts a copy of the message into a folder you specify.</p></item>
+
+<item><p>Delete:</p>
+<p>Marks the message for deletion. The message can be undeleted until you expunge or empty the trash.</p></item>
+
+<item><p>Stop Processing:</p>
+<p>Select this if you want to all other filters ignore this message. Note that only filters listed after this particular rule will be ignored.</p></item>
+
+<item><p>Set Label:</p>
+<p>Adds a label to a message.</p></item>
+
+<item><p>Assign Color:</p>
+<p>Marks the message with a color of your choice.</p></item>
+
+<item><p>Assign Score:</p>
+<p>Assigns the message a numeric score.</p></item>
+
+<item><p>Adjust Score:</p>
+<p>Changes the numeric score by the amount you set.</p></item>
+
+<item><p>Set Status:</p>
+<p>Sets the status of the message. The status can be Replied To, Draft, Important, Read, or Junk.</p></item>
+
+<item><p>Unset Status:</p>
+<p>If the message has a status value, unsets it. If a status value is not set, it does nothing.</p></item>
+
+<item><p>Beep:</p>
+<p>Makes the system beep.</p></item>
+
+<item><p>Play Sound:</p>
+<p>Select a sound file for Evolution to play.</p></item>
+
+<item><p>Run Program:</p>
+<p>Evolution runs an application.</p></item>
+
+<item><p>Pipe to Program:</p>
+<p>Sends the message to a program of your choice. No return value is expected. This feature can be used to create automatic Web postings from email messages or to perform additional message post processing not supported by Evolution.</p></item>
+
+<item><p>Forward to:</p>
+<p>Forwards the message to another email address.</p></item>
+
+</list>
+</page>
diff --git a/help/C/mail-filters-conditions.page b/help/C/mail-filters-conditions.page
new file mode 100644
index 0000000000..f068d32d4c
--- /dev/null
+++ b/help/C/mail-filters-conditions.page
@@ -0,0 +1,97 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-filters-conditions">
+
+  <info>
+    <desc>Available conditions for setting up filtering.</desc>
+
+    <link type="seealso" xref="mail-filters"/>
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-filters.html.en#usage-mail-org-filters-new -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+    
+  </info>
+
+  <title>Available Filter conditions</title>
+
+<list>
+<item><p>Sender:</p>
+<p>The sender's email address or the name of the sender.</p></item>
+
+<item><p>Recipients:</p>
+<p>The recipients of the message.</p></item>
+
+<item><p>CC:</p>
+<p>Only the CC recipients of the message.</p></item>
+
+<item><p>BCC:</p>
+<p>Only the BCC recipients of the message. Obviously this can only be applied to outgoing filters.</p></item>
+
+<item><p>Sender or Recipients:</p>
+<p>The sender's email address or the name of the sender or the recipients of the message.</p></item>
+
+<item><p>Subject:</p>
+<p>The subject line of the message.</p></item>
+
+<item><p>Specific Header:</p>
+<p>Any header including <link xref="mail-composer-custom-header-lines">custom ones</link>.</p>
+<p>If a message uses a header more than once, Evolution pays attention only to the first instance, even if the message defines the header differently the second time. For example, if a message declares the Resent-From: header as "engineering@example.com" and then restates it as "marketing@example.com", Evolution filters as though the second declaration did not occur. To filter on messages that use headers multiple times, use a regular expression.</p></item>
+
+<item><p>Message Body:</p>
+<p>Searches in the actual text of the message.</p></item>
+
+<item><p>Expression:</p>
+<p>(For programmers only) Match a message according to an expression you write in the Scheme language used to define <link xref="mail-filters">filters</link> in Evolution.</p></item>
+
+<item><p>Date sent:</p>
+<p>Filters messages according to the date on which they were sent. First, choose the conditions you want a message to meet, such as before a given time or after a given time. Then choose the time. The filter compares the message's time stamp to the system clock when the filter is run, or to a specific time and date you choose from a calendar. You can also have it look for a message within a range of time relative to the filter, such as two to four days ago.</p></item>
+
+<item><p>Date received:</p>
+<p>This works the same way as the Date Sent option, except that it compares the time you received the message with the dates you specify.</p></item>
+
+<item><p>Label:</p>
+<p>Messages can have <link xref="mail-labels">labels</link> of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually.</p></item>
+
+<item><p>Score:</p>
+<p>Sets the message score to any whole number greater than 0. You can have one filter set or change a message score, and then set up another filter to move the messages you have scored. A message score is not based on anything in particular: it is simply a number you can assign to messages so other filters can process them.</p></item>
+
+<item><p>Size (kB):</p>
+<p>Sorts based on the size of the message in kilobytes.</p></item>
+
+<item><p>Status:</p>
+<p>Filters according to the status of a message. The status can be Replied To, Draft, Important, Read, or Junk.</p></item>
+
+<item><p>Follow Up:</p>
+<p>Checks whether the message is <link xref="mail-follow-up-flag">flagged for follow-up</link>.</p></item>
+
+<item><p>Completed On:</p></item>
+
+<item><p>Attachments:</p>
+<p>Checks whether there is an attachment for the email.</p></item>
+
+<item><p>Mailing List</p>
+<p>Filters based on the mailing list the message came from. This filter might miss messages from some list servers, because it checks for the X-BeenThere header, which is used to identify mailing lists or other redistributors of mail. Mail from list servers that do not set X-BeenThere properly are not be caught by these filters.</p></item>
+
+<item><p>Regex Match:</p>
+<p>(For programmers only) If you know your way around a <link href="https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression">regex</link>, or regular expression, this option allows you to search for complex patterns of letters, so that you can find, for example, all words that start with a and end with m, and are between six and fifteen letters long, or all messages that declare a particular header twice. For information about how to use regular expressions, check the man page for the grep command.</p></item>
+
+<item><p>Source Account:</p>
+<p>Filters messages according the server you got them from. This is most useful if you use multiple POP mail accounts.</p></item>
+
+<item><p>Pipe to Program:</p>
+<p>Evolution can use an external command to process a message, then process it based on the return value. Commands used in this way must return an integer. This is most commonly used to add an external junk mail filter.</p></item>
+
+<item><p>Junk Test:</p>
+<p>Filters based on the results of the <link xref="mail-spam">junk mail</link> test.</p></item>
+
+<item><p>Match All:</p></item>
+</list>
+</page>
diff --git a/help/C/mail-filters-not-working.page b/help/C/mail-filters-not-working.page
new file mode 100644
index 0000000000..111cf4634f
--- /dev/null
+++ b/help/C/mail-filters-not-working.page
@@ -0,0 +1,46 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-filters-not-working">
+
+  <info>
+    <desc>Fix problems with mail filters that do not sort and organize mail as expected.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+    <link type="seealso" xref="mail-filters" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Mail filters are not working</title>
+<p>Your mail filters are probably working, however, they could be ordered in an inefficient way. This will make your filters run slowly, so it may seem like they are not working.</p>
+
+<p>The order of email filters is very important. If your first filter has a <gui>Stop Processing</gui> rule, then all the email messages that match this filter will ignore all the succeeding filters. </p> 
+
+<p>To check if a filter has a <gui>Stop Processing</gui> rule:</p>
+
+<steps>
+<item><p>Go to <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>.</p></item>
+<item><p>Select the filter and refer to the list of actions for that particular filter. </p></item>
+<item><p>The <gui>Stop Processing</gui> rule should be listed under the list of <gui>Actions</gui> if it is enabled. </p></item>
+</steps>
+
+
+<p>Another thing you have to keep in mind is that filters depend on the "new" flag that is set when a particular email message is initially fetched from the server. If you use another email client aside from Evolution, your filters may not work automatically.</p>
+
+<note>
+<p>Applying the <gui>Stop Processing</gui> rule to an email message will cause all succeeding filters to ignore that message.</p>
+
+<!--<item><p>TODO: "flag" is a technical term, and might need explanation. A link to a glossary item, or a "what is a flag?" topic would suffice, like for example: For more information on flags, please see <link href="link to guide">this page</link></p></item>  -->
+</note>
+
+</page>
+
+
+
diff --git a/help/C/mail-filters.page b/help/C/mail-filters.page
new file mode 100644
index 0000000000..04857d4155
--- /dev/null
+++ b/help/C/mail-filters.page
@@ -0,0 +1,73 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-filters">
+
+  <info>
+    <desc>Use filter rules to sort your mail automatically into folders.</desc>
+
+    <link type="guide" xref="mail-organizing"/>
+
+    <revision pkgversion="3.0.2" version="0.4" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-filters.html.en -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+    
+  </info>
+
+  <title>Using Filters</title>
+
+<p>Message filters apply actions on messages based on conditions that you have defined. You can define filters for both incoming and outgoing emails.</p>
+
+<p>Filters will be automatically applied to incoming messages for local accounts (such as POP). Mail serves for remote accounts (such as IMAP) often already filter mail directly on the server as this is faster. If you want to apply your Evolution filters to remote accounts, you can enable this under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui>Edit</gui><gui>Receiving Options</gui><gui>Options</gui><gui>Apply filters to new messages in Inbox on this server</gui></guiseq>.</p>
+
+<p>To manually apply filters on messages in a folder, select the messages and click <guiseq><gui>Message</gui><gui>Apply Filters</gui></guiseq> or press <keyseq><key>Ctrl</key><key>Y</key></keyseq>.</p>
+<p>You can select all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>.</p>
+
+<section id="adding">
+<title>Creating a Filter</title>
+
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>, or click <guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the criterion the filter will be based on.</p></item>
+<item><p>Click <gui style="button">Add</gui>.</p></item>
+<item><p>Enter a name in the <gui>Rule name</gui> field.</p></item>
+<item><p>Define the conditions for the rule. For each condition, you first select which part of the message will be checked and then define the comparison.</p><p>For more information on the available conditions see <link xref="mail-filters-conditions">Available Filter conditions</link>.</p></item>
+<item><p>If you want to define multiple conditions, define under <gui>Find items</gui> if any or if all conditions have to apply, and click <gui style="button">Add Condition</gui> and repeat the previous step.</p></item>
+<item><p>Select the Actions for the Filter in the <gui>Then</gui> section.</p><p>For more information on the available actions see <link xref="mail-filters-actions">Available Filter actions</link>.</p></item>
+<item><p>If you want to define multiple actions, click <gui style="button">Add Action</gui> and repeat the previous step. For example, if you want no other existing filters to be applied choose <gui>Stop Processing</gui> as the second action in the list.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+</section>
+
+<section id="editing">
+<title>Editing Filters</title>
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>.</p></item>
+<item><p>Select the filter.</p></item>
+<item><p>Click <gui style="button">Edit</gui>.</p></item>
+<item><p>Make the desired corrections, then click <gui style="button">OK</gui> twice.</p></item>
+</steps>
+</section>
+
+<section id="deleting">
+<title>Deleting Filters</title>
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>.</p></item>
+<item><p>Select the filter.</p></item>
+<item><p>Click <gui style="button">Remove</gui>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+</section>
+
+
+
+
+<p></p>
+	
+</page>
diff --git a/help/C/mail-folders.page b/help/C/mail-folders.page
new file mode 100644
index 0000000000..2c9f1620ce
--- /dev/null
+++ b/help/C/mail-folders.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-folders">
+
+  <info>
+    <desc>Use folders to organize your mail.</desc>
+
+    <link type="guide" xref="mail-organizing"/>
+    <link type="seealso" xref="mail-filters"/>
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-folders.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+    
+  </info>
+
+  <title>Using Folders</title>
+  
+<p>Evolution, like most mail systems, uses folders to store email messages. You start out with a few mail folders such as the Inbox, Outbox, and Drafts. You can, however, create more folders if required.</p>
+
+<section id="create-folder">
+<title>Creating A Folder</title>
+<p>To create a folder:</p>
+<steps>
+<item><p>Click on <gui>Folder</gui> and select <gui>New</gui>. You can also right-click anywhere on the folder list and select the <gui>New Folder</gui> option.</p></item>
+<item><p>Specify the name and the location of the folder.</p></item>
+<item><p>Click on the <gui>Create</gui> button. </p></item>
+</steps>
+<p>The new folder will be shown in the folder view. You can then move messages into the folder.</p>
+</section>
+
+<section id="use-folder">
+<title>Moving Messages to New Folders</title>
+<p>You can move messages into folders by using one of the following methods:</p>
+<list>
+<item><p>Drag and drop the messages into the folder.</p></item>
+<item><p>Right-click on the message and select the <gui>Move to Folder</gui> option.</p></item>
+<item><p>Select a message and press <keyseq><key>Shift</key><key>Ctrl</key><key>V</key></keyseq>.</p></item>
+<item><p>Select a message and click on <guiseq><gui>Message</gui><gui>Move to Folder</gui></guiseq>.</p></item>
+</list>
+
+<p>The steps for copying are similar.</p>
+
+<note><p>Moving files can be done automatically by setting up <link xref="mail-filters">filters</link>.</p></note>
+
+</section>
+
+<note>
+<p>The Inbox folders on most IMAP servers cannot contain both messages and subfolders. When creating additional folders on your IMAP mail server, branch the folders from the root of the IMAP account and not from the Inbox. Creating subfolders in your Inbox may prevent you from reading messages that exist in the Inbox. If this happens, move the folders to the IMAP account.</p>
+</note>
+
+<!--Reuse http://library.gnome.org/users/evolution/2.32/usage-mail-organize-folders.html.en and add "Novell, Inc" as an author to this page. Mention the combination with filters (see seealso link)-->
+	
+</page>
+
+
diff --git a/help/C/mail-follow-up-flag.page b/help/C/mail-follow-up-flag.page
new file mode 100644
index 0000000000..b6d489dd99
--- /dev/null
+++ b/help/C/mail-follow-up-flag.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-follow-up-flag">
+
+  <info>
+    <desc>Using flags to remind you of actions.</desc>
+    
+    <link type="guide" xref="mail-organizing#advanced"/>
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="candidate"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/stable/usage-mail-organize-columns.html.en#usage-mail-organize-columns-followup -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Follow up flags for emails</title>
+
+<p>To make sure you do not forget about a message, you can use the follow-up feature.</p>
+<steps>
+<item><p>Select one or more messages.</p></item>
+<item><p>Right-click one of the messages.</p></item>
+<item><p>Click <gui>Mark for Follow Up...</gui></p></item>
+</steps>
+<p>You can also do this by selecting the message(s) and clicking <guiseq><gui>Message</gui><gui>Mark as</gui><gui>Follow Up...</gui></guiseq> or by pressing <keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>.</p>
+
+<p>A window opens to allow you to set the type of flag and the due date.</p>
+
+<p>The flag itself is the action you want to remind yourself about, such as Call, Forward and Reply.</p>
+
+<p>After you have added a flag, you can mark it as complete or remove it entirely by right-clicking the message and clicking either <gui>Flag Completed</gui> or <gui>Clear Flag</gui>.</p>
+
+<p>When you read a flagged message, its flag status is displayed at the top, before the message headers. An overdue message might tell you "Overdue: Call by April 07, 2012, 5:00 PM."</p>
+
+<p>Flags can help you organize your work in a number of ways. For example, you might <link xref="mail-change-columns-in-message-list">add a Flag Status column</link> to your message list and sort that way. Alternately, you could create a <link xref="mail-search-folders">search folder</link> that displays all your flagged messages, then clear the flags when you're done, so the search folder contains only messages with upcoming deadlines.</p>
+
+<note><p>If you prefer a simpler way to remind yourself about messages, you can mark them as important by right-clicking the message, then click <gui>Mark as Important</gui>, or by selecting <guiseq><gui>Message</gui><gui>Mark as</gui><gui>Important</gui></guiseq> from the menubar.</p></note>
+
+</page>
diff --git a/help/C/mail-imap-headers.page b/help/C/mail-imap-headers.page
new file mode 100644
index 0000000000..fd6316bb36
--- /dev/null
+++ b/help/C/mail-imap-headers.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-imap-headers">
+
+  <info>
+    <desc>Define which mail headers to download when using IMAP.</desc>
+    
+    <link type="guide" xref="index#mail-advanced-imap" />
+    <link type="guide" xref="mail-account-manage-imap#imap-headers"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-29" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/b15fx7uz.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+
+<title>IMAP Headers</title>
+
+<note><p>The <gui>IMAP Headers</gui> tab is only displayed in the <gui>Account Editor</gui> if <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>IMAP Features</gui></guiseq> is enabled.</p></note>
+
+<p>Evolution allows you for IMAP accounts to choose the headers that you want to download so that you can reduce the download time and filter or move your mail around the way you like it. The IMAP Mail header options are as follows:</p>
+<list>
+<item><p>Fetch All Headers:</p><p>All available IMAP mail headers for all the messages will be downloaded.</p></item>
+<item><p>Basic Headers (Fastest):</p><p>This will include Date, From, To, CC, Subject, Preferences, In-Reply-To, Message-ID, Mime-Version, and Content-Type. If you want to just fetch and see messages without having to categorically filter messages based on your mailing lists, choose this option. This will make Evolution work faster and is generally recommended for common users.</p></item>
+<item><p>Basic and Mailing List Headers (Default):</p><p>Enable this option to have filters based on mailing list headers (like list ID) so that in addition to the basic headers, the headers that correspond to mailing-lists are also fetched. Mailing list headers will have the informations such as the mailinglist-ID, owner of the mailing list, and so on with which you can create mailing list filters.</p><p>This is the default Header preference that comes with Evolution. When this option is chosen, Evolution will download a basic set of headers (as described above) along with a set of headers that are needed for client-side filters based on mailing lists. If you do not have any filters on Evolution, it is recommended to switch to the <gui>Basic Headers</gui> option.</p></item>
+</list>
+
+<p>To set the IMAP Mail headers:</p>
+<steps>
+<item><p>Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>.</p></item>
+<item><p>Select the IMAP account.</p></item>
+<item><p>Click <gui>Edit</gui>.</p></item>
+<item><p>Click the <gui>IMAP Headers</gui> tab.</p></item>
+<item><p>Optionally: If you want to define extra headers to download you can add these in the <gui>Custom Headers</gui> section.</p></item>
+</steps>
+
+<note><p>The option to define IMAP Headers is currently only available for IMAP accounts, but not for IMAP+ accounts.</p></note><!-- TODO:DEVELOPERS: Recheck this once https://bugzilla.gnome.org/show_bug.cgi?id=655519 has been fixed -->
+</page>
+
diff --git a/help/C/mail-imap-subscriptions.page b/help/C/mail-imap-subscriptions.page
new file mode 100644
index 0000000000..711922f848
--- /dev/null
+++ b/help/C/mail-imap-subscriptions.page
@@ -0,0 +1,38 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-imap-subscriptions">
+
+  <info>
+    <desc>IMAP folder subscriptions.</desc>
+    
+    <link type="guide" xref="index#mail-advanced-imap" />
+    <link type="guide" xref="mail-account-manage-imap#other-settings"/>
+    <link type="guide" xref="mail-account-manage-imap-plus#other-settings"/>
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-29" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-subscriptions.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+
+<title>IMAP Subscriptions</title>
+
+<p>As opening many IMAP folders on the server takes time you can define which IMAP folders to check and display in Evolution, and which ones to ignore for the time being, via the <gui>IMAP Subscriptions Manager</gui>.</p>
+<steps>
+<item><p>Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>.</p></item>
+<item><p>If you have accounts on multiple servers, select the server where you want to manage your subscriptions.</p></item>
+<item><p>Evolution displays a list of files and folders available on the IMAP server.</p></item>
+<item><p>Select a file or folder by clicking it.</p>
+<p>You should select at least the Inbox folder. Depending upon the way your IMAP server is configured, the list of available files might include non-mail folders. If it does, you can ignore them.</p></item>
+<item><p>Click a folder's checkbox to add a folder to your subscriptions.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/mail-labels.page b/help/C/mail-labels.page
new file mode 100644
index 0000000000..527da2ab99
--- /dev/null
+++ b/help/C/mail-labels.page
@@ -0,0 +1,38 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-labels">
+
+  <info>
+    <desc>Use labels to categorize your mail while keeping it in their folders.</desc>
+
+    <link type="guide" xref="mail-organizing#advanced"/>
+    <link type="seealso" xref="using-categories"/>
+
+    <revision pkgversion="3.0.2" version="0.3" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+    
+  </info>
+
+  <title>Using Labels</title>
+
+<p>You can add colored labels to emails in order to categorize them. This is similar to <link xref="using-categories">Categories</link> in the other Evolution windows.</p>
+
+<p>You can search for messages with specific labels by using the <link xref="mail-searching">quick search dropdown</link>. Also, <link xref="mail-search-folders">search folders</link> can be created based on labels.</p>
+
+<section id="add">
+<title>Adding a label to a message</title>
+<p>To assign a label to a message, right-click the message, click <gui>Label</gui>, and choose the label to apply.</p>
+<p>You can also quickly add a new label by choosing <gui>New Label</gui>.</p>
+</section>
+
+<section id="manage">
+<title>Managing labels</title>
+<p>You can add, edit and delete all labels under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Labels</gui></guiseq>. Note that you cannot remove the default labels.</p>
+</section>
+
+</page>
diff --git a/help/C/mail-layout-changing.page b/help/C/mail-layout-changing.page
new file mode 100644
index 0000000000..0a9e521968
--- /dev/null
+++ b/help/C/mail-layout-changing.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-layout-changing">
+
+  <info>
+    <desc>Changing the display of the mail window (message list columns and widescreen).</desc>
+
+    <link type="guide" xref="index#mail-basic"/>
+
+    <revision pkgversion="3.0.0" version="0.1" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Changing the mail window layout</title>
+
+</page>
diff --git a/help/C/mail-moving-emails.page b/help/C/mail-moving-emails.page
new file mode 100644
index 0000000000..65e1691e39
--- /dev/null
+++ b/help/C/mail-moving-emails.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-moving-emails">
+
+  <info>
+    <desc>Moving emails from one folder to another.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="2.28.3" version="0.2" date="2011-08-01" status="draft"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Moved emails are still shown in the original folder</title>
+
+<p>IMAP has no "move" feature. Evolution "moves" messages by copying and deleting emails. Deleting means "marking messages for deletion" so all the original messages are retained until you Expunge the emails marked for deletion.</p>
+
+<p>See the topic on <link xref="mail-delete-and-undelete">deleting emails</link> for instructions on how to expunge email messages. Note that this applies to other types of accounts as well.</p>
+
+</page>
+
+
+
diff --git a/help/C/mail-not-sent.page b/help/C/mail-not-sent.page
new file mode 100644
index 0000000000..87979efbe7
--- /dev/null
+++ b/help/C/mail-not-sent.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-not-sent">
+
+  <info>
+    <desc>Possible reasons why emails are not sent.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2010-10-16" status="review"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+</info>
+
+<title>Mail is not sent</title>
+
+<p>There can be several reasons why emails are not sent:</p>
+
+<list>
+<item><p>Invalid email address. Check if all the addresses listed as mail recipients are correct. If the message contains a wrong or invalid email address, the message will not be sent.</p></item>
+<item><p>Incorrect SMTP settings. Verify if the settings used for outgoing messages is correct. Using the incorrect server address or authentication method may prevent emails from being sent</p></item>
+<item><p>Offline status. Evolution may be offline. Check on the <gui style="button">Send and Receive</gui> button; if it is greyed out, then you are offline. To go online, go to <guiseq><gui>File</gui><gui>Work online</gui></guiseq>. You should now be able to use the <gui style="button">Send and Receive</gui> button.</p></item>
+</list>
+
+
+</page>
+
+ 
+
+
diff --git a/help/C/mail-organizing.page b/help/C/mail-organizing.page
new file mode 100644
index 0000000000..46e4294b3f
--- /dev/null
+++ b/help/C/mail-organizing.page
@@ -0,0 +1,28 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-organizing">
+
+  <info>
+    <desc>On folders, sorting, searching, filters, search folders, and labels.</desc>
+
+    <link type="guide" xref="index#mail-basic" />
+    <link type="guide" xref="organizing" />
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Sorting and organizing mail</title>
+
+  <section id="advanced" style="2column">
+    <title>Advanced Options</title>
+  </section>
+
+<p>Evolution provides several options to organize your mail according to your needs.</p>
+</page>
diff --git a/help/C/mail-read-receipts.page b/help/C/mail-read-receipts.page
new file mode 100644
index 0000000000..e0cfaaa2eb
--- /dev/null
+++ b/help/C/mail-read-receipts.page
@@ -0,0 +1,41 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-read-receipts">
+
+  <info>
+    <desc>How to enable requesting read receipts.</desc>
+    
+    <link type="guide" xref="index#mail-advanced" />
+    <link type="guide" xref="mail-account-manage-imap#defaults"/>
+    <link type="guide" xref="mail-account-manage-imap-plus#defaults"/>
+    <link type="guide" xref="mail-account-manage-local-delivery#defaults"/>
+    <link type="guide" xref="mail-account-manage-maildir-format-directories#defaults"/>
+    <link type="guide" xref="mail-account-manage-mh-format-directories#defaults"/>
+    <link type="guide" xref="mail-account-manage-pop#defaults"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#defaults"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#defaults"/>
+    <link type="guide" xref="mail-account-manage-usenet-news#defaults"/>
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-01-06" status="candidate"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Read receipts for emails</title>
+
+<p>Read receipts are a way for people to acknowledge that they have received your email. The recipient can normally choose whether to acknowledge the receipt or not, so they are not a completely reliable way of checking if your emails have been received by someone.</p>
+
+<p>You can request read receipts by enabling this option in the email composer's menu. To do so, go to <guiseq><gui>Options</gui><gui>Request Read Receipt</gui></guiseq>.</p>
+
+<p>For read receipts that you receive you can define Evolution's behavior by going to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Defaults</gui><gui>Message Receipts</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/mail-reading-keyboard-shortcuts.page b/help/C/mail-reading-keyboard-shortcuts.page
new file mode 100644
index 0000000000..a42710b90a
--- /dev/null
+++ b/help/C/mail-reading-keyboard-shortcuts.page
@@ -0,0 +1,62 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-reading-keyboard-shortcuts">
+
+  <info>
+    <desc>Keyboard shortcuts that can save you some time when reading mail.</desc>
+
+    <link type="guide" xref="index#mail-basic" />
+<!-- TODO:POST-3-2: maybe introduce keyboard shortcuts guide xref covering any shortcuts in all modules, covering http://library.gnome.org/users/evolution/2.32/quickref-mail.html.en ? -->
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using shortcut keys to read mail</title>
+
+<section id="view-email">
+<title>Viewing an email</title>
+<p>In the Mail window you read a message by selecting it in the message list. If you would like to see the message in its own window, either double-click it, press <key>Enter</key>, or press <keyseq><key>Ctrl</key><key>O</key></keyseq>.</p>
+</section>
+
+<section id="inside-message">
+<title>Navigating in a message</title>
+<p>To read mail with the keyboard, you can click the <key>Spacebar</key> to page down and press <key>Backspace</key> to page up while reading an email. Ensure that you use the keys when the message list is focused.</p>
+</section>
+
+<section id="inside-folder">
+<title>Navigating in a folder in the message list</title>
+<p>Navigate in the message list by using the arrow keys on the keyboard.</p>
+</section>
+
+<section id="inside-folder-unread">
+<title>Navigating in a folder's unread mail in the message list</title>
+<p>To go to the next or previous unread messages, press the period (<key>.</key>) or comma (<key>,</key>) keys. On some keyboards, these keys are also marked with the <key>&gt;</key> and <key>&lt;</key> symbols, which is a convenient way to remember that they move you forward and backward in your message list. You can also use the right square bracket (<key>]</key>) for the next unread message, and the left square bracket (<key>[</key>) for the previous unread message.</p>
+</section>
+
+<section id="unread-across-folders">
+<title>Navigating in unread mail across folders</title>
+
+<p>You can easily read the unread messages in all the mail folders by using the <key>Spacebar</key>.</p>
+
+<p>When you are in the Mail window, the Spacebar has the following behavior:</p>
+<list>
+<item><p>When you press the Spacebar for the first time, it takes you to the next unread message.</p></item>
+<item><p>If the message is more than one screen long, the Spacebar works as <key>Page Down</key>.</p></item>
+<item><p>If you press the Spacebar after you reach the bottom of the page, it takes you to the next unread message.</p></item>
+<item><p>If there are no more unread messages in the mailbox, pressing the Spacebar takes you to the next unread message in the next folder.</p></item>
+<item><p>If new messages arrive in a number of folders, the Spacebar toggles between those folders. This feature allows you to switch to the next unread message in a different folder without clicking the folder.</p></item>
+</list>
+</section>
+
+</page>
+
diff --git a/help/C/mail-received-notification.page b/help/C/mail-received-notification.page
new file mode 100644
index 0000000000..10327b1d51
--- /dev/null
+++ b/help/C/mail-received-notification.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-received-notification">
+
+  <info>
+    <desc>Options on notifications of newly received mail.</desc>
+
+    <link type="guide" xref="mail-send-and-receive" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Getting notified of new mail</title>
+
+<p>Evolution always notifies you of new messages by adding a yellow star to the mailer icon in the window <link xref="change-switcher-appearance.page">switcher</link>.</p>
+<media type="image" src="./figures/new-mail-switcher.png" width="256">
+  <p>Switcher layout when a new message has arrived</p>
+</media>
+
+<p>In order to get also notified of new messages in the GNOME Notification area at the bottom of the screen, make sure that <guiseq><gui>Edit</gui><gui>Plugins</gui><gui>Mail Notification</gui></guiseq> is enabled and that you have set your prefered options in the <gui>Configuration</gui> tab.</p>
+<media type="image" src="./figures/new-mail-notification.png" width="512">
+  <p>Switcher layout when a new message has arrived</p>
+</media>
+
+<!-- TODO: Quite short; plus recheck once https://bugzilla.gnome.org/show_bug.cgi?id=653699 is fixed -->
+
+</page>
+
diff --git a/help/C/mail-receiving-options-evolution-exchange.page b/help/C/mail-receiving-options-evolution-exchange.page
new file mode 100644
index 0000000000..cc92cf44d8
--- /dev/null
+++ b/help/C/mail-receiving-options-evolution-exchange.page
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-evolution-exchange">
+
+  <info>
+    <desc>Receiving options for Evolution Exchange accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#corporate-server-types"/>
+    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-exchange#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bstgjve -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Evolution Exchange receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<list>
+<item><p>Enter your username for that server.</p></item>
+<item><p>Enter the OWA URL for that server.</p></item>
+<item><p>Select if the mailbox name is different from the username. If it is, enter the mailbox name.</p>
+<note style="tip"><p>If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Click <gui style="button">Authenticate</gui> and enter your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+
+<item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
+
+<item><p>In the section <gui>Global Address List/Active Directory</gui>, specify the name of the Global Catalog server. The Global Catalog Server contains the user information for users.</p></item>
+<item><p>Select if you want to limit the number of Global Address List (GAL) responses as this may increase speed. The GAL contains a list of all email addresses.</p></item>
+<item><p>You also have to define the Authentication type, and whether you want groups of contacts in GAL to be represented in the Evolution address book by <link xref="contacts-using-contact-lists">contact lists</link>.</p></item>
+</list>
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-exchange-mapi.page b/help/C/mail-receiving-options-exchange-mapi.page
new file mode 100644
index 0000000000..b68a13f928
--- /dev/null
+++ b/help/C/mail-receiving-options-exchange-mapi.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-exchange-mapi">
+
+  <info>
+    <desc>Receiving options for Exchange MAPI accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#corporate-server-types"/>
+    <link type="guide" xref="mail-account-manage-microsoft-exchange-evo-mapi#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Exchange MAPI receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Enter the Domain name for that server.</p>
+<note style="tip"><p>If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p></item>
+<item><p>Click <gui style="button">Authenticate</gui> and enter your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+
+<item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
+</list>
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-imap-plus.page b/help/C/mail-receiving-options-imap-plus.page
new file mode 100644
index 0000000000..f3b8de883f
--- /dev/null
+++ b/help/C/mail-receiving-options-imap-plus.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-imap-plus">
+
+  <info>
+    <desc>Receiving options for IMAP+ accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#common-server-types"/>
+    <link type="guide" xref="mail-account-manage-imap-plus#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bstggh0 -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>IMAP+ receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
+<note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>Select "Use Quick Resync" if the IMAP server supports <link href="http://tools.ietf.org/html/rfc5162">IMAP4 Extensions for Quick Mailbox Resynchronization</link>.</p></item>
+<item><p>You can also define if Evolution checks for new messages in all folders, or only in subscribed folders.</p></item>
+<item><p>Select if you want Evolution to use custom commands to connect to the IMAP server.</p></item>
+<item><p>Select if you want Evolution to show only <link xref="mail-imap-subscriptions">subscribed folders</link>.</p></item>
+<item><p>Select if you want Evolution to override server-supplied folder namespaces.</p></item>
+</list>
+
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-imap.page b/help/C/mail-receiving-options-imap.page
new file mode 100644
index 0000000000..33ee9bb975
--- /dev/null
+++ b/help/C/mail-receiving-options-imap.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-imap">
+
+  <info>
+    <desc>Receiving options for IMAP accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#common-server-types"/>
+    <link type="guide" xref="mail-account-manage-imap#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bstggh0 -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>IMAP receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
+<note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>You can also define if Evolution checks for new messages in all folders, or only in subscribed folders.</p></item>
+<item><p>Select if you want Evolution to use custom commands to connect to the IMAP server.</p></item>
+<item><p>Select if you want Evolution to show only <link xref="mail-imap-subscriptions">subscribed folders</link>.</p></item>
+<item><p>Select if you want Evolution to override server-supplied folder namespaces.</p></item>
+</list>
+
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-local-delivery.page b/help/C/mail-receiving-options-local-delivery.page
new file mode 100644
index 0000000000..b2d09566cc
--- /dev/null
+++ b/help/C/mail-receiving-options-local-delivery.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-local-delivery">
+
+  <info>
+    <desc>Receiving options for Local delivery accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+    <link type="guide" xref="mail-account-manage-local-delivery#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Local delivery receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the file by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. This will open a file chooser window.</p>
+<!-- TODO: Fix after https://bugzilla.gnome.org/show_bug.cgi?id=655629 is fixed - Calling this file a "Path" is just plain wrong. -->
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-maildir-format-directories.page b/help/C/mail-receiving-options-maildir-format-directories.page
new file mode 100644
index 0000000000..135e437526
--- /dev/null
+++ b/help/C/mail-receiving-options-maildir-format-directories.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-maildir-format-directories">
+
+  <info>
+    <desc>Receiving options for Maildir-format mail directories accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+    <link type="guide" xref="mail-account-manage-maildir-format-directories#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Maildir-format mail directories receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p>
+
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-mh-format-directories.page b/help/C/mail-receiving-options-mh-format-directories.page
new file mode 100644
index 0000000000..56e878e3e0
--- /dev/null
+++ b/help/C/mail-receiving-options-mh-format-directories.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-mh-format-directories">
+
+  <info>
+    <desc>Receiving options for MH-format mail directories accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+    <link type="guide" xref="mail-account-manage-mh-format-directories#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>MH-format mail directories receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-novell-groupwise.page b/help/C/mail-receiving-options-novell-groupwise.page
new file mode 100644
index 0000000000..decf93428a
--- /dev/null
+++ b/help/C/mail-receiving-options-novell-groupwise.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-novell-groupwise">
+
+  <info>
+    <desc>Receiving options for Novell Groupwise accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#corporate-server-types"/>
+    <link type="guide" xref="mail-account-manage-novell-groupwise#receiving-email"/>
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Novell Groupwise receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
+<note style="tip"><p>If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+
+<item><p>If you want the messages to remain on the server for a period of time, click the <gui>Leave messages on server</gui> option and the <gui>Delete after ... days</gui> option and select the number of days to allow messages to remain on the server.</p></item>
+
+<item><p>Enter the Post Office Agent SOAP port.</p>
+<p>If you are unsure what your Post Office Agent SOAP port is, contact your system administrator.</p></item>
+</list>
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-pop.page b/help/C/mail-receiving-options-pop.page
new file mode 100644
index 0000000000..da76e46e4c
--- /dev/null
+++ b/help/C/mail-receiving-options-pop.page
@@ -0,0 +1,50 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-pop">
+
+  <info>
+    <desc>Receiving options for POP accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#common-server-types"/>
+    <link type="guide" xref="mail-account-manage-pop#receiving-email"/>
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-27" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Barbara Tobias</name>
+      <email>barbtobias09@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>POP receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
+<note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p>
+<note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+
+<p>If you want the messages to remain on the server for a period of time, click the <gui>Leave messages on server</gui> option and the <gui>Delete after ... days</gui> option and select the number of days to allow messages to remain on the server.</p>
+
+<p>The option <gui>Disable support for all POP3 extensions</gui> is only useful when accessing old or misconfigured mail servers. Such POP3 extensions provide enhanced functionality, however only some servers support them. In case of problems with receiving mail, enabling this setting might help.</p>
+
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-unix-mbox-spool-directory.page b/help/C/mail-receiving-options-unix-mbox-spool-directory.page
new file mode 100644
index 0000000000..08874db7c1
--- /dev/null
+++ b/help/C/mail-receiving-options-unix-mbox-spool-directory.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-unix-mbox-spool-directory">
+
+  <info>
+    <desc>Receiving options for standard Unix mbox spool directory accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Standard Unix mbox spool directory receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p>
+
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-unix-mbox-spool-file.page b/help/C/mail-receiving-options-unix-mbox-spool-file.page
new file mode 100644
index 0000000000..d908579d1a
--- /dev/null
+++ b/help/C/mail-receiving-options-unix-mbox-spool-file.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-unix-mbox-spool-file">
+
+  <info>
+    <desc>Receiving options for standard Unix mbox spool file accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#local-account-server-types"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Standard Unix mbox spool file receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
+<p>Choose the file by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. This will open a file chooser window.</p>
+<!-- TODO: Fix after https://bugzilla.gnome.org/show_bug.cgi?id=655629 is fixed - Calling this file a "Path" is just plain wrong. -->
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
+<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p>
+
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options-usenet-news.page b/help/C/mail-receiving-options-usenet-news.page
new file mode 100644
index 0000000000..697e3bf3d1
--- /dev/null
+++ b/help/C/mail-receiving-options-usenet-news.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-receiving-options-usenet-news">
+
+  <info>
+    <desc>Receiving options for Usenet news accounts.</desc>
+
+    <link type="guide" xref="mail-receiving-options#common-server-types"/>
+    <link type="guide" xref="mail-account-manage-usenet-news#receiving-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mainwindow-starting.html.en#bsthqql -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>Usenet news receiving options</title>
+
+<p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+<list>
+<item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
+<item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
+<note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note></item>
+<item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+<item><p>Select if you want Evolution to remember your password.</p></item>
+</list>
+
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>Select if you want to show folders in short notation.</p>
+<p>For example, comp.os.linux would appear as c.o.linux.</p></item>
+<item><p>Select if you want to show relative folder names in the <link xref="mail-imap-subscriptions">subscriptions window</link>.</p>
+<p>If you select to show relative folder names, only the name of the folder is displayed. For example the folder evolution.mail would appear as evolution.</p></item>
+</list>
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-receiving-options.page b/help/C/mail-receiving-options.page
new file mode 100644
index 0000000000..212bf93246
--- /dev/null
+++ b/help/C/mail-receiving-options.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-receiving-options">
+
+  <info>
+    <desc>Available mail receiving options for several server types.</desc>
+
+    <revision pkgversion="2.28.3" version="0.1" date="2010-12-09" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Mail Receiving Options</title>
+<!-- Please keep sorting and categorization in sync with intro-first-run.page! -->
+  <section id="common-server-types" style="2column">
+    <title>Common server types</title>
+  </section>
+  <section id="corporate-server-types" style="2column">
+    <title>Corporate server types</title>
+  </section>
+  <section id="local-account-server-types" style="2column">
+    <title>Local account server types</title>
+  </section>
+
+
+</page>
diff --git a/help/C/mail-recognized-thread-related-headers.page b/help/C/mail-recognized-thread-related-headers.page
new file mode 100644
index 0000000000..c58e8d9140
--- /dev/null
+++ b/help/C/mail-recognized-thread-related-headers.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-recognized-thread-related-headers">
+
+  <info>
+    <desc>Which thread-related headers are recognized by Evolution.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2010-10-16" status="review"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Thread related headers recognized by Evolution</title>
+
+<p>Evolution supports the following headers:</p>
+<list>
+<item><p>References</p></item>
+<item><p>In-Reply-To</p></item>
+</list>
+
+
+<p><gui>Thread-*</gui> headers are Microsoft's proprietary headers and not supported.</p>
+</page>
+
diff --git a/help/C/mail-refresh-folders.page b/help/C/mail-refresh-folders.page
new file mode 100644
index 0000000000..b612b3a9ec
--- /dev/null
+++ b/help/C/mail-refresh-folders.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-refresh-folders">
+
+  <info>
+    <desc>Ways to update your Evolution folders.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2010-10-09" status="final"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Updating/refreshing the folders on the mail server</title>
+
+<p>To make sure that your local email folders are updated, go to <guiseq><gui>Folder</gui><gui>Refresh</gui></guiseq>. This will ensure that all of your emails have been downloaded from the mail server onto your computer so that you can read them all, and that the read status is synced with the mail server.</p>
+
+<p>You can also double-click on the folder name to refresh it, or press <key>F5</key>.</p>
+
+</page>
diff --git a/help/C/mail-search-folders-add.page b/help/C/mail-search-folders-add.page
new file mode 100644
index 0000000000..723364fe2c
--- /dev/null
+++ b/help/C/mail-search-folders-add.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-search-folders-add">
+
+  <info>
+    <desc>Setting up a search folder.</desc>
+    
+    <link type="guide" xref="mail-search-folders" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-vfolders.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Creating A Search Folder</title>
+
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Search Folders</gui></guiseq>, or click <guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the criterion the search folder will be based on, or if you have run a search, click <guiseq><gui>Search</gui><gui>Create Search Folder From Search...</gui></guiseq>.</p></item>
+<item><p>Click <gui style="button">Add</gui>.</p></item>
+<item><p>Enter a name in the <gui>Rule name</gui> field.</p></item>
+<item><p>Define the conditions for the rule. For each condition, you first select which part of the message will be checked and then define the comparison.</p><p>For more information on the available conditions see <link xref="mail-search-folders-conditions">Available Search Folder conditions</link>.</p></item>
+<item><p>If you want to define multiple conditions, define under <gui>Find items</gui> if any or if all conditions have to apply, and click <gui style="button">Add Condition</gui> and repeat the previous step.</p></item>
+<item><p>Select which folders will be used for the search folder in the section <gui>Search Folder Sources</gui>. Options are:</p>
+<list>
+  <item><p>All local folders:</p>
+  <p>Uses all local folders for the search folder source in addition to individual folders that are selected.</p></item>
+
+  <item><p>All active remote folders:</p>
+  <p>Remote folders are considered active if you are connected to the server; you must be connected to your mail server for the search folder to include any messages from that source in addition to individual folders that are selected.</p></item>
+
+  <item><p>All local and active remote folders:</p>
+  <p>Uses all local and active remote folders for the search folder source in addition to individual folders that are selected.</p></item>
+
+  <item><p>Specific folders only:</p>
+  <p>Uses individual folders for the search folder source. In this case, click the <gui style="button">Add</gui> to select folders.</p></item>
+</list>
+</item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+</page>
+
+
diff --git a/help/C/mail-search-folders-conditions.page b/help/C/mail-search-folders-conditions.page
new file mode 100644
index 0000000000..7d53794a2a
--- /dev/null
+++ b/help/C/mail-search-folders-conditions.page
@@ -0,0 +1,90 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-search-folders-conditions">
+
+  <info>
+    <desc>Available conditions for setting up search folders.</desc>
+
+    <link type="seealso" xref="mail-search-folders"/>
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-vfolders.html.en -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+    
+  </info>
+
+  <title>Available Search folder conditions</title>
+
+<list>
+<item><p>Sender:</p>
+<p>The sender's email address or the name of the sender.</p></item>
+
+<item><p>Recipients:</p>
+<p>The recipients of the message.</p></item>
+
+<item><p>CC:</p>
+<p>Only the CC recipients of the message.</p></item>
+
+<item><p>BCC:</p>
+<p>Only the BCC recipients of the message. Obviously this can only be applied to outgoing filters.</p></item>
+
+<item><p>Sender or Recipients:</p>
+<p>The sender's email address or the name of the sender or the recipients of the message.</p></item>
+
+<item><p>Subject:</p>
+<p>The subject line of the message.</p></item>
+
+<item><p>Specific Header:</p>
+<p>Any header including <link xref="mail-composer-custom-header-lines">custom ones</link>.</p>
+<p>If a message uses a header more than once, Evolution pays attention only to the first instance, even if the message defines the header differently the second time. For example, if a message declares the Resent-From: header as "engineering@example.com" and then restates it as "marketing@example.com", Evolution filters as though the second declaration did not occur. To filter on messages that use headers multiple times, use a regular expression.</p></item>
+
+<item><p>Message Body:</p>
+<p>Searches in the actual text of the message.</p></item>
+
+<item><p>Expression:</p>
+<p>(For programmers only) Match a message according to an expression you write in the Scheme language used to define <link xref="mail-filters">filters</link> in Evolution.</p></item>
+
+<item><p>Date sent:</p>
+<p>Filters messages according to the date on which they were sent. First, choose the conditions you want a message to meet, such as before a given time or after a given time. Then choose the time. The filter compares the message's time stamp to the system clock when the filter is run, or to a specific time and date you choose from a calendar. You can also have it look for a message within a range of time relative to the filter, such as two to four days ago.</p></item>
+
+<item><p>Date received:</p>
+<p>This works the same way as the Date Sent option, except that it compares the time you received the message with the dates you specify.</p></item>
+
+<item><p>Label:</p>
+<p>Messages can have <link xref="mail-labels">labels</link> of Important, Work, Personal, To Do, or Later. You can set labels with other filters or manually.</p></item>
+
+<item><p>Score:</p>
+<p>Sets the message score to any whole number greater than 0. You can have one filter set or change a message score, and then set up another filter to move the messages you have scored. A message score is not based on anything in particular: it is simply a number you can assign to messages so other filters can process them.</p></item>
+
+<item><p>Size (kB):</p>
+<p>Sorts based on the size of the message in kilobytes.</p></item>
+
+<item><p>Status:</p>
+<p>Filters according to the status of a message. The status can be Replied To, Draft, Important, Read, or Junk.</p></item>
+
+<item><p>Follow Up:</p>
+<p>Checks whether the message is <link xref="mail-follow-up-flag">flagged for follow-up</link>.</p></item>
+
+<item><p>Completed On:</p></item>
+
+<item><p>Attachments:</p>
+<p>Checks whether there is an attachment for the email.</p></item>
+
+<item><p>Mailing List</p>
+<p>Filters based on the mailing list the message came from. This filter might miss messages from some list servers, because it checks for the X-BeenThere header, which is used to identify mailing lists or other redistributors of mail. Mail from list servers that do not set X-BeenThere properly are not be caught by these filters.</p></item>
+
+<item><p>Regex Match:</p>
+<p>(For programmers only) If you know your way around a <link href="https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression">regex</link>, or regular expression, this option allows you to search for complex patterns of letters, so that you can find, for example, all words that start with a and end with m, and are between six and fifteen letters long, or all messages that declare a particular header twice. For information about how to use regular expressions, check the man page for the grep command.</p></item>
+
+<item><p>Message Location:</p></item>
+
+<item><p>Match All:</p></item>
+</list>
+</page>
diff --git a/help/C/mail-search-folders-refresh.page b/help/C/mail-search-folders-refresh.page
new file mode 100644
index 0000000000..bf87a679b7
--- /dev/null
+++ b/help/C/mail-search-folders-refresh.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-search-folders-refresh">
+
+  <info>
+    <desc>Ways of updating Search folders.</desc>
+    
+    <link type="guide" xref="mail-search-folders" />
+
+    <revision pkgversion="2.32.2" version="0.2" date="2011-07-22" status="draft"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Updating/refreshing Search folders</title>
+
+<p>It might happen that one of your Search folders has not updated since some new email arrived or since an email was deleted, for example. This will mean that the list of emails in the folder is not up-to-date.</p>
+
+<p>You can get an updated view of the search folder either by switching to another folder and then back again, or by right-clicking on the search folder and choosing <gui>Refresh</gui>.</p>
+
+
+</page>
+
+
diff --git a/help/C/mail-search-folders.page b/help/C/mail-search-folders.page
new file mode 100644
index 0000000000..59cf5e42d6
--- /dev/null
+++ b/help/C/mail-search-folders.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-search-folders">
+
+  <info>
+    <desc>Use search folders to see messages in one folder while still keeping them in their original folders.</desc>
+
+    <link type="guide" xref="mail-organizing#advanced"/>
+
+    <revision pkgversion="3.0.2" version="0.3" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-vfolders.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+  </info>
+
+  <title>Using Search folders</title>
+  
+<p>If <link xref="mail-filters">filters</link> are not flexible enough, or you find yourself performing the same <link xref="mail-searching">search</link> again and again, consider a search folder.</p>
+
+<p>A search folder looks like a <link xref="mail-folders">folder</link>, it acts like a <link xref="mail-searching">search</link>, and you set it up like a <link xref="mail-filters">filter</link>. While a conventional folder actually contains messages, a search folder is a view of messages that might be in several different folders. The messages it contains are determined on the fly using a set of criteria that you have chosen when setting up the search folder.</p>
+
+<p>Evolution automatically updates the search folder contents when new messages are received or message are deleted.</p>
+
+<p>The <gui>Unmatched</gui> search folder is the opposite of other search folders: it displays all messages that do not appear in other search folders.</p>
+
+<p>If you use remote email storage like IMAP, and have created search folders to search through them, the <gui>Unmatched</gui> search folder also searches the remote folders. If you do not create any search folders that search remote mail stores, the <gui>Unmatched</gui> search folder does not search in them either.</p>
+
+</page>
diff --git a/help/C/mail-searching-attachment-type.page b/help/C/mail-searching-attachment-type.page
new file mode 100644
index 0000000000..d92c9d102a
--- /dev/null
+++ b/help/C/mail-searching-attachment-type.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-searching-attachment-type">
+
+  <info>
+    <desc>Unfortunately this is not possible.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+    <link type="seealso" xref="mail-searching" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Searching for emails with a specific attachment type</title>
+
+<p>There currently is no way to do search for emails with a specific type of attachment (for example searching for all emails that have a PDF attachment).</p>
+
+</page>
diff --git a/help/C/mail-searching.page b/help/C/mail-searching.page
new file mode 100644
index 0000000000..9d1d53b980
--- /dev/null
+++ b/help/C/mail-searching.page
@@ -0,0 +1,76 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"

+      type="topic" id="mail-searching">

+ 

+  <info>

+    <desc>Searching messages.</desc>

+    

+    <link type="guide" xref="searching-items" />

+    <link type="guide" xref="mail-organizing" />

+ 

+    <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft" />

+    <credit type="author">

+      <name>Max Vorobuov</name>

+      <email>vmax0770@gmail.com</email>

+    </credit>

+    <credit type="author">

+      <name>Andre Klapper</name>

+      <email>ak-47@gmx.net</email>

+    </credit>

+    <credit type="author">

+      <name>Novell, Inc</name>

+    </credit>

+    <license>

+      <p>Creative Commons Share Alike 3.0</p>

+    </license>    

+ 

+  </info>

+ 

+<title>Searching Mail</title>

+<section id="quick-search">

+<title>Quick Search</title>

+<p>In the mail view, you can quickly search for messages by defining conditions.</p>

+<steps>

+<item><p>Click on the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>

+<item><p>Select the search condition from the list.</p></item>

+<item><p>Select the scope from the drop-down list right to the text box.</p></item>

+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>

+<item><p>Evolution displays the search results.</p></item>

+</steps>

+<note style="tip"><p>If you start directly from the fourth step, text will be searched in mail's subjects and addresses and scope will be "Current folder".</p></note>

+<note style="tip"><p>If you search for messages that are not in the same folder rather often you might want to create a search folder instead; see <link xref="mail-search-folders">Using Search Folders</link> for more detail.</p></note>

+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>

+</section>

+  

+<section id="advanced-search">

+<title>Advanced Search:</title>

+<steps>

+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>

+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>

+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>

+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>

+</steps>

+</section>

+

+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->

+<section id="clearing-search">

+<title>Clearing the Search results</title>

+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>

+</section>

+

+<section id="saved-searches">

+<title>Saved Searches</title>

+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>

+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>

+</section>

+ 

+<section id="editing-a-saved-search">

+<title>Editing a Saved Search</title>

+<steps>

+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>

+<item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>

+<item><p>Edit the title or search conditions from the dialog box.</p></item>

+<item><p>Click <gui>OK</gui>.</p></item>

+</steps>

+</section>

+ 

+</page>

diff --git a/help/C/mail-send-and-receive-automatically.page b/help/C/mail-send-and-receive-automatically.page
new file mode 100644
index 0000000000..2a1ea301ca
--- /dev/null
+++ b/help/C/mail-send-and-receive-automatically.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-send-and-receive-automatically">
+
+  <info>
+    <desc>Check automatically and regularly for new received mail.</desc>
+
+    <link type="guide" xref="mail-send-and-receive" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Automatically check for new mail</title>
+<p>If you want Evolution to check automatically for new messages, enable the option <gui>Check for new messages every ... minutes</gui> in the <gui>Receiving Email</gui> page of the mail account settings (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>) and select the frequency in minutes.</p>
+
+</page>
+
diff --git a/help/C/mail-send-and-receive-manual.page b/help/C/mail-send-and-receive-manual.page
new file mode 100644
index 0000000000..f075fede7e
--- /dev/null
+++ b/help/C/mail-send-and-receive-manual.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-send-and-receive-manual">
+
+  <info>
+    <desc>Force sending and receiving emails.</desc>
+
+    <link type="guide" xref="mail-send-and-receive" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Manually send and receive message</title>
+<p>To receive new messages from the mail server and to send messages you have written that are in the local Outbox, click the <gui style="button">Send / Receive</gui> button in the toolbar, or press <key>F9</key>, or choose <guiseq><gui>File</gui><gui>Send / Receive </gui></guiseq> from the main menu.</p>
+<p>To send and receive only for one of your mail accounts, or to only send or only receive, click the small down-arrow next to the <gui style="button">Send / Receive</gui> button and choose the corresponding option.</p>
+
+</page>
+
diff --git a/help/C/mail-send-and-receive.page b/help/C/mail-send-and-receive.page
new file mode 100644
index 0000000000..3c14186515
--- /dev/null
+++ b/help/C/mail-send-and-receive.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-send-and-receive">
+
+  <info>
+    <desc>On receiving mail and sending written emails.</desc>
+
+    <link type="guide" xref="index#mail-basic" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-31" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Sending and receiving mail</title>
+
+<p>This section refers to receiving mail and sending written emails. For writing a new message, please refer to the <link type="guide" xref="index#mail-composing">Composing mail</link> section.</p>
+
+</page>
diff --git a/help/C/mail-sending-options-smtp.page b/help/C/mail-sending-options-smtp.page
new file mode 100644
index 0000000000..18149e10f3
--- /dev/null
+++ b/help/C/mail-sending-options-smtp.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-sending-options-smtp">
+
+  <info>
+    <desc>Sending options for SMTP.</desc>
+
+    <link type="guide" xref="mail-account-manage-imap#sending-email"/>
+    <link type="guide" xref="mail-account-manage-imap-plus#sending-email"/>
+    <link type="guide" xref="mail-account-manage-local-delivery#sending-email"/>
+    <link type="guide" xref="mail-account-manage-maildir-format-directories#sending-email"/>
+    <link type="guide" xref="mail-account-manage-mh-format-directories#sending-email"/>
+    <link type="guide" xref="mail-account-manage-pop#sending-email"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-directory#sending-email"/>
+    <link type="guide" xref="mail-account-manage-unix-mbox-spool-file#sending-email"/>
+    <link type="guide" xref="mail-account-manage-usenet-news#sending-email"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>SMTP sending options</title>
+
+<steps>
+<item><p>Enter the address of your mail server for sending mail in the <gui>Server</gui> field and select if the server requires authentication (entering a username and a password).</p></item>
+<note style="tip"><p>Free webmail providers often supply information about which of these options can be used. If you are in an organizational environment, you may want to contact your system administrator for more information.</p></note>
+<item><p>If the server requires authentication, you need to provide the following information:</p>
+<steps>
+  <item><p>Select the authentication type in the Authentication list, or click <gui>Check for Supported Types</gui> to have Evolution check. Some servers do not support this, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
+  <item><p>Enter your username.</p></item>
+</steps>
+</item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+</steps>
+
+<!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
+<p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#account-information">here</link> to continue with the next step.</p>
+
+</page>
diff --git a/help/C/mail-several-pop-accounts.page b/help/C/mail-several-pop-accounts.page
new file mode 100644
index 0000000000..53251b89d3
--- /dev/null
+++ b/help/C/mail-several-pop-accounts.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-several-pop-accounts">
+
+  <info>
+    <desc>How to split and sort mail when using more than one local account.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+    <link type="seealso" xref="mail-organizing" />
+    <link type="seealso" xref="mail-receiving-options-pop" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Separating POP mail for more than one account</title>
+
+<p>It is not possible to have separate accounts in the accounts and folder list pane. Evolution only has one unique inbox for incoming email.</p>
+<p>You can either use IMAP instead of POP, or move incoming emails into different folders by <link xref="mail-folders">creating folders</link> and <link xref="mail-filters">creating filters</link>: Create a new folder and create two subfolders (for incoming and for sent mail of that account). Now set up an incoming filter via <guiseq><gui>Edit</gui><gui>Message Filters...</gui><gui style="button">Add</gui></guiseq> to move incoming mail to the incoming folder by filtering on the recipient's address and set up an outgoing filter to move outgoing mail to the sent folder by filtering on the sender's address.</p>
+
+<!-- https://bugzilla.gnome.org/show_bug.cgi?id=447425 -->
+
+</page>
diff --git a/help/C/mail-sorting-message-list.page b/help/C/mail-sorting-message-list.page
new file mode 100644
index 0000000000..44f19fbb3d
--- /dev/null
+++ b/help/C/mail-sorting-message-list.page
@@ -0,0 +1,119 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-sorting-message-list">
+
+  <info>
+    <desc>Sorting the message list of a mail folder.</desc>
+
+    <link type="guide" xref="mail-organizing"/>
+
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-07-31" status="review"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-columns.html.en -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+    
+  </info>
+
+  <title>Sorting the message list</title>
+  
+<p>Evolution lets you organize your emails by letting you sort messages.</p>
+<note><p>To view the complete headers for a message, click <guiseq><gui>View</gui><gui>All Message Headers</gui></guiseq>. This will display the complete header data on the viewing pane.</p> 
+<p>To view the message data, click on <guiseq><gui>View</gui><gui>Message Source</gui></guiseq> or press <keyseq><key>Ctrl</key><key>U</key></keyseq>. This will display the message data in a pop-up window.</p></note>
+
+<section id="email threads">
+<title>Sorting Mail in Email Threads</title>
+<p>You can use a threaded message view to sort emails. To enable this feature, click on <guiseq><gui>View</gui><gui>Group By Threads</gui></guiseq> or press <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p>
+<p>This feature, when enabled, groups replies with the original email and allows you to follow the flow of the conversation from one message to the next.</p>
+<p>When a new message arrives, it will be added below the parent message. Threads are sorted and displayed based on the date of the most recent message received.</p>
+<note style="tip"><p>For Advanced Users: There is a GConf key that allows you to toggle between the collapsed and expanded state of the email threads. The collapsed state is enabled by default and may be modified at /apps/evolution/mail/display/thread_expand.</p>
+</note>
+</section>
+
+<section id="column headers">
+<title>Sorting Mail with Column Headers</title>
+<p>The message list displays columns that indicate whether a message has been read, whether it has attachments, how important the message is, the sender, date, and the subject. To change the columns used in the message list, you can do one of the following:</p>
+<list>
+<item><p>Drag and drop the column header bars</p></item>
+<item><p>Right-click on the header.</p></item>S
+<item><p>Select the <gui>Remove This Column</gui> or <gui>Add a Column</gui> option.</p></item>
+</list>
+
+<p>Evolution allows you to sort your messages using these columns. Just click on the column label to sort the emails. The direction of the arrow next to the label indicates the direction of the sort.</p>
+</section>
+
+<section id="sort options">
+<title>Using Other Sorting Options</title>
+<p>Evolution provides other ways for sorting email messages. You can use Sort By, Sort Ascending, Sort Descending, or Unsort.</p>
+	<section>
+	<title>Sort By</title>
+		<p>You can also sort email messages using the <gui>Sort By</gui> list.</p>
+		<steps>
+		<item><p>Right-click on the message list column headers.</p></item>
+		<item><p>Select the <gui>Sort By</gui> option.</p><p>This brings up this list of criteria for sorting email messages:</p>
+			<list>
+			<item><p>Subject - Trimmed</p></item>
+			<item><p>Labels</p></item>
+			<item><p>Recipients</p></item>
+			<item><p>Sender</p></item>
+			<item><p>Location</p></item>
+			<item><p>Due By</p></item>
+			<item><p><link xref="mail-follow-up-flag">Follow Up Flag</link></p></item>
+			<item><p>Flag Status</p></item>
+			<item><p>Size</p></item>
+			<item><p>To</p></item>
+			<item><p>Received</p></item>
+			<item><p>Date</p></item>
+			<item><p>Subject</p></item>
+			<item><p>From</p></item>
+			<item><p>Attachment</p></item>
+			<item><p>Flagged</p></item>
+			<item><p>Status</p></item>
+			<item><p>Custom</p></item>
+			</list>
+		</item>
+		<item><p>Select the option you wish to use in sorting email messages.</p></item>
+		</steps>
+	</section>
+
+	<section>
+	<title>Sort Ascending</title>
+		<steps>
+		<item><p>Right-click on the message list column headers.</p></item>
+		<item><p>Select the <gui>Sort Ascending</gui> option.</p></item>
+		</steps>
+		<p>The messages will be displayed with the most recent at the bottom.</p>
+	</section>
+
+	<section>
+	<title>Sort Descending</title>
+		<steps>
+		<item><p>Right-click on the message list column headers.</p></item>
+		<item><p>Select the <gui>Sort Descending</gui> option.</p></item>
+		</steps>
+		<p>The messages will be displayed with the most recent at the top.</p>
+	</section>
+
+	<section>
+	<title>Unsort</title>
+		<steps>
+		<item><p>Right-click on the message list column headers.</p></item>
+		<item><p>Select the <gui>Unsort</gui> option.</p></item>
+		</steps>
+		<p>This removes sorting from the column, reverting to the order of messages as they were added to the folder.</p>
+	</section>
+</section>
+
+</page>
+
+
diff --git a/help/C/mail-spam-groupwise-add-to-list.page b/help/C/mail-spam-groupwise-add-to-list.page
new file mode 100644
index 0000000000..b90aa4e0e1
--- /dev/null
+++ b/help/C/mail-spam-groupwise-add-to-list.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-spam-groupwise-add-to-list">
+
+  <info>
+    <desc>How to add an email address to your junk mail list in Novell Groupwise.</desc>
+
+    <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2011-01-21" status="review"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwjg6 -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Adding an Email Address to Your Junk List</title>
+<steps>
+<item><p>Right-click on a message and select the <gui>Junk Mail Settings</gui> option.</p></item>
+<item><p>Type in the email address you wish to block in the <gui>Email</gui> field.</p></item>
+<item><p>Click <gui style="button">Add</gui> and then click on the <gui style="button">OK</gui> button.</p></item>
+</steps>
+
+<note><p>Remember, when you mark an item as junk in GroupWise, that item is added to your junk list in the GroupWise system. The settings in the GroupWise system are applied from computer to computer.</p></note>
+
+</page>
diff --git a/help/C/mail-spam-groupwise-manage-list.page b/help/C/mail-spam-groupwise-manage-list.page
new file mode 100644
index 0000000000..3082ca334d
--- /dev/null
+++ b/help/C/mail-spam-groupwise-manage-list.page
@@ -0,0 +1,34 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-spam-groupwise-manage-list">
+
+  <info>
+    <desc>How to manage your junk mail list in Novell Groupwise.</desc>
+
+    <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2011-01-21" status="review"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwfgd -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Enabling or Disabling Your Junk Mail List</title>
+<steps>
+<item><p>Right-click on a message and select the <gui>Junk Mail Settings</gui> option.</p></item>
+<item><p>Specify whether you wish to Enable or Disable junk mail handling.</p></item>
+<item><p>Click on the <gui style="button">OK</gui> button.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/mail-spam-groupwise-mark-message.page b/help/C/mail-spam-groupwise-mark-message.page
new file mode 100644
index 0000000000..5157dd2bec
--- /dev/null
+++ b/help/C/mail-spam-groupwise-mark-message.page
@@ -0,0 +1,28 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-spam-groupwise-mark-message">
+
+  <info>
+    <desc>How to mark a message in Novell Groupwise as junk.</desc>
+
+    <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+    <revision pkgversion="2.28.3" version="0.2" date="2011-07-28" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwfae -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Marking a Message As Junk Mail</title>
+
+<p>Select the message to mark as junk, then click the <gui>Junk</gui> button or press <keyseq><key>Ctrl</key><key>J</key></keyseq>.</p>
+<p>The message is moved to your Junk Mail folder and the user is added to your junk list.</p>
+
+</page>
diff --git a/help/C/mail-spam-groupwise-remove-from-list.page b/help/C/mail-spam-groupwise-remove-from-list.page
new file mode 100644
index 0000000000..348274f4ae
--- /dev/null
+++ b/help/C/mail-spam-groupwise-remove-from-list.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-spam-groupwise-remove-from-list">
+
+  <info>
+    <desc>How to remove an email address from your junk mail list in Novell Groupwise.</desc>
+
+    <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+    <revision pkgversion="2.28.3" version="0.2" date="2011-07-28" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwk0f -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Removing an Email Address from Your Junk List</title>
+
+<steps>
+<item><p>Right-click a message, then click <gui>Junk Mail Settings</gui>.</p></item>
+<item><p>Select the email address to remove, then click <gui>Remove</gui>.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+</page>
diff --git a/help/C/mail-spam-groupwise-unmark-message.page b/help/C/mail-spam-groupwise-unmark-message.page
new file mode 100644
index 0000000000..b342a543b4
--- /dev/null
+++ b/help/C/mail-spam-groupwise-unmark-message.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-spam-groupwise-unmark-message">
+
+  <info>
+    <desc>How to mark a message in Novell Groupwise as not junk.</desc>
+
+    <link type="guide" xref="mail-spam#mail-spam-groupwise" />
+
+    <revision pkgversion="2.28.3" version="0.2" date="2011-07-28" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/bxqwde6.html.en#bxqwhft -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Marking a Message As Not Junk Mail</title>
+
+<steps>
+<item><p>Select the message to mark as not junk in your Junk Mail folder.</p></item>
+<item><p>Right-click the message, then click <gui>Mark as Not Junk</gui>, or select the message and press <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>.</p></item>
+</steps>
+
+<p>The message is moved to your Mailbox folder and the name is removed from your junk list.</p>
+
+</page>
diff --git a/help/C/mail-spam-marking.page b/help/C/mail-spam-marking.page
new file mode 100644
index 0000000000..9ec9b619ff
--- /dev/null
+++ b/help/C/mail-spam-marking.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-spam-marking">
+
+  <info>
+    <desc>How to mark unwanted junk and spam mail.</desc>
+
+    <link type="guide" xref="mail-spam" />
+
+    <revision pkgversion="2.32.1" version="0.2" date="2011-01-04" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Barbara Tobias</name>
+      <email>barbtobias09@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-organize-spam.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Marking Junk Mail</title>
+<p>Evolution can check for junk mail for you. Evolution uses SpamAssassin and/or Bogofilter with trainable Bayesian filters to perform the spam check. When the software detects mail that appears to be junk mail, it will flag it and hide it from your view. Messages that are flagged as junk mail are displayed only in the Junk folder.</p>
+<p>The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it by marking as junk incoming mail that you determine is spam. When you first start using junk mail blocking, check the Junk folder frequently to be sure that legitimate mail doesn't get flagged as junk mail.</p>
+<p>If legitimate mail is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting <gui>Mark as Not Junk</gui> or pressing <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>. If Evolution misses junk mail, right-click the message, then click Mark as Junk or press <keyseq><key>Ctrl</key><key>J</key></keyseq>. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on.</p>
+<p>You can also flag mail as junk by selecting it and clicking the Junk icon in the menu bar; you can flag mail in the junk folder as "Not Junk" by selecting it and clicking the <gui>Not Junk</gui> icon.</p>
+<p>Each time you flag a message as Junk, the sender is added to your Spam List; each time you flag a message as Not Junk, the sender is removed from your Spam List.</p>
+</page>
diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
new file mode 100644
index 0000000000..b49dda6bf4
--- /dev/null
+++ b/help/C/mail-spam-settings.page
@@ -0,0 +1,61 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-spam-settings">
+
+  <info>
+    <desc>How to set up handling unwanted junk and spam mail.</desc>
+
+    <link type="guide" xref="mail-spam" />
+    <link type="seealso" xref="mail-spam-marking"/>
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-mail.html.en#mail-prefs-junk -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Junk Mail Settings</title>
+
+<p>Evolution lets you check for unwanted junk or spam emails by using the Bogofilter or SpamAssassin tools. To use these tools, you need to make sure that they are installed via the software management tool of your distribution and you need enable their respective plugins.</p>
+<p><link action="install:bogofilter" href="http://bogofilter.sourceforge.net/">Install bogofilter now.</link></p>
+<p><link action="install:spamassassin" href="http://spamassassin.apache.org/">Install spamassassin now.</link></p>
+
+<p>To enable the plugins:</p>
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>.</p></item>
+<item><p>Select the plugins you wish to enable. You can select either Bogofilter or SpamAssassin, or both.</p></item>
+<item><p>Click <gui>Close</gui>.</p></item>
+</steps>
+
+<section id="preferences">
+<title>Junk Mail Preferences</title>
+<p>You can modify how Evolution handles junk mail by changing the Junk Mail Preferences:</p>
+<steps>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>.</p></item>
+<item><p>Select <gui>Mail Preferences</gui>.</p></item>
+<item><p>Click on the <gui>Junk</gui> tab. Here, you can specify the following:</p>
+<list>
+<item><p>Checking incoming mail for junk messages.</p></item>
+<item><p>Deleting junk messages upon exit, and how often junk messages are to be deleted.</p></item>
+<item><p>Checking custom headers for junk.</p></item>
+<item><p>Marking messages as junk if the sender is in the address book.</p></item>
+<item><p>The default junk filter.</p></item>
+<item><p>Bogofilter and SpamAssassin options. These options are available only if the plugins are enabled.</p></item>
+</list>
+</item>
+</steps>
+</section>
+
+<note style="tip"><p>The junk mail options discussed in this page refer only to POP and Local Delivery. For handling junk mails on IMAP, see the Evolution settings under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>.</p></note>
+</page>
diff --git a/help/C/mail-spam.page b/help/C/mail-spam.page
new file mode 100644
index 0000000000..4ce3b8f860
--- /dev/null
+++ b/help/C/mail-spam.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="mail-spam">
+
+  <info>
+    <desc>How to automatically handle unwanted mail.</desc>
+
+    <link type="guide" xref="index#mail-basic" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2010-12-09" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Junk and Spam Mail Handling</title>
+
+  <section id="mail-spam-groupwise" style="2column">
+    <title>Novell Groupwise specific differences</title>
+<!-- TODO:POST-3-2: Not sure if that is a good place for Groupwise stuff, plus should depend on whether Groupwise is actually installed -->
+  </section>
+
+</page>
diff --git a/help/C/mail-two-trash-folders.page b/help/C/mail-two-trash-folders.page
new file mode 100644
index 0000000000..38090f14f7
--- /dev/null
+++ b/help/C/mail-two-trash-folders.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-two-trash-folders">
+
+  <info>
+    <desc>An explanation for the problem that two trash folders are present in Evolution.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="2.28.3" version="0.1" date="2010-10-09" status="final"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Two Trash folders shown for the same account</title>
+
+<p>You may have created another Trash folder to hold all your deleted email messages. This can happen when you use another email client together with Evolution.</p>
+
+<p>Evolution's <gui>Trash</gui> folder is a <link xref="mail-search-folders">Search folder</link>. It does not really exist but simply displays all the messages that are marked for deletion in any folders of that account.</p>
+
+<p>You can easily tell the two Trash folders apart by looking at their icons. The Evolution <gui>Trash</gui> folder has a special icon whereas the other physical Trash folder looks like any other folder.</p>
+
+<note>
+<p>Note that the <gui>Junk</gui> folder is also a search folder and may also appear twice.</p>
+</note>
+
+</page>
diff --git a/help/C/mail-usenet-subscriptions.page b/help/C/mail-usenet-subscriptions.page
new file mode 100644
index 0000000000..e2c552dc44
--- /dev/null
+++ b/help/C/mail-usenet-subscriptions.page
@@ -0,0 +1,35 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-usenet-subscriptions">
+
+  <info>
+    <desc>Subscribing to Usenet newsgroups.</desc>
+    
+    <link type="guide" xref="mail-account-manage-usenet-news#other-settings"/>
+    <link type="seealso" xref="mail-imap-subscriptions"/>
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#usage-mail-getnsend-get-news -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+
+<title>Newsgroups Subscriptions</title>
+
+<p>When you create a newsgroup account, you are not subscribed to any groups. To subscribe to a newsgroup:</p>
+<steps>
+<item><p>Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>.</p></item>
+<item><p>If you have accounts on multiple servers, select the server where you want to manage your subscriptions.</p></item>
+<item><p>Click a group's checkbox to add a folder to your subscriptions.</p></item>
+</steps>
+
+</page>
+
diff --git a/help/C/mail-vertical-view.page b/help/C/mail-vertical-view.page
new file mode 100644
index 0000000000..32bd1bda6e
--- /dev/null
+++ b/help/C/mail-vertical-view.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-vertical-view">
+
+  <info>
+    <desc>Changing the mail view for widescreen displays.</desc>
+    <link type="guide" xref="mail-layout-changing" />
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+   <credit type="author">
+     <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-read.html.en#b131ni8g -->
+   </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+  <title>Vertical view</title>
+
+<p>Evolution provides a vertical view in addition to the classical view. In the vertical view, the message preview pane is located at the right side of the message list when compared to the classical view where the message preview pane is placed below the message list. Vertical view enables you to use the extra width of wide screen monitors.</p>
+
+<p>To switch to vertical view, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Vertical View</gui></guiseq>.</p>
+
+<p>In vertical view, the message list contains double lines of compressed headers, which enables you to consume the extra width in the preview column. The compressed columns have Sender Name and Email, Attachment Icon, Date and Subject in the second line.</p>
+
+<p>To switch back to classical view, click <guiseq><gui>View</gui><gui>Preview</gui><gui>Classical View</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/mail-word-wrap.page b/help/C/mail-word-wrap.page
new file mode 100644
index 0000000000..361d39b535
--- /dev/null
+++ b/help/C/mail-word-wrap.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-word-wrap">
+
+  <info>
+    <desc>Words are wrapped in outgoing mails at 72 characters.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Words are wrapped in outgoing mails at 72 characters</title>
+
+<p>For better readability lines are wrapped after 72 characters. This value is hardcoded and cannot be changed.</p>
+<p>To avoid line breaks within a paragraph, mark the paragraph and choose <guiseq><gui>Format</gui><gui>Paragraph Style</gui><gui>Preformatted</gui></guiseq> in the mail composer.</p>
+
+</page>
diff --git a/help/C/mail-working-offline.page b/help/C/mail-working-offline.page
new file mode 100644
index 0000000000..df21f876b4
--- /dev/null
+++ b/help/C/mail-working-offline.page
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-working-offline">
+
+  <info>
+    <desc>Work with your mail while not being connected to the network.</desc>
+<!-- TODO:POST-3-2: Offline work for web calendars etc also exists => create index page for Offline working? -->
+    <link type="guide" xref="index#mail-basic" />
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-offline -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Working Offline</title>
+
+<p>Offline mode helps you communicate with remote mail storage systems like GroupWise, IMAP or Exchange, in situations where you are not connected to the network at all times. Evolution keeps a local copy of one or more folders to allow you to compose messages, storing them in your Outbox to be sent the next time you connect.</p>
+
+<p>POP mail downloads all messages to your local system, but other connections usually download just the headers, and get the rest only when you want to read the message. Before you go offline, Evolution downloads the unread messages from the folders you have chosen to store.</p>
+
+<section id="mark-folders">
+<title>Marking folders for offline usage</title>
+<p>To mark a mail folder for offline use,</p>
+<steps>
+<item><p>Right-click the folder, then click <gui>Properties</gui>.</p></item>
+<item><p>Click <gui>Copy folder content locally for offline operation</gui>.</p></item>
+</steps>
+</section>
+
+<section id="sync-for-offline">
+<title>Syncing messages for offline usage</title>
+<p>Your connection status is shown by the small icon in the lower left corner of the Evolution main window. When you are online, it displays two connected cables. When you go offline via clicking the icon or via <guiseq><gui>File</gui><gui>Work Offline</gui></guiseq>, the cables separate. You will be asked whether you want to go offline immediately or synchronize folders locally before you go offline.</p>
+<p>To download Messages for Offline Operations without immediately going offline, select <guiseq><gui>File</gui><gui>Download Messages for Offline Usage</gui></guiseq>.</p>
+</section>
+
+<section id="network-manager-integration">
+<title>Automatic Network State Handling</title>
+<p>Evolution automatically understands the network state and acts accordingly. For instance, Evolution switches to offline mode when the network goes down and automatically switches on when the network is up again. Ensure that your system has Network Manager installed on to enable this feature.</p>
+</section>
+
+</page>
diff --git a/help/C/mail-wrong-fonts-in-3-0.page b/help/C/mail-wrong-fonts-in-3-0.page
new file mode 100644
index 0000000000..7d0d8e5b10
--- /dev/null
+++ b/help/C/mail-wrong-fonts-in-3-0.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="mail-wrong-fonts-in-3-0">
+
+  <info>
+    <desc>A known problem that is fixed in newer versions.</desc>
+    
+    <link type="guide" xref="index#common-mail-problems" />
+    <link type="seealso" xref="mail-displaying-message" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Message fonts are not the same fonts as in other applications</title>
+
+<p>It can happen that <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Message Fonts</gui><gui>Use the same fonts as other applications</gui></guiseq> is enabled but Evolution still uses different fonts than other parts of the system.</p>
+
+<p>This bug is fixed in Evolution versions higher than 3.0.2 (stable series) and 3.1.3 (unstable development series). If this is not the case, please add a comment to the corresponding <link href="https://bugzilla.gnome.org/show_bug.cgi?id=655002">bug report</link>.</p>
+
+</page>
diff --git a/help/C/memos-searching.page b/help/C/memos-searching.page
new file mode 100644
index 0000000000..3d3b5e0c51
--- /dev/null
+++ b/help/C/memos-searching.page
@@ -0,0 +1,80 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"

+      type="topic" id="memos-searching">

+

+  <info>

+    <desc>Searching memos.</desc>

+    

+    <link type="guide" xref="searching-items" />

+    <link type="guide" xref="tasks-organizing" />

+

+    <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft"/>

+    <credit type="author">

+      <name>Max Vorobuov</name>

+      <email>vmax0770@gmail.com</email>

+    </credit>

+    <credit type="author">

+      <name>Andre Klapper</name>

+      <email>ak-47@gmx.net</email>

+    </credit>

+    <credit type="author">

+      <name>Novell, Inc</name>

+    </credit>

+    <license>

+      <p>Creative Commons Share Alike 3.0</p>

+    </license>    

+

+  </info>

+

+<title>Searching Memos</title>

+<section id="quick-search">

+<title>Quick Search</title>

+<p>In the Memos view, you can quickly search for memos either by summary or by category.</p>

+<p>Searching by summary:</p>

+<steps>

+<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>

+<item><p>Select the search condition from the list.</p></item>

+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>

+<item><p>Evolution displays the search results.</p></item>

+</steps>

+<p>Searching by category:</p>

+<steps>

+<item><p>Click the <gui>Show</gui> drop-down list.</p></item>

+<item><p>Select the category from the list.</p></item>

+<item><p>Evolution displays the search results.</p></item>

+</steps>

+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>

+</section>

+

+<section id="advanced-search">

+<title>Advanced Search</title>

+<steps>

+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>

+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>

+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>

+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>

+</steps>

+</section>

+

+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->

+<section id="clearing-search">

+<title>Clearing the Search results</title>

+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>

+</section>

+

+<section id="saved-searches">

+<title>Saved Searches</title>

+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>

+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>

+</section>

+

+<section id="editing-a-saved-search">

+<title>Editing a Saved Search</title>

+<steps>

+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>

+<item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>

+<item><p>Edit the title or search conditions from the dialog box.</p></item>

+<item><p>Click <gui>OK</gui>.</p></item>

+</steps>

+</section>

+ 

+</page>

diff --git a/help/C/memos-usage-add-memo.page b/help/C/memos-usage-add-memo.page
new file mode 100644
index 0000000000..68dc446052
--- /dev/null
+++ b/help/C/memos-usage-add-memo.page
@@ -0,0 +1,53 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="memos-usage-add-memo">
+
+  <info>
+    <desc>Adding a memo to your memo list.</desc>
+    
+    <link type="guide" xref="memos-usage" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/b15iirao.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Adding a Memo</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Memo</gui></guiseq>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>O</key></keyseq>.</p></item>
+<item><p>Select a memo list in the <gui>List</gui> dropdown list.</p></item>
+<item><p>Enter the memo information.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+
+<p>If you just want to quickly add a memo by entering a summary you can directly enter it in the list of memos.</p>
+
+<note><p>You can also define a <link xref="using-categories">category</link>, or a <link xref="calendar-classifications">classification</link> for the memo, or add an attachment.</p></note>
+
+<section id="shared-memos">
+<title>Shared Memos</title>
+
+<p>Shared Memos are like mail messages except they are scheduled for a particular day and appear on the calendar for that date. You can use shared memos to show vacations, holidays, pay days, birthdays, and so on. Posted shared memos are placed in your Calendar on the date you specify. They are not placed in your Mailbox or in any other user's Mailbox.</p>
+
+<p>To send a Shared Memo,</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Shared Memo</gui></guiseq>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>H</key></keyseq>.</p></item>
+<item><p>Select the Organizer's account name from the drop-down list given next to the Organizer field.</p></item>
+<item><p>In the To field, type a username, then press Enter. Repeat this for additional users.</p></item>
+<item><p>Select the task list (under <gui>List</gui>) in which you would like to create the entry.</p></item>
+<item><p>Enter a brief summary in the Summary field.</p></item>
+<item><p>In the Start Date field, type the date this shared memo should appear in the recipients' calendars.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+</section>
+
+</page>
diff --git a/help/C/memos-usage-delete-memo.page b/help/C/memos-usage-delete-memo.page
new file mode 100644
index 0000000000..cfb874807e
--- /dev/null
+++ b/help/C/memos-usage-delete-memo.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="memos-usage-delete-memo">
+
+  <info>
+    <desc>Deleting a memo from your memo list.</desc>
+    
+    <link type="guide" xref="memos-usage" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Deleting a Memo</title>
+
+<p>If you want to delete a memo in your memo lists, right-click on the memo and select <gui>Delete</gui>, or click on the task and click <gui>Delete</gui> in the tool bar, or click <guiseq><gui>Edit</gui><gui>Delete Memo</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/memos-usage-edit-memo.page b/help/C/memos-usage-edit-memo.page
new file mode 100644
index 0000000000..5dacae9ba6
--- /dev/null
+++ b/help/C/memos-usage-edit-memo.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="memos-usage-edit-memo">
+
+  <info>
+    <desc>Editing a memo in your memo list.</desc>
+    
+    <link type="guide" xref="memos-usage" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Editing a Memo</title>
+
+<p>If you want to change a memo that already exists in your memo lists,</p>
+
+<steps>
+<item><p>Double-click on the memo that you want to edit in the list of contacts, or right-click on the task and click <key>Open Memo</key>.</p></item>
+<item><p>Edit the memo information.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+</page>
diff --git a/help/C/memos-usage.page b/help/C/memos-usage.page
new file mode 100644
index 0000000000..fe834606ce
--- /dev/null
+++ b/help/C/memos-usage.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="memos-usage">
+
+  <info>
+    <desc>On adding, editing, and deleting memos.</desc>
+    
+    <link type="guide" xref="index#memos-and-tasks" />
+
+    <revision pkgversion="2.32.1" version="0.1" date="2010-10-12" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Add, Edit and Delete Memos</title>
+
+<note style="tip"><p>Currently there is no support for syncing memos with the Tomboy or Gnote applications.</p></note>
+<!-- TODO:POST-3-2: Periodically recheck status of https://bugzilla.gnome.org/show_bug.cgi?id=469217 -->
+
+</page>
diff --git a/help/C/minimize-to-system-tray.page b/help/C/minimize-to-system-tray.page
new file mode 100644
index 0000000000..f8ec4be7e5
--- /dev/null
+++ b/help/C/minimize-to-system-tray.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="minimize-to-system-tray">
+
+  <info>
+    <desc>On minimizing Evolution to the notification area.</desc>
+    
+    <link type="guide" xref="index#common-other-problems" />
+
+    <revision pkgversion="3.0.2" version="0.3" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>April Gonzales</name>
+      <email>loonycookie@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+
+<title>Minimizing Evolution to the system tray</title>
+
+<p>GNOME, by default, has a <link xref="mail-received-notification">notification area</link> which includes an applet that informs users of any system updates, changes, or events. This includes the arrival of email messages on Evolution. You can refer to this built-in feature of GNOME for any email notifications.</p>
+
+<p>In GNOME version 2 you may modify the notification area and set it up to become a system tray by using external software such as <link href="http://alltray.trausch.us/"> Alltray</link> that might be available for installation in the software management tool of your distribution. This is not possible in GNOME 3 anymore.</p>
+</page>
+
diff --git a/help/C/organizing.page b/help/C/organizing.page
new file mode 100644
index 0000000000..01ac26b450
--- /dev/null
+++ b/help/C/organizing.page
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="organizing">
+
+  <info>
+    <desc>On organizing and finding your data in Evolution.</desc>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Sorting and organizing</title>
+
+</page>
diff --git a/help/C/problems-debug-how-to.page b/help/C/problems-debug-how-to.page
new file mode 100644
index 0000000000..2a67490fdf
--- /dev/null
+++ b/help/C/problems-debug-how-to.page
@@ -0,0 +1,31 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="problems-debug-how-to">
+
+  <info>
+    <desc>How to provide good information when tracking down a problem.</desc>
+    
+    <link type="guide" xref="index#tracking-down-problems" />
+    <link type="seealso" xref="problems-getting-help" />
+
+    <revision pkgversion="3.0.2" version="0.3" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>How to track down a problem</title>
+
+<p>As a first hint, error messages will be either displayed in the statusbar or between the tool bar and the search bar.</p>
+
+<p>To further track down a problem, some debug options are listed on the <link href="http://projects.gnome.org/evolution/bugs.shtml">Evolution project website</link>.</p>
+
+<p>To contact the Evolution community for help, please see <link xref="problems-getting-help">How to get help</link>.</p>
+
+<!-- Debug logs as described in http://library.gnome.org/users/evolution/2.32/b1a4ol61.html.en do not exist anymore in 3.0 -->
+</page>
+
diff --git a/help/C/problems-getting-help.page b/help/C/problems-getting-help.page
new file mode 100644
index 0000000000..be2eef1e16
--- /dev/null
+++ b/help/C/problems-getting-help.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="problems-getting-help">
+
+  <info>
+    <desc>How to get help for problems.</desc>
+    
+    <link type="guide" xref="index#tracking-down-problems" />
+    <link type="seealso" xref="problems-reporting-bugs" />
+
+    <revision pkgversion="2.32.1" version="0.3" date="2011-07-21" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+
+<title>How to get help</title>
+
+<p>To receive help on problems you can send an email to the <link href="http://mail.gnome.org/mailman/listinfo/evolution-list">Evolution mailing list</link> or ask a message in the IRC chat channel #evolution on the server irc.gimp.net.</p>
+
+</page>
+
diff --git a/help/C/problems-reporting-bugs.page b/help/C/problems-reporting-bugs.page
new file mode 100644
index 0000000000..eaa8349b67
--- /dev/null
+++ b/help/C/problems-reporting-bugs.page
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="problems-reporting-bugs">
+
+  <info>
+    <desc>How to report bugs.</desc>
+
+    <link type="guide" xref="index#tracking-down-problems"/>
+    <link type="seealso" xref="problems-debug-how-to" />
+
+    <revision pkgversion="3.1.5" version="0.4" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+  <title>How to report bugs</title>
+
+<p>If you do not need help for configuration but you are sure that you have found a bug in the Evolution software, or if you want to request a feature you can file a bug report in the <link href="http://bugzilla.gnome.org">GNOME bug tracking system</link>. Note that this requires registration first. Please try to avoid filing duplicates and check the <link href="https://bugzilla.gnome.org/page.cgi?id=bug-writing.html">bug writing guidelines</link> first.</p><p>Also note that GNOME distributions sometimes introduce their own changes in Evolution that are not included in GNOME Evolution. This is hard to recognize for users but if you are aware of it please file a bug report in <link xref="https://live.gnome.org/Bugsquad/TriageGuide/NonGnome#Bug_trackers_for_distributions">the bug tracker of your GNOME distribution</link> instead.</p>
+
+</page>
diff --git a/help/C/searching-items.page b/help/C/searching-items.page
new file mode 100644
index 0000000000..1c2c7f4b6d
--- /dev/null
+++ b/help/C/searching-items.page
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="searching-items">
+
+  <info>
+    <desc>Searching content and data within <em>Evolution</em>.</desc>
+
+    <revision pkgversion="2.32.1" version="0.1" date="2010-12-12" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Searching items</title>
+
+</page>
diff --git a/help/C/sync-with-other-devices.page b/help/C/sync-with-other-devices.page
new file mode 100644
index 0000000000..4f5397b9b9
--- /dev/null
+++ b/help/C/sync-with-other-devices.page
@@ -0,0 +1,66 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="sync-with-other-devices">
+
+  <info>
+    <desc>Synchronize Evolution data with handheld devices and mobile phones.</desc>
+
+    <link type="guide" xref="index#data-migration-and-sync"/>
+
+    <revision pkgversion="2.30.2" version="0.2" date="2010-12-11" status="draft"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-sync.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+<!-- TODO:POST-3-2: Find out how to sync modern devices, e.g. Android, iPhone, Nokia N97 / N900, N9, N950, etc. Maybe SyncEvolution is the recommended (and external) way here? -->
+  </info>
+
+  <title>Synchronize <em>Evolution</em> with other devices</title>
+
+<p>There are currently no "recommended instructions" for users.</p>
+
+<p>Many distributions provide the application <link href="http://syncevolution.org/">SyncEvolution</link> that can be used in combination with devices that support <link href="https://secure.wikimedia.org/wikipedia/en/wiki/SyncML">SyncML</link>.<!-- Buteo development seems to have slowed down, hence commenting this section - AndreKlapper, 2011/05/14: Also <link href="http://wiki.meego.com/Buteo">Buteo</link> aims to provide that functionality. A technical comparison of Buteo with SyncEvolution can be found <link href="http://meego.com/sites/all/files/meego-sync-linuxcon-2010.pdf">here on slide #18</link>. --></p>
+
+<p>Another option might be to use applications and devices that both support the <link href="https://secure.wikimedia.org/wikipedia/en/wiki/ActiveSync">ActiveSync protocol</link>. A <link href="https://secure.wikimedia.org/wikipedia/en/wiki/List_of_collaborative_software">list of collaborative software</link> is available on Wikipedia.</p>
+
+ <p>If you can provide good practices or more information on this topic feel free to file a bug report in <link href="https://bugzilla.gnome.org/enter_bug.cgi?product=evolution&amp;component=User%20Documentation">GNOME's bug tracking system</link>.</p>
+
+  <section id="palm">
+    <title>Palm</title>
+<p>To synchronize with a Palm OS device like the PalmPilot(TM) and the Handspring Visor several steps are needed: First, you need to enable synchronization. Second, your computer needs to recognize and access your handheld. Third, you should decide what sort of synchronization behavior you want.</p>
+    <section id="sync-enabling-palm">
+      <title>Enabling Synchronization</title>
+      <p>If you have not used a handheld device with your computer before, you need to configure it via <guiseq><gui>Edit</gui><gui>GNOME Pilot Synchronization...</gui></guiseq>. Make sure that you have read and write permissions on the device, which is normally in <file>/dev/pilot</file>. If that does not work, check in <file>/dev/ttyS0</file> if you have a serial connection, or in <file>/dev/ttyUSB1</file> for a USB connection. You can do this by becoming root user and adding your username to the group that owns this device node. For a USB device on sync, two device nodes are created, <file>ttyUSB0</file> and <file>ttyUSB1</file>. The second node is the one to be used in configuring the device.</p>
+   </section>
+   <section id="sync-selecting-conduits-">
+     <title>Selecting Conduits</title>
+     <p>After your computer and your Palm OS device are communicating, select the conduits you want under the <gui>Pilot Conduits</gui> section. You can use conduits to synchronize data with several applications; the Evolution conduits are labeled <gui>EAddress</gui> for the contacts in your address book; <gui>ECalendar</gui> for your calendar; and <gui>ETodo</gui> for your task list.</p>
+     <p>Click <gui>Enable</gui>, then click <gui>Settings</gui> to change what the conduit does when activated. Your options can vary depending on the conduit, but typically they are as follows:</p>
+     <list>
+       <item><p><gui>Disabled</gui>: Do nothing.</p></item>
+       <item><p><gui>Synchronize</gui>: Copy new data from the computer to the handheld, and from the handheld to the computer. Remove items that were on both systems but have been deleted on one.</p></item>
+       <item><p><gui>Copy From Pilot</gui>: If there is any new data on the handheld device, copy it to the computer.</p></item>
+       <item><p><gui>Copy To Pilot</gui>: Copy new data from the computer to the handheld.</p></item>
+     </list>
+   <p>Select the behavior you want for each conduit you choose to use. If you're not sure, use <gui>Synchronize</gui>.</p>
+  </section>
+
+  <section id="sync-information">
+   <title>Synchronizing Information</title>
+   <p>Use the following procedure to synchronize the data on your Palm OS device with the data you store in Evolution.</p>
+   <list>
+     <item><p>If you want to back up your information before synchronizing, make a copy of the <file>.local/share/evolution</file> directory inside your home directory.</p></item>
+     <item><p>Put your handheld device in its cradle and press the <gui style="button">HotSync</gui> button.</p></item>
+     <item><p>If you use Palm OS version 4.0 and have password protection turned on for your handheld device, you might encounter trouble synchronizing. If this happens, try turning off password protection on your handheld, synchronize it with your desktop computer, and then re-enable password protection on your handheld.</p></item>
+    </list>
+   <p>Now your Palm OS device will synchronize data with Evolution.</p>
+  </section>
+
+  </section>
+
+</page>
diff --git a/help/C/tasks-caldav.page b/help/C/tasks-caldav.page
new file mode 100644
index 0000000000..b81f119b5b
--- /dev/null
+++ b/help/C/tasks-caldav.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="tasks-caldav">
+
+  <info>
+    <desc>Using an online CalDAV task list or memo list.</desc>
+    
+    <link type="guide" xref="tasks-using-several-tasklists"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Using a CalDAV task or memo list</title>
+
+<p>To add such a task list or memo list to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or <guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On the Web</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter the address of the list in the <gui>URL</gui> field.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Enter your username and your email address.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The task list will be added to the list of task lists in Evolution.</p>
+
+</page>
diff --git a/help/C/tasks-display-settings.page b/help/C/tasks-display-settings.page
new file mode 100644
index 0000000000..586a0d19b5
--- /dev/null
+++ b/help/C/tasks-display-settings.page
@@ -0,0 +1,40 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="tasks-display-settings">
+
+  <info>
+    <desc>Options for displaying task completion and due dates.</desc>
+    
+    <link type="guide" xref="index#memos-and-tasks"/>
+
+    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bshpsxa -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Displaying of tasks</title>
+
+<!-- TODO:POST-3-2: Just listing the partially busted UI options (also see calendar-layout-appointment-display) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
+
+<!-- TODO: Update once https://bugzilla.gnome.org/show_bug.cgi?id=655666 is fixed -->
+
+<p>The following task-related options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Display</gui><gui>Task List</gui></guiseq>.</p>
+
+<list>
+<item><p>Tasks due today:</p>
+<p>Select the color for tasks due today.</p></item>
+<item><p>Overdue tasks:</p>
+<p>Select the color for overdue tasks.</p></item>
+<item><p>Hide completed tasks after:</p>
+<p>Select this option to have completed tasks hidden after a period of time measured in days, hours, or minutes. If you do not select this option, completed tasks remain in your task list, marked as complete.</p></item>
+</list>
+
+</page>
diff --git a/help/C/tasks-local.page b/help/C/tasks-local.page
new file mode 100644
index 0000000000..d2859d5ac9
--- /dev/null
+++ b/help/C/tasks-local.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="tasks-local">
+
+  <info>
+    <desc>Adding another local task or memo list.</desc>
+    
+    <link type="guide" xref="tasks-using-several-tasklists"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Adding another local task or memo list</title>
+
+<p>To add another local task list to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or <guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On This Computer</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The task list will be added to the list of task lists in Evolution.</p>
+
+</page>
diff --git a/help/C/tasks-organizing.page b/help/C/tasks-organizing.page
new file mode 100644
index 0000000000..d0000db564
--- /dev/null
+++ b/help/C/tasks-organizing.page
@@ -0,0 +1,23 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="tasks-organizing">
+
+  <info>
+    <desc>On task and memo lists, searching, and categories.</desc>
+
+    <link type="guide" xref="index#memos-and-tasks" />
+    <link type="guide" xref="organizing" />
+
+    <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Sorting and organizing tasks and memos</title>
+
+</page>
diff --git a/help/C/tasks-searching.page b/help/C/tasks-searching.page
new file mode 100644
index 0000000000..29d6cdd3fe
--- /dev/null
+++ b/help/C/tasks-searching.page
@@ -0,0 +1,80 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"

+      type="topic" id="tasks-searching">

+

+  <info>

+    <desc>Searching tasks.</desc>

+    

+    <link type="guide" xref="searching-items" />

+    <link type="guide" xref="tasks-organizing" />

+

+    <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft"/>

+    <credit type="author">

+      <name>Max Vorobuov</name>

+      <email>vmax0770@gmail.com</email>

+    </credit>

+    <credit type="author">

+      <name>Andre Klapper</name>

+      <email>ak-47@gmx.net</email>

+    </credit>

+    <credit type="author">

+      <name>Novell, Inc</name>

+    </credit>

+    <license>

+      <p>Creative Commons Share Alike 3.0</p>

+    </license>    

+

+  </info>

+

+<title>Searching Tasks</title>

+<section id="quick-search">

+<title>Quick Search</title>

+<p>In the Tasks view, you can quickly search for tasks either by summary or by category.</p>

+<p>Searching by summary:</p>

+<steps>

+<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>

+<item><p>Select the search condition from the list.</p></item>

+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>

+<item><p>Evolution displays the search results.</p></item>

+</steps>

+<p>Searching by category:</p>

+<steps>

+<item><p>Click the <gui>Show</gui> drop-down list.</p></item>

+<item><p>Select the category from the list.</p></item>

+<item><p>Evolution displays the search results.</p></item>

+</steps>

+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>

+</section>

+

+<section id="advanced-search">

+<title>Advanced Search</title>

+<steps>

+<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>

+<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>

+<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>

+<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>

+</steps>

+</section>

+

+<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->

+<section id="clearing-search">

+<title>Clearing the Search results</title>

+<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>

+</section>

+

+<section id="saved-searches">

+<title>Saved Searches</title>

+<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>

+<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>

+</section>

+

+<section id="editing-a-saved-search">

+<title>Editing a Saved Search</title>

+<steps>

+<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p>.</item>

+<item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>

+<item><p>Edit the title or search conditions from the dialog box.</p></item>

+<item><p>Click <gui>OK</gui>.</p></item>

+</steps>

+</section>

+ 

+</page>

diff --git a/help/C/tasks-usage-add-task.page b/help/C/tasks-usage-add-task.page
new file mode 100644
index 0000000000..d573bfdb7b
--- /dev/null
+++ b/help/C/tasks-usage-add-task.page
@@ -0,0 +1,45 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="tasks-usage-add-task">
+
+  <info>
+    <desc>Adding a task to your task list.</desc>
+    
+    <link type="guide" xref="tasks-usage" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/stable/usage-calendar-todo.html.en#b1012vcx -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Adding a Task</title>
+
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task</gui></guiseq>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>T</key></keyseq>.</p></item>
+<item><p>Select a task list in the <gui>List</gui> dropdown list.</p></item>
+<item><p>Enter the task information.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+
+<p>If you just want to quickly add a task by entering a summary you can directly enter it in the list of tasks.</p>
+
+<note><p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, or a <link xref="calendar-classifications">classification</link> for the task, or add an attachment.</p></note>
+
+<section id="assigned-tasks">
+<title>Assigned Tasks</title>
+
+<p>Evolution can be used to assign a task to multiple people.</p>
+<p>When you assign a task, you can specify the attendees in several categories, such as "chair" or "required". When you save the task, each attendee is sent an email with the task information, which also gives them the option to respond.</p>
+<p>This is similar to <link xref="calendar-meetings-sending-invitation">meetings</link>.</p>
+<p>To create an Assigned Task, click <guiseq><gui>File</gui><gui>New</gui><gui>Assigned Task</gui></guiseq>.</p>
+</section>
+
+</page>
diff --git a/help/C/tasks-usage-delete-task.page b/help/C/tasks-usage-delete-task.page
new file mode 100644
index 0000000000..abde9fae67
--- /dev/null
+++ b/help/C/tasks-usage-delete-task.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="tasks-usage-delete-task">
+
+  <info>
+    <desc>Deleting a task from your task list.</desc>
+    
+    <link type="guide" xref="tasks-usage" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Deleting a Task</title>
+
+<p>If you want to delete a task in your task lists, right-click on the task and select <gui>Delete</gui>, or click on the task and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or click <guiseq><gui>Edit</gui><gui>Delete Task</gui></guiseq>.</p>
+
+</page>
diff --git a/help/C/tasks-usage-edit-task.page b/help/C/tasks-usage-edit-task.page
new file mode 100644
index 0000000000..0ccf108727
--- /dev/null
+++ b/help/C/tasks-usage-edit-task.page
@@ -0,0 +1,30 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="tasks-usage-edit-task">
+
+  <info>
+    <desc>Editing a task in your task list.</desc>
+    
+    <link type="guide" xref="tasks-usage" />
+
+    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Editing a Task</title>
+
+<p>If you want to change a task that already exists in your task lists,</p>
+
+<steps>
+<item><p>Double-click on the task that you want to edit in the list of contacts, or right-click on the task and click <key>Open Task</key>.</p></item>
+<item><p>Edit the task information.</p></item>
+<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
+</steps>
+
+</page>
diff --git a/help/C/tasks-usage.page b/help/C/tasks-usage.page
new file mode 100644
index 0000000000..669f986e01
--- /dev/null
+++ b/help/C/tasks-usage.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="tasks-usage">
+
+  <info>
+    <desc>On adding, editing, and deleting tasks.</desc>
+    
+    <link type="guide" xref="index#memos-and-tasks" />
+
+    <revision pkgversion="2.32.1" version="0.1" date="2010-10-12" status="stub"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Add, Edit, and Delete Tasks</title>
+
+</page>
diff --git a/help/C/tasks-using-several-tasklists.page b/help/C/tasks-using-several-tasklists.page
new file mode 100644
index 0000000000..4726a5f7ad
--- /dev/null
+++ b/help/C/tasks-using-several-tasklists.page
@@ -0,0 +1,28 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="guide" id="tasks-using-several-tasklists">
+
+  <info>
+    <desc>Adding and using more than one task list or memo list.</desc>
+
+    <link type="guide" xref="tasks-organizing" />
+
+    <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using several task lists or memo lists</title>
+
+<p>You can have multiple task or memo lists and overlay them one over the next. For example, you might have tasks for work, tasks for home, and tasks for the singing club that you are a member of. The side bar lists those lists, and you can select or deselect the boxes next to them to show and hide the tasks or memos in your view.</p>
+
+<p>Tasks and memos for each task or memo list appear as a different color.</p>
+
+<p>You can also use lists that are not on your computer, such as on the internet.</p>
+
+</page>
diff --git a/help/C/tasks-webdav.page b/help/C/tasks-webdav.page
new file mode 100644
index 0000000000..cec7953efc
--- /dev/null
+++ b/help/C/tasks-webdav.page
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="tasks-webdav">
+
+  <info>
+    <desc>Using an online WebDAV task list or memo list.</desc>
+    
+    <link type="guide" xref="tasks-using-several-tasklists"/>
+
+    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Using a WebDAV task or memo list</title>
+
+<p>Lists of this type are read-only.</p>
+
+<p>To add such a task list or memo list to Evolution, perform the following steps:</p>
+<steps>
+<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or <guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>.</p></item>
+<item><p>Select the type <gui>On the Web</gui>.</p></item>
+<item><p>Enter a name that you prefer.</p></item>
+<item><p>Optionally choose a color that you prefer.</p></item>
+<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
+<item><p>Enter the address of the list in the <gui>URL</gui> field.</p></item>
+<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
+<item><p>Enter your username.</p></item>
+<item><p>Click <gui style="button">Apply</gui>.</p></item>
+</steps>
+
+<p>The calendar will be added to the list of calendars in Evolution.</p>
+
+</page>
diff --git a/help/C/using-categories.page b/help/C/using-categories.page
new file mode 100644
index 0000000000..fe9e8b9590
--- /dev/null
+++ b/help/C/using-categories.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="using-categories">
+
+  <info>
+    <desc>Using and managing categories for appointments, contacts, memos and tasks.</desc>
+
+    <link type="guide" xref="contacts-organizing" />
+    <link type="guide" xref="tasks-organizing" />
+    <link type="guide" xref="calendar-organizing" />
+
+    <revision pkgversion="3.1.5" version="0.5" date="2011-08-01" status="final"/>
+    <credit type="author">
+      <name>Andre Klapper</name>
+      <email>ak-47@gmx.net</email>
+    </credit>
+ <credit type="author">
+   <name>Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-contact-organize.html.en#usage-contact-organize-group-category -->
+ </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Using Categories</title>
+
+<p>Another way to group contacts, appointments, tasks and memos (summarized by the term "objects" in the following text) is to mark them as belonging to different categories. You can mark an object as being in several categories or no category at all. For example in your address book, you put a friend in the "Business" category because he works with you and the "Friends" category because he is a friend.</p>
+
+<section id="set-category-for-object">
+<title>Setting categories for an object</title>
+
+<p>To mark an object as belonging to a category,</p>
+<steps>
+<item><p>Double-click the object to bring up the corresponding editor.</p></item>
+<item><p>Click <gui style="button">Categories...</gui>. (If this button is not available, select <guiseq><gui>View</gui><gui>Categories</gui></guiseq>.)</p></item>
+<item><p>Select the category from the list. You can select as many or as few categories as you like.</p></item>
+</steps>
+
+</section>
+
+<section id="managing-categories">
+<title>Adding and managing categories</title>
+
+<p>If the default list of categories does not suit your needs, you can add your own categories either directly via <guiseq><gui>Edit</gui><gui>Available Categories</gui></guiseq>, or indirectly when editing an object:</p>
+<steps>
+<item><p>Double-click any object to bring up th corresponding editor.</p></item>
+<item><p>Click <gui style="button">Categories...</gui>. (If this button is not available, select <guiseq><gui>View</gui><gui>Categories</gui></guiseq>.)</p></item>
+<item><p>Enter the new category in the entry box at the top.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+<item><p>You can now see the category in the <gui>Categories</gui> text field in the editor.</p></item>
+<item><p>Click <gui style="button">OK</gui>.</p></item>
+</steps>
+
+<p>In the <gui>Categories Editor</gui> you can edit or set the color and icon for each category available by clicking <gui style="button">Edit</gui> at the bottom of the <gui>Categories</gui> window. Press <gui style="button">Delete</gui> to delete categories from the list.</p>
+</section>
+
+<note><p>To display only the objects in a particular category, select the corresponding category in the quick <link xref="searching-items">search</link> bar.</p></note>
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index a76ec77b54..50f2c75c1d 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,81 +1,238 @@
-# Suppress the Posix / GNU Make Warnings
-AUTOMAKE_OPTIONS=-Wno-portability
-
 SUBDIRS = quickref
 
 include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-
-DOC_MODULE = evolution
-DOC_ENTITIES =
-DOC_INCLUDES =
-DOC_FIGURES =  \
-	figures/attach_reminder_a.png		\
-	figures/calendar_preference_display.png \
-	figures/categories_a.png 		\
-	figures/contacts_mainwindow_a.png 	\
-	figures/delgt-add.png 			\
-	figures/evo_adv_search_a.png 		\
-	figures/evo_attachreminder_plugin.png	\
-	figures/evo_blink.png			\
-	figures/evo_cal_callout_a.png 		\
-	figures/evo_calender_appointmnt.png 	\
-	figures/evo_calstatus_a.png		\
-	figures/evo_caltasks_a.png              \
-	figures/evo_contacteditor_a.png 	\
-	figures/evo_delegate_permission_a.png	\
-	figures/evo_dialog-info.png		\
-	figures/evo_dialog-warning.png		\
-	figures/evo_edit_search.png 		\
-	figures/evo_exchng_mapi.png             \
-	figures/evo_flag_follow_up_a.png 	\
-	figures/evo_gwreceive_a.png 		\
-	figures/evo_gwstatustrack.png		\
-	figures/evo_imapreceive_a.png 		\
-	figures/evo_label_a.png			\
-	figures/evo_labels_a.png		\
-	figures/evo_mail_a.png 			\
-	figures/evo_mail_callout_a.png 		\
-	figures/evo_maildirreceive_a.png 	\
-	figures/evo_mboxreceive_a.png 		\
-	figures/evo_memo_a.png 			\
-	figures/evo_mhreceive_a.png 		\
-	figures/evo_memo_a.png			\
-	figures/evo_newmess_a.png 		\
-	figures/evo_newmail.png			\
-	figures/evo_popreceive_a.png 		\
-	figures/evo_proxyadd_a.png 		\
-	figures/evo_rule_a.png 			\
-	figures/evo_send_option_a.png 		\
-	figures/evo_send_setup_a.png 		\
-	figures/evo_sendstatus_a.png 		\
-	figures/evo_shd_memo_a.png 		\
-	figures/evo_usereceive_a.png 		\
-	figures/evo_junk_a.png			\
-	figures/evo_offline.png			\
-	figures/evo_Wcal_prop_a.png             \
-	figures/evolution_contact_preference.png\
-	figures/evolution_mail_preference.png	\
-	figures/exchng-rec-mails.png 		\
-	figures/exchng-rec-options.png 		\
-	figures/filter-new-fig.png 		\
-	figures/folder_plus.png			\
-	figures/google_cal_view.png		\
-	figures/groupwise_resend.png		\
-	figures/groupwise_resend_retract.png	\
-	figures/local_ics_calendar.png		\
-	figures/mailer_preferences.png 		\
-	figures/meeting.png			\
-	figures/minus.png 			\
-	figures/plus.png 			\
-	figures/quick_add_a.png 		\
-	figures/quick_reference.png		\
-	figures/stock_search.png 		\
-	figures/ver_view_a.png
 
-DOC_LINGUAS = cs de el en_GB es eu fr gl oc ru sl sv mk zh_CN
+DOC_ID = evolution
+DOC_FIGURES = \
+	figures/color-204a87.png \
+	figures/color-2e3436.png \
+	figures/color-4e9a06.png \
+	figures/color-5c3566.png \
+	figures/color-8f5902.png \
+	figures/color-a40000.png \
+	figures/color-c4a000.png \
+	figures/color-ce5c00.png \
+	figures/evolutionlogo.png \
+	figures/minus-icon.png \
+	figures/new-mail-notification.png \
+	figures/new-mail-switcher.png \
+	figures/plus-icon.png \
+	figures/search-icon.png \
+	figures/window-overview-layers.png
 
-check:
-	xmllint --valid --noout $(top_srcdir)/help/C/evolution.xml
+DOC_PAGES = \
+	backup-restore.page \
+	calendar-alarms-and-reminders.page \
+	calendar-caldav.page \
+	calendar-classifications.page \
+	calendar-free-busy.page \
+	calendar-google.page \
+	calendar-layout-appointment-display.page \
+	calendar-layout-general-formatting.page \
+	calendar-layout.page \
+	calendar-layout-views.page \
+	calendar-local.page \
+	calendar-marcus-bains-line.page \
+	calendar-meetings-delegating.page \
+	calendar-meetings.page \
+	calendar-meetings-replying-to-invitation.page \
+	calendar-meetings-sending-invitation.page \
+	calendar-organizing.page \
+	calendar-publishing.page \
+	calendar-recurrence.page \
+	calendar-searching.page \
+	calendar-sharing-information.page \
+	calendar-timezones.page \
+	calendar-usage-add-appointment.page \
+	calendar-usage-delete-appointment.page \
+	calendar-usage-edit-appointment.page \
+	calendar-usage.page \
+	calendar-using-several-calendars.page \
+	calendar-weather.page \
+	calendar-webdav.page \
+	change-switcher-appearance.page \
+	contacts-add-automatically.page \
+	contacts-autocompletion.page \
+	contacts-google.page \
+	contacts-ldap.page \
+	contacts-local.page \
+	contacts-organizing.page \
+	contacts-searching.page \
+	contacts-usage-add-contact.page \
+	contacts-usage-delete-contact.page \
+	contacts-usage-edit-contact.page \
+	contacts-usage.page \
+	contacts-using-contact-lists.page \
+	contacts-using-several-addressbooks.page \
+	credits.page \
+	data-storage.page \
+	default-browser.page \
+	deleting-appointments.page \
+	deleting-emails.page \
+	deleting-to-free-disk-space.page \
+	exchange-connectors-overview.page \
+	exchange-placeholder.page \
+	exporting-data-calendar.page \
+	exporting-data-contacts.page \
+	exporting-data-mail.page \
+	exporting-data.page \
+	express-mode.page \
+	google-services.page \
+	groupwise-placeholder.page \
+	import-apps-mozilla.page \
+	import-apps-outlook.page \
+	import-data.page \
+	import-single-files.page \
+	import-supported-file-formats.page \
+	index.page \
+	intro-first-run.page \
+	intro-main-window.page \
+	mail-access-gmail-imap-account.page \
+	mail-access-gmail-pop-account.page \
+	mail-account-manage-imap.page \
+	mail-account-manage-imap-plus.page \
+	mail-account-manage-local-delivery.page \
+	mail-account-manage-maildir-format-directories.page \
+	mail-account-management.page \
+	mail-account-manage-mh-format-directories.page \
+	mail-account-manage-microsoft-exchange-evo-ews.page \
+	mail-account-manage-microsoft-exchange-evo-exchange.page \
+	mail-account-manage-microsoft-exchange-evo-mapi.page \
+	mail-account-manage-microsoft-exchange.page \
+	mail-account-manage-novell-groupwise.page \
+	mail-account-manage-pop.page \
+	mail-account-manage-unix-mbox-spool-directory.page \
+	mail-account-manage-unix-mbox-spool-file.page \
+	mail-account-manage-usenet-news.page \
+	mail-attachments.page \
+	mail-attachments-received.page \
+	mail-attachments-sending.page \
+	mail-calendar-sending-invitations.page \
+	mail-cannot-see.page \
+	mail-change-columns-in-message-list.page \
+	mail-change-time-format.page \
+	mail-composer-change-quotation-string.page \
+	mail-composer-custom-header-lines.page \
+	mail-composer-forward-as-attachment.page \
+	mail-composer-forward.page \
+	mail-composer-html-image.page \
+	mail-composer-html-link.page \
+	mail-composer-html.page \
+	mail-composer-html-rule.page \
+	mail-composer-html-table.page \
+	mail-composer-html-text.page \
+	mail-composer-mail-signatures-manage.page \
+	mail-composer-mail-signatures.page \
+	mail-composer-mail-signatures-per-account.page \
+	mail-composer-message-templates.page \
+	mail-composer-priority.page \
+	mail-composer-reply.page \
+	mail-composer-search.page \
+	mail-composer-several-recipients.page \
+	mail-composer-spellcheck.page \
+	mail-composer-write-new-message.page \
+	mail-default-CC-and-BCC.page \
+	mail-default-folder-locations.page \
+	mail-delete-and-undelete.page \
+	mail-displaying-character-encodings.page \
+	mail-displaying-collapsible-headers.page \
+	mail-displaying-images-in-html.page \
+	mail-displaying-message.page \
+	mail-displaying-no-css.page \
+	mail-displaying-sender-photograph.page \
+	mail-duplicates.page \
+	mail-encryption-gpg-create-key.page \
+	mail-encryption-gpg-decrypting.page \
+	mail-encryption-gpg-getting-keys.page \
+	mail-encryption-gpg-set-up.page \
+	mail-encryption-gpg-signing-encrypting.page \
+	mail-encryption.page \
+	mail-encryption-s-mime-manage.page \
+	mail-encryption-s-mime-signing-encrypting.page \
+	mail-error-failed-to-append-to-sent-folder.page \
+	mail-error-folder-mismatch.page \
+	mail-error-no-provider-available.page \
+	mail-filters-actions.page \
+	mail-filters-conditions.page \
+	mail-filters-not-working.page \
+	mail-filters.page \
+	mail-folders.page \
+	mail-follow-up-flag.page \
+	mail-imap-headers.page \
+	mail-imap-subscriptions.page \
+	mail-labels.page \
+	mail-layout-changing.page \
+	mail-moving-emails.page \
+	mail-not-sent.page \
+	mail-organizing.page \
+	mail-reading-keyboard-shortcuts.page \
+	mail-read-receipts.page \
+	mail-received-notification.page \
+	mail-receiving-options-evolution-exchange.page \
+	mail-receiving-options-exchange-mapi.page \
+	mail-receiving-options-imap.page \
+	mail-receiving-options-imap-plus.page \
+	mail-receiving-options-local-delivery.page \
+	mail-receiving-options-maildir-format-directories.page \
+	mail-receiving-options-mh-format-directories.page \
+	mail-receiving-options-novell-groupwise.page \
+	mail-receiving-options.page \
+	mail-receiving-options-pop.page \
+	mail-receiving-options-unix-mbox-spool-directory.page \
+	mail-receiving-options-unix-mbox-spool-file.page \
+	mail-receiving-options-usenet-news.page \
+	mail-recognized-thread-related-headers.page \
+	mail-refresh-folders.page \
+	mail-search-folders-add.page \
+	mail-search-folders-conditions.page \
+	mail-search-folders.page \
+	mail-search-folders-refresh.page \
+	mail-searching-attachment-type.page \
+	mail-searching.page \
+	mail-send-and-receive-automatically.page \
+	mail-send-and-receive-manual.page \
+	mail-send-and-receive.page \
+	mail-sending-options-smtp.page \
+	mail-several-pop-accounts.page \
+	mail-sorting-message-list.page \
+	mail-spam-groupwise-add-to-list.page \
+	mail-spam-groupwise-manage-list.page \
+	mail-spam-groupwise-mark-message.page \
+	mail-spam-groupwise-remove-from-list.page \
+	mail-spam-groupwise-unmark-message.page \
+	mail-spam-marking.page \
+	mail-spam.page \
+	mail-spam-settings.page \
+	mail-two-trash-folders.page \
+	mail-usenet-subscriptions.page \
+	mail-vertical-view.page \
+	mail-word-wrap.page \
+	mail-working-offline.page \
+	mail-wrong-fonts-in-3-0.page \
+	memos-searching.page \
+	memos-usage-add-memo.page \
+	memos-usage-delete-memo.page \
+	memos-usage-edit-memo.page \
+	memos-usage.page \
+	minimize-to-system-tray.page \
+	organizing.page \
+	problems-debug-how-to.page \
+	problems-getting-help.page \
+	problems-reporting-bugs.page \
+	searching-items.page \
+	sync-with-other-devices.page \
+	tasks-caldav.page \
+	tasks-display-settings.page \
+	tasks-local.page \
+	tasks-organizing.page \
+	tasks-searching.page \
+	tasks-usage-add-task.page \
+	tasks-usage-delete-task.page \
+	tasks-usage-edit-task.page \
+	tasks-usage.page \
+	tasks-using-several-tasklists.page \
+	tasks-webdav.page \
+	using-categories.page
 
--include $(top_srcdir)/git.mk
+DOC_LINGUAS = cs de el en_GB es eu fr gl oc ru sl sv mk zh_CN
+dist-hook: doc-dist-hook