added sect on menubar, other minor changes.

	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.

	* C/usage-mail.sgml: Improved filter and vfolder
	description, and some minor changes from me and Kevin.

svn path=/trunk/; revision=3566

10 files changed, 2976 insertions, 2702 deletions

diff --git a/doc/C/fig/config-camel.png b/doc/C/fig/config-camel.png
deleted file mode 100644
index e9e5debc78..0000000000
--- a/doc/C/fig/config-camel.png
+++ /dev/null
diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml
index 86cf73fd34..fdd988d55d 100644
--- a/doc/C/usage-contact.sgml
+++ b/doc/C/usage-contact.sgml
@@ -1,306 +1,359 @@
-    <chapter id="usage-contact">
-      <title>The Evolution Contact Manager</title>
-      <para>
-          The <application>Evolution</application> contact manager can
-          handle all of the functions of an address book, phone book,
-          or Rolodex.  Of course, <application>Evolution</application>
-          allows easier updates than an actual paper book. <application>
-          Evolution </application> also allows easy synchronization with 
-          handheld and remote devices.  Since <application>Evolution>
-          </application> supports most major network protocols, including
-          <glossterm>LDAP</glossterm>, it's easy to use over an existing
-          network.
-        </para>
-	<para>
-          Another advantage of the
-          <application>Evolution</application> address book is its
-          integration with the rest of the application.  That means
-          that when you look for someone's address, you can also see a
-          history of appointments with that person.  Or, you can get
-          an e-mail with contact information in it and create a new
-          address card on the spot.  In addition, searches and folders
-          and all work in the same way they do in the other
-          components, so you don't have to learn another system for
-          similar tasks.
-        </para>
-	<para>
-          This chapter will cover using the
-          <application>Evolution</application> contact manager to
-          organize any amount of contact information, share addresses
-          over a network, and several ways to save time with everyday
-          tasks.  To learn about configuring the contact manager, see
-          <xref linkend="config-prefs-contact">.
-        </para>
 
-      <sect1 id="usage-contact-basic">
-	<title>Getting Started With the Contact Manager</title>	
 
-	<para>
-          To open up your address book, click on
-          <guibutton>Contacts</guibutton> in the shortcut bar.  The
-          contact manager is illustrated in <xref
-          linkend="usage-contact-fig">
-        </para>
+<chapter id="usage-contact">
+  <title>The Evolution Contact Manager</title>
+  <para>
+     The <application>Evolution</application> contact manager can
+     handle all of the functions of an address book, phone book, or
+     Rolodex.  Of course, <application>Evolution</application> allows
+     easier updates than an actual paper book. <application> Evolution
+     </application> also allows easy synchronization with handheld and
+     remote devices.  Since <application>Evolution</application>
+     supports most major network protocols, including
+     <glossterm>LDAP</glossterm>, it's easy to use over an existing
+     network.
+  </para>
+  <para>
+     Another advantage of the <application>Evolution</application>
+     address book is its integration with the rest of the application.
+     That means that when you look for someone's address, you can also
+     see a history of appointments with that person.  Or, you can get
+     an e-mail with contact information in it and create a new address
+     card on the spot.  In addition, searches and folders and all work
+     in the same way they do in the other components, so you don't
+     have to learn another system for similar tasks.
+  </para>
+  <para>
+     This chapter will cover using the
+     <application>Evolution</application> contact manager to organize
+     any amount of contact information, share addresses over a
+     network, and several ways to save time with everyday tasks.  To
+     learn about configuring the contact manager, see <xref
+     linkend="config-prefs-contact">.
+  </para>
+
+  <sect1 id="usage-contact-basic">
+    <title>Getting Started With the Contact Manager</title>	
+    
+    <para>
+       To open up your address book, click on
+       <guibutton>Contacts</guibutton> in the shortcut bar.  The
+       contact manager is illustrated in <xref
+       linkend="usage-contact-fig">
+    </para>
 
 
-	<figure id="usage-contact-fig">
-	<title>Evolution Contact Manager</title>
-	<screenshot>
-	  <screeninfo>Evolution Contact Manager Window</screeninfo>
-	  <graphic fileref="fig/contact.png" format="png" srccredit="Aaron Weber">
+    <figure id="usage-contact-fig">
+      <title>Evolution Contact Manager</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Manager Window</screeninfo>
+	<graphic fileref="fig/contact" format="png" srccredit="Aaron Weber">
 	    </graphic>
-	</screenshot>
-	</figure>
+      </screenshot>
+    </figure>
 
-	<para>
-          The contact manager interface is broken into two main parts.
-          The first part is the contact display section.  This can be
-          found at the bottom right panel of
-          <application>Evolution</application>.  This section is where
-          all your contact information is displayed.  Each of these
-          cards are organized into folders.  The second section is the
-          administrative section which spans the top of the
-          <application> Evolution</application> window.  This is where
-          you can add, edit, or delete records.
-        </para>
-      </sect1>
-      <sect1 id="usage-contact-cards">
-	<title>Creating, Deleting, and Adding Cards</title>
-	<para>
-          You can create a new card by pressing the <guibutton>New
-          Card</guibutton> button, or by pressing
-          <keysym>KEYSYM</keysym>. The
-          <interface>New Card</interface> window will appear.  It has
-          the following fields:
+    <para>
+       The contact manager interface is broken into two main parts.
+       The first part is the contact display section.  This can be
+       found at the bottom right panel of
+       <application>Evolution</application>.  This section is where
+       all your contact information is displayed.  Each of these cards
+       are organized into folders.  The second section is the
+       administrative section which spans the top of the <application>
+       Evolution</application> window.  This is where you can add,
+       edit, or delete records.
+    </para>
+  </sect1>
+  <sect1 id="usage-contact-cards">
+    <title>Creating, Deleting, and Adding Cards</title>
+    <para>
+       You can create a new card by pressing the <guibutton>New
+       Card</guibutton> button, or by pressing
+       <keysym>KEYSYM</keysym>. The <interface>Contact
+       Editor</interface> window will appear.  It has two tabs,
+       <guilabel>General</guilabel>, for basic contact information,
+       and <guilabel>Details</guilabel>, for a more specific
+       description of the person.  In addition, it contains a full
+       menu bar with all the items from the main window (IS THIS TRUE?
+       DESCRIBE MENUBAR AGAIN?)
+    </para>
+    <para>
+      The <guilabel>General</guilabel> tab contains no less than seven
+      sections, each with an icon: a face, for name and company; a
+      telephone for phone numbers; an envelope for email address; a
+      house for postal address; a handshake for contacts; and a
+      briefcase for categories.  The things that go into most of the
+      text fields should be obvious enough, so we'll just describe the
+      more interesting parts of the window.  Aside from the
+      <guilabel>Categories</guilabel> feature, which is discussed in
+      <xref linkend="usage-contact-organize">, there are two things
+      you'll want to know about.
+   </para>
+   <para>
+      Type "Eva Lucianne Tester" into the <guilabel>Full
+      Name</guilabel> field.  You'll notice that the <guilabel>File
+      As</guilabel> field also fills up, but in a phone-book fashion:
+      Tester, Lucianne.  You can pick "Eva Tester" from the drop-down,
+      or type in your own.  I suggest that you don't enter something
+      entirely different from the actual name, however.  You might
+      forget that you've filed Eva's information under "C" for "Code, Helix."
+   </para>
+   <para>
+      The other little feature I want to mention involves the little
+      squares next to several of the fields.  Click on them and you'll
+      get a menu of different labels; for the fields in the telephone
+      section, it's a long list involving things like
+      <guilabel>Home</guilabel>, <guilabel>Home 2</guilabel>,
+      <guilabel>Other Fax</guilabel>, and <guilabel>Pager</guilabel>.
+      Select from among them to determine which four telephone numbers
+      to display at any given time.  Of course, these connected times
+      mean that people often have more than four telephone numbers.
+      You can display only four in the editor, but
+      <application>Evolution</application> can remember them all for
+      you.  When you click the little square button for the list of
+      labels, any that you've already filled in will be marked.
+   </para>
 
+    <figure id="usage-contact-editor-fig">
+      <title>Evolution Contact Editor</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Editor</screeninfo>
+	<graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
+	    </graphic>
+      </screenshot>
+    </figure>
+
+
+!--
+      <variablelist>
+         <listitem>
+	  <term>
           <itemizedlist>
-            <listitem> <para>
+	<listitem> <para>
                <guilabel>Name:</guilabel> Enter the person's name here
             </para></listitem>
-            <listitem> <para>
+	<listitem> <para>
 
             </para></listitem>
-            <listitem> <para>
+	<listitem> <para>
               <guilabel>Business:</guilabel>
             </para></listitem>
-
-            <listitem> <para>
+	
+	<listitem> <para>
               <guilabel>Job Title:</guilabel>
             </para></listitem>
-
-            <listitem> <para>
+	
+	<listitem> <para>
                <guilabel>Home:</guilabel> 
             </para></listitem>
-	  </itemizedlist>
-        </para>
-	<para>
-           You can choose which fields an address card has, and create
-	   new fields for cards.  For example,
-	   <application>Evolution</application> provides for two line
-	   postal addresses by default, but you may have as many or as
-	   few lines to an address as you wish.  To change which
-	   fields an address card has, choose DESCRIBE HERE HOW TO DO
-	   THIS.
+      </itemizedlist>
         </para>
+    
+-->
+    <para>
+       You can choose which fields an address card has, and create new
+       fields for cards.  For example,
+       <application>Evolution</application> provides for two line
+       postal addresses by default, but you may have as many or as few
+       lines to an address as you wish.  To change which fields an
+       address card has, choose DESCRIBE HERE HOW TO DO THIS.
+    </para>
 
-	<note>
-	  <title>Quick ways to add cards</title>
-	  <para>
-            You can add cards from within an email message or calendar
-            appointment.  While looking at an email, right-click on
-            any email address or message, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem> or
-            <guimenuitem>Create Card for this Sender</guimenuitem>from
-            the menu.  While looking at a calendar
-            appointment, right-click any email address, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem>.
-            (NOTE that feature may change! unimplemented!)
-          </para>
-	</note>
+    <note>
+      <title>Quick ways to add cards</title>
+      <para>
+        You can add cards from within an email message or calendar
+        appointment.  While looking at an email, right-click on any
+        email address or message, and choose <guimenuitem>Create Card
+        for this Address</guimenuitem> or <guimenuitem>Create Card for
+        this Sender</guimenuitem> from the menu.  While looking at a
+        calendar appointment, right-click any email address, and
+        choose <guimenuitem>Create Card for this
+        Address</guimenuitem>.  (NOTE that feature may change!
+        unimplemented!)
+      </para>
+    </note>
+    
+    <para>
+       You delete a card by pressing the <guibutton>Delete
+       Card</guibutton> button, or by dragging it into the trash
+       folder.
+    </para>
 
-	<para>
-          You delete a card by pressing the <guibutton>Delete
-          Card</guibutton> button, or by dragging it into the trash
-          folder.
-        </para>
+    <para>
+      You can move cards around just as you would move email messages:
+      dragging and dropping works, as does right-clicking and choosing
+      <guimenuitem>Move</guimenuitem> from the menu that appears.
+    </para>
+  </sect1>
 
-	<para>
-          You can move cards around just as you would move email
-          messages: dragging and dropping works, as does
-          right-clicking and choosing <guimenuitem>Move</guimenuitem>
-          from the menu that appears.
-        </para>
-      </sect1>
+  <sect1 id="usage-contact-organize">
+    <title>Organizing your Contact Manager</title>
+    <para>
+       Organizing your contact manager is a lot like organizing your
+       mail.  You can have folders and searches the same way you can
+       with mail, but the contact manager does not allow vFolders.  It
+       does, however, allow each card to fall under several
+       categories, and allow you to create your own categories.  We'll
+       go over categories in a bit.
+    </para>
+    <para>
+      Another useful UNIMPLEMENTED
+      <application>Evolution</application> feature is its ability to
+      recognize when people live together.  If two people in your
+      contact manager share an address, and you change the address for
+      one of them, <application>Evolution</application> will ask you
+      if you wish to change the address for both of them, or just for
+      one.
+    </para>
 
-      <sect1 id="usage-contact-organize">
-	<title>Organizing your Contact Manager</title>
+    <sect2 id="usage-contact-organize-group">
+      <title>Groups of contacts</title>
+      <para>
+         <application>Evolution</application> lets you put cards into
+         folders, mark them as members of different groups, and search
+         through them in a variety of ways.  This section will
+         describe how to organize and find contact information using
+         <application>Evolution</application>.  CHANGE THIS paragraph:
+         it needs a great deal of work.
+      </para>
+
+      <sect3 id="usage-contact-organize-group-folder">
+	<title>Grouping with Folders</title>
 	<para>
-          Organizing your contact manager is a lot like organizing
-          your mail.  You can have folders and searches the same way
-          you can with mail, but the contact manager does not allow
-          vFolders.  It does, however, allow each card to fall under
-          several categories, and allow you to create your own
-          categories.  We'll go over categories in a bit.
-        </para>
+	   The simplest way to group address cards is to use folders.
+	   By default, cards start in the
+	   <guilabel>Contacts</guilabel> folder.  You can create more
+	   folders inside that one, or create other address book
+	   folders as well.  Each card must be in one and only one
+	   folder.
+	 </para>
 	<para>
-          Another useful UNIMPLEMENTED
-          <application>Evolution</application> feature is its ability
-          to recognize when people live together.  If two people in
-          your contact manager share an address, and you change the
-          address for one of them, <application>Evolution</application>
-          will ask you if you wish to change the address for both of 
-          them, or just for one.
-        </para>
-
-	<sect2 id="usage-contact-organize-group">
-	  <title>Groups of contacts</title>
-	  <para>
-             <application>Evolution</application> lets you put cards
-             into folders, mark them as members of different groups,
-             and search through them in a variety of ways.  This
-             section will describe how to organize and find contact
-             information using <application>Evolution</application>.
-             CHANGE THIS paragraph: it needs a great deal of work.
-          </para>
-
-	  <sect3 id="usage-contact-organize-group-folder">
-	    <title>Grouping with Folders</title>
-	    <para>
-	      The simplest way to group address cards is to use
-	      folders.  By default, cards start in the
-	      <guilabel>Contacts</guilabel> folder.  You can create
-	      more folders inside that one, or create other address
-	      book folders as well.  Each card must be in one and only
-	      one folder.
-	    </para>
-	    <para>
-              To create a new folder, do this:
-	    </para>
-	    <para>
-              To put a card into a folder, do this:
-            </para>
-	  </sect3>
-
-	  <sect3 id="usage-contact-organize-group-category">
-	    <title>Grouping with Categories</title>
-	    <para>
-              The other way to group cards is to mark them as
-              belonging to different categories.  The difference
-              between folders and categories is that folders contain
-              cards, but category membership is a property of each
-              card.  That means that you can mark a card as being in
-              several categories or no category at all.  For example,
-              I put my friend Matthew's card in the "Business" category,
-              because he works with me, the "Friends" category, because
-              he's also my friend, and the "Frequent" category, because
-              I call him all the time and can never remember his phone
-              number.
-            </para>
-	    <para>
-              To mark a card as belonging to a category, do this:
-            </para>
-	    <para>
-              Then, you can refer to all the cards in that category
-              by:
-            </para>
-	    <para>
-              If the default categories don't suit you, you can add
-              your own.  Here's how:
-            </para>
-	  </sect3>
-	</sect2>
-      </sect1>
-
-      <sect1 id="usage-contact-sharing">
-	<title>Sharing your Cards (and keeping them to yourself)</title>
+           To create a new folder, do this:
+	</para>
 	<para>
-           Cards can be shared over a network.  This is the sort of
-           feature you'll want to use if your company has a list of
-           vendors and clients that needs constant updating.  If you
-           also share your calendars, people can avoid duplicating
-           work and keep up to date on developments within their
-           workgroup or across the entire company.
-        </para>
-
-         <example id="usage-contact-sharing-ex">
-            <title>Sharing Address Cards and Calendar Data</title>
-	      <para>
-	        Ray wants to schedule a meeting with someone at
-                Company X, so he checks the network for the Company X
-                address card that states his contacts there.  Since
-                his company also shares calendars, he then learns that
-                his co-worker Deanna has already scheduled a meeting
-                with them next Thursday.  He can either go to the
-                meeting himself or ask Deanna to discuss his concerns
-                for him.  Either way, I avoid scheduling an extra
-                meeting with Company X.
-             </para>
-	  </example>
-
+          To put a card into a folder, do this:
+         </para>
+      </sect3>
+      
+      <sect3 id="usage-contact-organize-group-category">
+	<title>Grouping with Categories</title>
 	<para>
-           Of course, you don't want to share all of your cards&mdash;
-           why overload the network with a list of babysitters, or
-           tell everyone on your network you're talking to new job
-           prospects?  <application>Evolution</application> lets you
-           decide which folders you want to make accessible to others.
-        </para>
+           The other way to group cards is to mark them as belonging
+           to different categories.  The difference between folders
+           and categories is that folders contain cards, but category
+           membership is a property of each card.  That means that you
+           can mark a card as being in several categories or no
+           category at all.  For example, I put my friend Matthew's
+           card in the "Business" category, because he works with me,
+           the "Friends" category, because he's also my friend, and
+           the "Frequent" category, because I call him all the time
+           and can never remember his phone number.
+         </para>
 	<para>
-           To begin sharing a folder of address cards, select (something) <!--
-           DESCRIBE PROCESS HERE -->.  The
-           <interface>Sharing</interface> window will pop up.  It contains:
-           <!--DESCRIBE INTERFACE HERE-->
+           To mark a card as belonging to a category, do this:
         </para>
-      </sect1>
-
-      <sect1 id="usage-contact-automate">
-	<title>Automating the Contact Manager</title>
 	<para>
-          The <application>Evolution</application> contact manager
-          can perform a wide variety of tasks for you.  From speeding
-          up basic tasks like adding a new address card to managing
-          mailing lists, you'll find that the contact manager is more
-          than a mere address book.
-        </para>
+           Then, you can refer to all the cards in that category by:
+         </para>
+	<para>
+           If the default categories don't suit you, you can add your
+           own.  Here's how:
+         </para>
+      </sect3>
+    </sect2>
+  </sect1>
+  
+  <sect1 id="usage-contact-sharing">
+    <title>Sharing your Cards (and keeping them to yourself)</title>
+    <para>
+       Cards can be shared over a network.  This is the sort of
+       feature you'll want to use if your company has a list of
+       vendors and clients that needs constant updating.  If you
+       also share your calendars, people can avoid duplicating
+       work and keep up to date on developments within their
+       workgroup or across the entire company.
+    </para>
 
-	<sect2 id="contact-automation-basic">
-	  <title>Send me a card: Adding New Cards Quickly</title>
+     <example id="usage-contact-sharing-ex">
+	<title>Sharing Address Cards and Calendar Data</title>
 	  <para>
-            When you get information in the mail or in a calendar
-            entry, you can add it to an address card.  To do so, right
-            click on any email address or email message, and select
-            <guimenuitem>Add Address Card</guimenuitem> from the menu
-            that appears.  Of course, <application>
-            Evolution</application> adds cards from a hand-held device
-            during HotSync operation.  For more information about
-            that, see <xref linkend="usage-sync">.
-          </para>
-	</sect2>
+	    Ray wants to schedule a meeting with someone at
+	    Company X, so he checks the network for the Company X
+	    address card that states his contacts there.  Since
+	    his company also shares calendars, he then learns that
+	    his co-worker Deanna has already scheduled a meeting
+	    with them next Thursday.  He can either go to the
+	    meeting himself or ask Deanna to discuss his concerns
+	    for him.  Either way, I avoid scheduling an extra
+	    meeting with Company X.
+	 </para>
+      </example>
 
-	<sect2 id="contact-automation-lists">
-	  <title>Managing a Mailing list</title>
-	  <para>
-             You already know that when you are writing an email, you
-             can address it to one or more people, and that
-             <application>Evolution</application> will fill in
-             addresses from your contact manager's address cards if
-             you let it.  In addition to that, you can send email to
-             everyone in a particular group by doing SOMETHING HERE.
-             Future versions of <application>Evolution</application>
-             will allow you to you export a group of cards to a
-             spreadsheet, database, or word processor so you can print
-             address labels or prepare large postal mailings.
-          </para>
-	</sect2>
-	<sect2 id="usage-contact-automation-extra">
-	  <title>Map It! and other extra features</title>
-	  <para>
-             Need a map or directions? Click
-             <guibutton>MapIt</guibutton> from within the contact
-             manager, and <application>Evolution</application> will
-             map the address for you online.
-          </para>
-	</sect2>
-      </sect1>
-    </chapter> 
+    <para>
+       Of course, you don't want to share all of your cards&mdash;
+       why overload the network with a list of babysitters, or
+       tell everyone on your network you're talking to new job
+       prospects?  <application>Evolution</application> lets you
+       decide which folders you want to make accessible to others.
+    </para>
+    <para>
+       To begin sharing a folder of address cards, select (something) <!--
+       DESCRIBE PROCESS HERE -->.  The
+       <interface>Sharing</interface> window will pop up.  It contains:
+       <!--DESCRIBE INTERFACE HERE-->
+    </para>
+  </sect1>
+
+  <sect1 id="usage-contact-automate">
+    <title>Automating the Contact Manager</title>
+    <para>
+      The <application>Evolution</application> contact manager
+      can perform a wide variety of tasks for you.  From speeding
+      up basic tasks like adding a new address card to managing
+      mailing lists, you'll find that the contact manager is more
+      than a mere address book.
+    </para>
+
+    <sect2 id="contact-automation-basic">
+      <title>Send me a card: Adding New Cards Quickly</title>
+      <para>
+	When you get information in the mail or in a calendar
+	entry, you can add it to an address card.  To do so, right
+	click on any email address or email message, and select
+	<guimenuitem>Add Address Card</guimenuitem> from the menu
+	that appears.  Of course, <application>
+	Evolution</application> adds cards from a hand-held device
+	during HotSync operation.  For more information about
+	that, see <xref linkend="usage-sync">.
+      </para>
+    </sect2>
+
+    <sect2 id="contact-automation-lists">
+      <title>Managing a Mailing list</title>
+      <para>
+	 You already know that when you are writing an email, you
+	 can address it to one or more people, and that
+	 <application>Evolution</application> will fill in
+	 addresses from your contact manager's address cards if
+	 you let it.  In addition to that, you can send email to
+	 everyone in a particular group by doing SOMETHING HERE.
+	 Future versions of <application>Evolution</application>
+	 will allow you to you export a group of cards to a
+	 spreadsheet, database, or word processor so you can print
+	 address labels or prepare large postal mailings.
+      </para>
+    </sect2>
+    <sect2 id="usage-contact-automation-extra">
+      <title>Map It! and other extra features</title>
+      <para>
+	 Need a map or directions? Click
+	 <guibutton>MapIt</guibutton> from within the contact
+	 manager, and <application>Evolution</application> will
+	 map the address for you online.
+      </para>
+    </sect2>
+  </sect1>
+</chapter> 
 
 
diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml
index d612b71062..2215689b31 100644
--- a/doc/C/usage-mail.sgml
+++ b/doc/C/usage-mail.sgml
@@ -1,858 +1,880 @@
 
-    <chapter id="usage-mail"> 
-      <title>Evolution Mail</title>
-      <abstract>
-	<title> An Overview of the Evolution Mailer</title>
+
+<chapter id="usage-mail"> 
+  <title>Evolution Mail</title>
+  <abstract>
+    <title> An Overview of the Evolution Mailer</title>
+    <para>
+      Email is an integral part of life these days, and
+      <application>Evolution</application> mail is here to help
+      you keep track of it.  <application>Evolution</application>
+      email is like other email programs in all the ways you would
+      hope:
+     <itemizedlist>
+       <listitem>
+	 <para>
+	   It can sort and organize your mail in a wide variety of ways with
+	   folders, searches, and filters.
+	 </para>
+       </listitem>
+       <listitem>
+	 <para>
+	  It can send and recieve mail in HTML or as plain text, and
+	  supports file attachments.
+	 </para>
+       </listitem>
+       <listitem>
+	 <para>
+	   It lets you use a wide variety of mail sources, including
+	   IMAP, POP3, and local files.
+	 </para>
+       </listitem>
+     </itemizedlist>
+    </para>
+    <para>
+      However, <application>Evolution</application> has some
+      important differences.  First, it's built to handle very
+      large amounts of mail without slowing down or crashing.  We
+      had high mail volumes in mind when we designed our <link
+      linkend="usage-mail-organize-filters">filtering</link> and
+      <link linkend="usage-mail-organize-search">searching</link>
+      functions.  There's also the
+      <application>Evolution</application> <link
+      linkend="usage-mail-organize-vFolders">vFolder</link>, an
+      advanced organizational feature not found in other mail
+      clients.  If you get a lot of mail, or if you keep every
+      message you get in case you need to refer to it later,
+      you'll find that feature especially useful.
+    </para>
+
+    <para>
+       You can start reading email by clicking
+       <guibutton>Inbox</guibutton> in the shortcut bar.  By
+       default, the <interface>Inbox</interface> is open when you
+       start <application>Evolution</application>, and the first
+       time you see your inbox, there's a message in it from Helix
+       Code welcoming you to the application.
+    </para>
+  </abstract>
+
+  <sect1 id="usage-mail-getnsend">
+    <title>Reading, Getting and Sending Mail</title>
+    <sect2 id="usage-mail-getnsend-read">
+      <title>Reading a Message</title>
+      <para>
+	The first time you open your
+	<application>Evolution</application>
+	<guilabel>Inbox</guilabel>, you will see a window like the one
+	in <xref linkend="usage-mail-intro-fig">, with a message from
+	Helix Code in the <interface>message list</interface>.  The
+	message is displayed below that, in the <interface>view
+	pane</interface>.  If you find the <interface>view
+	pane</interface> too small, you can double-click on the
+	message in the <interface>message list</interface> to have it
+	open in a new window.  As is the case with folders, you can
+	right-click on messages in the message list and get a menu of
+	possible actions.
+      </para>
+      <para>
+	Go ahead and click on the message in the <interface>message
+	list</interface>.  That selects the message.  Then click on
+	the <guibutton>Delete</guibutton> button in the tool bar.  The
+	message now has a line through it, because you've marked it
+	for deletion.  If you really want to get rid of it, choose
+	<guimenuitem>Expunge</guimenuitem> from the
+	<guimenu>Tools</guimenu> menu.  That will delete it
+	permanently. If you want to keep it, click
+	<guibutton>Delete</guibutton> again, and it will no longer be
+	marked as deleted.  At some point in the future, this feature
+	will change to something a little less counter-intuitive.
+      </para>
+ <!-- ==============Figure=================================== -->
+ <!-- MAKE SURE THIS SCREENSHOT HAS THE WELCOME MESSAGE! -->
+      <figure id="usage-mail-intro-fig">
+	  <title>Evolution Mail</title>
+	  <screenshot>
+	    <screeninfo>Evolution Mail</screeninfo>
+	    <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+<!-- ==============End of Figure===================================
+-->
+
+    </sect2>
+
+    <sect2 id="usage-mail-getnsend-get">
+      <title>Getting Mail</title>
+      <para>
+	To check your email, just click <guibutton>Get
+	mail</guibutton> in the toolbar.  If this is the first time
+	you've done so, the <interface>mail setup
+	assistant</interface> will ask you for the information it
+	needs to check your mail (see <xref
+	linkend="config-setupassist"> for more information).  Then,
+	<application>Evolution</application> will download your mail
+	for you and send any mail you've marked ready to send. New
+	mail will appear in your <interface>Inbox</interface> and also
+	in the <interface>Today View</interface>.
+      </para>
+
+      <para>
+	If you get an error message instead of mail, you probably
+	need to change your network settings.  To learn how to
+	do that, have a look at <xref
+	linkend="config-prefs-mail-network">, or ask your system
+	administrator.
+      </para>
+
+      <sect3 id="usage-mail-getnsend-get-attach">
+	<title>Attachments, HTML Mail, and Live Documents</title>
 	<para>
-          Email is an integral part of life these days, and
-          <application>Evolution</application> mail is here to help
-          you keep track of it.  <application>Evolution</application>
-          email is like other email programs in all the ways you would
-          hope:
-         <itemizedlist>
-           <listitem>
-             <para>
-               Item: Description
-             </para>
-           </listitem>
-           <listitem>
-             <para>
-               Item: Description
-             </para>
-           </listitem>
-           <listitem>
-             <para>
-               Item: Description
-             </para>
-           </listitem>
-         </itemizedlist>.
-        </para>
-        <para>
-          However, <application>Evolution</application> has some
-          important differences.  First, it's built to handle very
-          large amounts of mail without slowing down or crashing.  We
-          had high mail volumes in mind when we designed our <link
-          linkend="usage-mail-organize-filters">filtering</link> and
-          <link linkend="usage-mail-organize-search">searching</link>
-          functions.  There's also the
-          <application>Evolution</application> <link
-          linkend="usage-mail-organize-vFolders">vFolder</link>, an
-          advanced organizational feature not found in other mail
-          clients.  If you get a lot of mail, or if you keep every
-          message you get in case you need to refer to it later,
-          you'll find that feature especially useful.
-        </para>
-        
+	  If you receive a file attached to an email,
+	  <application>Evolution</application> will display it at the
+	  bottom of the message to which it's attached.  Click on the
+	  attachment icon or text, and
+	  <application>Evolution</application> will ask you where you
+	  want to put the file.  Once you've done that, you can
+	  open, move, copy, or execute it just like any other, using
+	  <application>Nautilus</application> or your favorite shell
+	  or file manager.
+	</para>
+
 	<para>
-           You can start reading email by clicking
-           <guibutton>Inbox</guibutton> in the shortcut bar.  By
-           default, the <interface>Inbox</interface> is open when you
-           start <application>Evolution</application>, and the first
-           time you see your inbox, there's a message in it from Helix
-           Code welcoming you to the application.
-        </para>
-      </abstract>
-   
-      <sect1 id="usage-mail-getnsend">
-	<title>Reading, Getting and Sending Mail</title>
-	<sect2 id="usage-mail-getnsend-read">
-	  <title>Reading a Message</title>
-	  <para>
-            The first time you open your
-            <application>Evolution</application>
-            <guilabel>Inbox</guilabel>, you will see a window like the
-            one in <xref linkend="usage-mail-intro-fig">, with a
-            message from Helix Code in the<interface> message
-            list</interface>.  The message is displayed
-            below that, in the <interface>view pane</interface>.  If
-            you find the<interface> view pane</interface> too small,
-            you can double-click on the message in the
-            <interface>message list</interface> to have it open in a
-            new window.  As is the case with folders, you can
-            right-click on messages in the message list and get a 
-            menu of possible actions.
-          </para>
-	  <para>
-            Go ahead and right-click on the message, and select
-            <guimenuitem>Delete Message</guimenuitem> from the menu
-            that appears.  The message will move into the
-            <guilabel>Trash</guilabel> folder.  If you want to keep
-            it, you can open the <guilabel>Trash</guilabel> folder
-            and drag the message back to your
-            <guilabel>Inbox</guilabel>.  The trash will be
-            automatically emptied the next time you quit
-            <application>Evolution</application>. (FEATURE
-            UNIMPLEMENTED! Text may change to fit featureset)
- 
-     <!-- ==============Figure=================================== -->
-     <!-- MAKE SURE THIS SCREENSHOT HAS THE WELCOME MESSAGE! -->
-	  <figure id="usage-mail-intro-fig">
-	      <title>Evolution Mail</title>
-	      <screenshot>
-		<screeninfo>Evolution Mail</screeninfo>
-		<graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
-   <!-- ==============End of Figure===================================
-   -->
-          </para>
-	</sect2>
-
-
- 	
-	<sect2 id="usage-mail-getnsend-get">
-	  <title>Getting Mail</title>
-	  <para>
-            To check your email, just click <guibutton>Send and
-            Receive</guibutton> in the toolbar.  If this is the first
-            time you've done so, the <interface>mail druid</interface>
-            will ask you for the information it needs to check your
-            mail (see <xref linkend="config-setupassist"> for more
-            information).  Then, <application>Evolution</application>
-            will download your mail for you and send any mail you've
-            marked ready to send. New mail will appear in your
-            <interface>Inbox</interface> and also in the
-            <interface>Today View</interface>.
-          </para>
+	   <application>Evolution</application> can also display
+	   HTML-formatted mail, complete with graphics.  HTML
+	   formatting will display automatically, although you can
+	   turn it off if you prefer.
+	</para>
 
+	<para>
+	   It can also display <glossterm>live
+	   documents</glossterm>, which have scripted or
+	   executable contents&mdash; for example, a working
+	   spreadsheet page or a chess game.  
+	</para>
+	<tip id="badidea-attachment">
+	  <title>Bad Idea</title>
 	  <para>
-            If you get an error message instead of mail, you probably
-            need to change your network preferences.  To learn how to
-            do that, have a look at <xref
-            linkend="config-prefs-mail-network">, or ask your system
-            administrator.
-          </para>
-
-	  <sect3 id="usage-mail-getnsend-get-attach">
-	    <title>Attachments, HTML Mail, and Live Documents</title>
-	    <para>
-              If you receive a file attached to an email,
-              <application>Evolution</application> will ask where you
-              want to put it.  Once you've downloaded a file, you can
-              open, move, copy, or execute it just like any other,
-              using <application>Nautilus</application> or your
-              favorite shell or file manager. (This text will change
-              to fit app behavior, once features are implemented.)
-            </para>
+	    Don't worry about security. When someone you don't know
+	    sends you a program by email, assume it's a really cool
+	    game.  Mark it executable and run it, no matter what.
+	  </para>
+	</tip>
+      </sect3>
+    </sect2>
+
+    <sect2 id="usage-mail-getnsend-send">
+      <title>Writing and Sending Mail</title>
+      <para>
+	 You can start writing a new
+	 email message by selecting <guimenuitem>New
+	 Mail</guimenuitem> from the <guimenu>File Menu</guimenu>,
+	 or by pressing <guibutton>Ctrl-N</guibutton>.  When you do so,
+	 the <interface>New Message</interface> window will open,
+	 as shown in <xref linkend="usage-mail-newmsg-fig">.
 
-	    <para>
-               <application>Evolution</application> can also display
-               HTML-formatted mail, complete with graphics.  HTML
-               formatting will display automatically, although you can
-               turn it off if you prefer.
-            </para>
-
-	    <para>
-               It can also display <glossterm>live
-               documents</glossterm>, which have scripted or
-               executable contents&mdash; for example, a working
-               spreadsheet page or a chess game.  
-            </para>
-	    <tip id="badidea-attachment">
-	      <title>Bad Idea</title>
-	      <para>
-                When someone you don't know sends you an attached
-                program, go ahead and run it.  Set your preferences to
-                always run live documents when you recieve them, too.
-                Everybody knows all that virus stuff is just a Windows
-                problem.
-              </para>
-	    </tip>
-	  </sect3>
-	</sect2>
-	
-	<sect2 id="usage-mail-getnsend-send">
-	  <title>Writing and Sending Mail</title>
-	  <para>
-             You can start writing a new
-             email message by selecting <guimenuitem>New
-             Mail</guimenuitem> from the <guimenu>File Menu</guimenu>,
-             or by pressing <keysym>Ctrl-N</keysym>.  When you do so,
-             the <interface>New Message</interface> window will open,
-             as shown in <xref linkend="usage-mail-newmsg-fig">.
-          </para>
 
 <!--   ==============Figure=================================== -->
-	   <figure id="usage-mail-newmsg-fig">
-	     <title>New Message Window</title>
-	     <screenshot>
-	      <screeninfo>Evolution Main Window</screeninfo>
-	      <graphic fileref="newmsg-pic" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
+       <figure id="usage-mail-newmsg-fig">
+	 <title>New Message Window</title>
+	 <screenshot>
+	  <screeninfo>Evolution Main Window</screeninfo>
+	  <graphic fileref="newmsg-pic" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
 <!-- ==============End of Figure=================================== -->
-	 
-	  <para>	  
-             Enter an address in the <guilabel>To:</guilabel> field, a
-             message in the <guilabel>Message:</guilabel> field, and
-             press <guibutton>Send and Receive</guibutton>.  That's
-             easy.  It may even be too easy, which is why I like to
-             queue my messages up to be sent a few minutes later.
-
-	     <tip id="usage-mail-getnsend-send-attach-tip">
-	      <title>Send Now, Send Later</title>
-	      <para>
-                Evolution will send mail immediately unless you tell
-                it to do otherwise by selecting <guimenuitem>Send
-                Later</guimenuitem> from the <guimenu>MENU</guimenu>.
-                Then, when you press <guibutton>Send &
-                Receive</guibutton>, all your unsent messages will go
-                out at once.  I like to use "Send Later" because it
-                gives me a chance to change my mind about a message
-                before it goes out.  That way, I don't send anything I'll
-                regret the next day.
-              </para>
-	      <para>
-                To learn more about how you can specify message queue
-                and filter behavior, see <xref linkend="config-prefs-mail">.
-              </para>
-	     </tip>
-           </para>
-
+ <!-- Check the alignment of the following paragraph in the PS and HTMl output, 
+as putting the fig inside the paragraph may or may not have fixed an error -->
+      </para>
+      <para>	  
+	 Enter an address in the <guilabel>To:</guilabel> field, a
+	 message in the <guilabel>Message:</guilabel> field, and
+	 press <guibutton>Send</guibutton>.  That's
+	 easy.  It may even be too easy, which is why I like to
+	 queue my messages up to be sent a few minutes later.
+
+	 <tip id="usage-mail-getnsend-send-attach-tip">
+	  <title>Send Now, Send Later</title>
 	  <para>
-            There is quite a bit more to sending mail, though.  In the
-            next few sections, you'll see how
-            <application>Evolution</application> handles additional features,
-            including mailing lists, attachments, and forwarding.
-          </para>
-
-   
-	  <sect3 id="usage-mail-getnsend-send-to">
-	    <title>Choosing Recipients</title>
-	    <para>
-              If you have created address cards in the contact
-	      manager, you can also enter nicknames or other portions
-	      of address data, and
-	      <application>Evolution</application> will complete the
-	      address for you. (INSERT description of UI for this
-	      feature, once it is decided upon). If you enter a name
-	      or nickname that can go with more than one card,
-	      Evolution will open a dialog box to ask you which person
-	      you meant.  (QUESTION: will users be able to drag & drop
-	      address cards to send email?).  For more information
-	      about using email together with the contact manager and
-	      the calendar, see <xref
-	      linkend="usage-contact-automate"> and <xref
-	      linkend="usage-calendar-apts-group">.
-            </para>
-	    <para>
-              In addition, you can mark recipients in three different
-              ways.  The <guilabel>To:</guilabel> field is for the
-              primary recipients of the message you are going to send.
-              However, it is considered bad form to have more than a
-              few email addresses in this section.
-            </para>
-	    <para>
-              If you're writing to one person, but want to keep a
-              third party up to date, you can use
-              <guilabel>Cc:</guilabel>.  Hearkening back to the dark
-              ages when people used typewriters and there were no copy
-              machines, "Cc" stands for "Carbon Copy."  Use it
-              whenever you want to share a message you've written to
-              someone else.
-              <example>
-		<title>Using the Cc: field</title>
-		<para>
-                   Say, for example, Susan sends an email to a client.
-                   She puts her co-worker, Tim, in the in the
-                   <guilabel>Cc:</guilabel> field, so that he know
-                   what's going on.  The client can see that Tim also
-                   recieved the message, and know that they can talk
-                   to Tim about the message as well.
-                </para>
-	      </example>
-            </para>
-	    <para>
-              If you have a large number of recipients, or if you want
-              to send mail to several people without sharing the
-              recipient list, you should use
-              <guilabel>BCc:</guilabel>. "BCc" stands for "Blind
-              Carbon Copy", and means that people listed in the
-              <guilabel>BCc:</guilabel> are excluded from the
-              recipient list, although they will receive the message
-              and the list of addresses from the
-              <guilabel>To:</guilabel> and <guilabel>Cc:</guilabel>
-              fields.  
-
-              <example id="ex-mail-bcc">
-                 <title>Using the BCc: field</title>
-                 <para>
-                   Let's say Tim sends an email to a client, and wants
-                   his supervisor to know what he wrote.  He doesn't,
-                   however, want the client to start writing his
-                   supervisor about the project&mdash; it's Tim's job
-                   to deal with the client.  So Tim puts his
-                   supervisor's email address in the
-                   <guilabel>BCc:</guilabel> field.  That way, the
-                   client has one contact, and the boss stays in the
-                   loop.
-               </para>
-             </example>
-            </para>
-	  </sect3>
-
-       <sect3 id="usage-mail-getnsend-send-reply">
-	    <title>Replying to Messages</title>
+	    Evolution will send mail immediately unless you tell
+	    it to do otherwise by selecting <guimenuitem>Send
+	    Later</guimenuitem> from the <guimenu>MENU</guimenu>.
+	    Then, when you press <guibutton>Send &
+	    Receive</guibutton>, all your unsent messages will go
+	    out at once.  I like to use "Send Later" because it
+	    gives me a chance to change my mind about a message
+	    before it goes out.  That way, I don't send anything I'll
+	    regret the next day.
+	  </para>
+	  <para>
+	    To learn more about how you can specify message queue
+	    and filter behavior, see <xref linkend="config-prefs-mail">.
+	  </para>
+	 </tip>
+       </para>
+
+      <para>
+	There is quite a bit more to sending mail, though.  In the
+	next few sections, you'll see how
+	<application>Evolution</application> handles additional features,
+	including mailing lists, attachments, and forwarding.
+      </para>
+
+
+      <sect3 id="usage-mail-getnsend-send-to">
+	<title>Choosing Recipients</title>
+	<para>
+	  If you have created address cards in the contact
+	  manager, you can also enter nicknames or other portions
+	  of address data, and
+	  <application>Evolution</application> will complete the
+	  address for you. (INSERT description of UI for this
+	  feature, once it is decided upon). If you enter a name
+	  or nickname that can go with more than one card,
+	  Evolution will open a dialog box to ask you which person
+	  you meant.  (QUESTION: will users be able to drag & drop
+	  address cards to send email?).  For more information
+	  about using email together with the contact manager and
+	  the calendar, see <xref
+	  linkend="usage-contact-automate"> and <xref
+	  linkend="usage-calendar-apts-group">.
+	</para>
+	<para>
+	  In addition, you can mark recipients in three different
+	  ways.  The <guilabel>To:</guilabel> field is for the
+	  primary recipients of the message you are going to send.
+	  However, it is considered bad form to have more than a
+	  few email addresses in this section.
+	</para>
+	<para>
+	  If you're writing to one person, but want to keep a
+	  third party up to date, you can use
+	  <guilabel>Cc:</guilabel>.  Hearkening back to the dark
+	  ages when people used typewriters and there were no copy
+	  machines, "Cc" stands for "Carbon Copy."  Use it
+	  whenever you want to share a message you've written to
+	  someone else.
+	  <example>
+	    <title>Using the Cc: field</title>
 	    <para>
-               In order to reply to a message, click on it once in the
-               message list to select it.  Then press the
-               <guibutton>Reply</guibutton> button, or use the
-               <keysym>REPLY COMBO</keysym> hot key.  A window like
-               the <interface>New Message</interface> window will
-               appear, but the subject will already be present&mdash;
-               typically, your new message will have the same subject
-               as the message to which you are replying, but with Re:
-               before it, to mark it as a reply.  In addition, the
-               full text of the previous message may be inserted into
-               the new message, with the &gt; character before each
-               line.  This indicates quoting.  You can intersperse
-               your message with the quoted material as shown in <xref
-               linkend="usage-mail-getnsend-reply-fig">
-
-<!-- note that this figure should have a reply mail ready to send, with quoted materials and the relevant replies interspersed-->
-<!--   ==============Figure=================================== -->
-	   <figure id="usage-mail-getnsend-reply-fig">
-	     <title>Reply Message Window</title>
-	     <screenshot>
-	      <screeninfo>Evolution Main Window</screeninfo>
-	      <graphic fileref="replymsg-pic" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
+	       Say, for example, Susan sends an email to a client.
+	       She puts her co-worker, Tim, in the in the
+	       <guilabel>Cc:</guilabel> field, so that he know
+	       what's going on.  The client can see that Tim also
+	       recieved the message, and know that they can talk
+	       to Tim about the message as well.
+	    </para>
+	  </example>
+	</para>
+	<para>
+	  If you have a large number of recipients, or if you want
+	  to send mail to several people without sharing the
+	  recipient list, you should use
+	  <guilabel>BCc:</guilabel>. "BCc" stands for "Blind
+	  Carbon Copy", and means that people listed in the
+	  <guilabel>BCc:</guilabel> are excluded from the
+	  recipient list, although they will receive the message
+	  and the list of addresses from the
+	  <guilabel>To:</guilabel> and <guilabel>Cc:</guilabel>
+	  fields.  
+
+	  <example id="ex-mail-bcc">
+	     <title>Using the BCc: field</title>
+	     <para>
+	       Let's say Tim sends an email to a client, and wants
+	       his supervisor to know what he wrote.  He doesn't,
+	       however, want the client to start writing his
+	       supervisor about the project&mdash; it's Tim's job
+	       to deal with the client.  So Tim puts his
+	       supervisor's email address in the
+	       <guilabel>BCc:</guilabel> field.  That way, the
+	       client has one contact, and the boss stays in the
+	       loop.
+	   </para>
+	 </example>
+	</para>
+      </sect3>
+
+   <sect3 id="usage-mail-getnsend-send-reply">
+	<title>Replying to Messages</title>
+	<para>
+	   In order to reply to a message, click on it once in the
+	   message list to select it.  Then press the
+	   <guibutton>Reply</guibutton> button.  A window like the
+	   <interface>New Message</interface> window will appear, but
+	   the subject will already be present&mdash; the same subject
+	   as the message to which you are replying, but with Re:
+	   before it, to mark it as a reply.  In addition, the full
+	   text of the previous message is inserted into the new
+	   message, either in italics (for HTML display) or with the
+	   &gt; character (in plain text mode) before each line.  This
+	   indicates quoting.  You can intersperse your message with
+	   the quoted material as shown in <xref
+	   linkend="usage-mail-getnsend-reply-fig">
+
+<!-- note that this figure should have a reply mail ready to send,
+with quoted materials and the relevant replies interspersed-->
+ <!-- ==============Figure=================================== -->
+       <figure id="usage-mail-getnsend-reply-fig">
+	 <title>Reply Message Window</title>
+	 <screenshot>
+	  <screeninfo>Evolution Main Window</screeninfo>
+	  <graphic fileref="replymsg-pic" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
 <!-- ==============End of Figure=================================== -->
+	</para>
 
-            </para>
-
-	    <para>
-              If a message has several recipients, as in the case of
-              mailing lists or messages that have been carbon copied,
-              you may wish to select one of the items under the
-              <guimenuitem>Reply-To</guimenuitem> submenu on the
-              <guimenu>MENU</guimenu> menu.  This will allow you to
-              choose one or several of the other message recipients in
-              addition to the person who originally sent you the
-              message. If there are large numbers of people in the
-              <guilabel>Cc:</guilabel> or <guilabel>To:</guilabel>
-              fields, this can save substantial amounts of time.  In
-              addition, Reply-To makes it very easy to keep off-topic
-              conversation away from mailing lists and newsgroups.
-              <example>
-		<title>Using the Reply-To feature</title>
-		<para>
-                  Returning again to the email Susan sent to Tim and
-                  their client, you'll note that the Reply-To feature
-                  allows the client to decide whether to reply just to
-                  Susan, or to both Tim and Susan by selecting
-                  a menu item, rather than by cutting and pasting the
-                  email addresses. 
-                </para>
-	      </example>
-            </para>
-	  </sect3>
-	  
-	  <sect3 id="usage-mail-getnsend-send-fancy">
-	    <title>Embellishing that email</title>
-	    <para>
-               <application>Evolution</application> allows you to 
-                make your email more attractive in a number of ways. You
-                can send messages formatted with HTML, attach any sort
-                of file to them, and even include live documents, like
-                spreadhseets or chess games.  This section will tell
-                you how.
-            </para>
-	    
-	    <sect4 id="usage-mail-getnsend-send-html">
-	      <title>Colors, pictures, and fonts with HTML Mail</title> 
-	      <para>
-                Most email messages are sent as plain text, but they
-                can also be sent as HTML, which means they can include
-                color, text style, and other formatting information.
-                Evolution will read and display HTML properly without
-                trouble, and also allows you to send outgoing
-                email messages as HTML.  To send an HTML message, just
-                use the composition toolbar to add formatting;
-                your message text will appear formatted in the composer
-                window, and the message will be sent as HTML.
-              </para>
-	      <note>
-		<title>A Technical note on HTML Tags</title>
-                <para>
-		  Any text, including HTML tags, entered into the
-                  message composition window is assumed to be plain
-                  text.  If you enter HTML directly into the
-                  composer&mdash; say, <markup
-                  role="html">&lt;BR&gt;Bold Text&lt;/BR&gt</markup>,
-                  the the composer will assume you meant exactly that,
-                  and not "make this text bold," as a HTML composition
-                  tool would.  For the very technically inclined, that
-                  means that when the text <markup
-                  role="html">&lt;BR&gt</markup> is sent as HTML, it
-                  will be converted to the string
-                  <literal>&amp;lt;BR&amp;gt;</literal>.
-                </para>
-	      </note>
-	      <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.
-                <emphasis>Some</emphasis> people refer to HTML mail as
-                "the root of all evil" and get very angry if you send
-                them HTML mail, which is why the default in
-                <application>Evolution</application> is plain text.
-                If you choose to send HTML mail, but have an address
-                book entry for someone who does not wish to receive
-                HTML-enhanced mail, you can note that preference in
-                their address card.  The mailer will automatically
-                strip the HTML tags from any messages you send to that
-                address.
-              </para>
-	    </sect4>
-      
-	    <sect4 id="usage-mail-getnsend-send-attach">
-	      <title>Attachments</title>
-	      <para>
-                If you want to attach a file to your email message,
-                you can do so by <!--describe process here-->.  If
-                your recipients can read HTML mail, you can put an
-                image inside the mail by dragging the file into the
-                composer window, or by selecting <guimenuitem>Menu
-                Item</guimenuitem> from the <guimenu>Menu</guimenu>
-                menu.  Still, unless you know what email client the
-                recipient is using, it's best to send a message or
-                attachment in the simplest manner possible.
-              </para>
-	    </sect4>
-	    <sect4 id="usage-mail-getnsend-send-live">
-	      <title>Live Documents</title>
-	      <para>
-                Later versions of <application>Evolution</application>
-                will allow you to enliven your email with almost any
-                sort of document, and even with entire
-                applications. At this point, however, I don't know how
-                that will work.
-              </para>
-	    </sect4>
-	  </sect3>
-       
-	  <sect3 id="usage-getnsend-fwd">
-	    <title>Forwarding Mail</title>      
-	    <para>
-              <guilabel>Forward</guilabel> is useful if you have
-	      received a message and you think someone else would like
-	      to see it, or if you get a message intended for someone
-	      else.  You can forward a message as an attachment to a
-	      new message (the default way of forwarding) or you can send it
-	      <glossterm>inline</glossterm> as a quoted portion of the
-	      message you are sending.  Attachment forwarding is best
-	      if you want to send the entire message you received,
-	      unaltered.  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 where, if at all, you have removed or
-	      altered content.
-            </para>
-	    <para>
-              To forward a message, first make sure it is selected by
-              clicking it once in the message list.  Then, press
-              <guibutton>Forward</guibutton> on the toolbar, or select
-              SOMETHING.  To forward a message inline instead of as an
-              attachment, DO SOMETHING ELSE.  Choose an addressee as
-              you would when sending a new message; the subject will
-              already be entered, but you can alter it.  Enter your
-              comments on the message in the <interface>composition
-              frame</interface>, and press <guibutton>Send and
-              Receive</guibutton>.  To forward it
-              <glossterm>inline</glossterm> instead of attached,
-              select <guimenuitem>Forward Inline</guimenuitem> from
-              the <guimenu>Message</guimenu> menu.
-            </para>
-	  </sect3>
-	  <sect3 id="usage-mail-getnsend-ettiquette">
-	    <title>Seven Tips for Email Usage</title>
+	<para>
+	  If a message has several recipients, as in the case of
+	  mailing lists or messages that have been carbon copied,
+	  you may wish to select one of the items under the
+	  <guimenuitem>Reply-To</guimenuitem> submenu on the
+	  <guimenu>MENU</guimenu> menu.  This will allow you to
+	  choose one or several of the other message recipients in
+	  addition to the person who originally sent you the
+	  message. If there are large numbers of people in the
+	  <guilabel>Cc:</guilabel> or <guilabel>To:</guilabel>
+	  fields, this can save substantial amounts of time.  In
+	  addition, Reply-To makes it very easy to keep off-topic
+	  conversation away from mailing lists and newsgroups.
+	  <example>
+	    <title>Using the Reply-To feature</title>
 	    <para>
-              I started with ten, but four were "Don't send
-              <glossterm>spam</glossterm>."
-              <itemizedlist>
-  	        <listitem>
-		  <para>
-                    Always begin and close with a salutation. Say
-                    "please" and "thank you", just like you do in real
-                    life. You can keep your pleasantries short, but be pleasant!
-                  </para>
-		</listitem>
-	      
-		<listitem>
-		  <para>
-                    ALL CAPS MEANS YOU'RE SHOUTING!
-                  </para>
-		</listitem>
-	      
-		<listitem>
-		  <para>
-                     Never write anything in email you wouldn't say in
-                     public.  Old messages have a nasty habit of
-                     resurfacing when you least expect them to.
-                  </para>
-		</listitem>
-	      
-		<listitem>
-		  <para>
-                   Check your spelling and use complete sentences.
-                  </para>
-		</listitem>
-	     
-		<listitem>
-		  <para>
-                    Don't send nasty emails (flames).  If you get one,
-		    don't write back.
-                  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-                     Don't send spam or forward chain mail.  If you
-                     must, verify any rumors, and make sure the
-                     message doesn't have multiple layers of email
-                     quotation symbols (&gt;) indicating multiple
-                     layers of careless inline forwarding.
-                  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-                     When you reply or forward, include just enough of
-		     the previous message to provide context. Not too
-		     much, not too little.
-                   </para>
-		</listitem>
-	      </itemizedlist>
-            </para>
-	    <para> Happy mailing! </para>
-	  </sect3>
-	</sect2>
-      </sect1>
-
-      <sect1 id="usage-mail-organize">
-	<title>Organizing Your Mail</title>
+	      Returning again to the email Susan sent to Tim and
+	      their client, you'll note that the Reply-To feature
+	      allows the client to decide whether to reply just to
+	      Susan, or to both Tim and Susan by selecting
+	      a menu item, rather than by cutting and pasting the
+	      email addresses. 
+	    </para>
+	  </example>
+	</para>
+      </sect3>
+
+      <sect3 id="usage-mail-getnsend-send-fancy">
+	<title>Embellishing that email</title>
 	<para>
-          Even if you only get a few email messages a day, you
-          probably want to sort and organize them.  When you get a
-          hundred a day and you want to refer to a message you
-          received six weeks ago, you need to sort and organize them,
-          and <application>Evolution</application> has the tools to
-          help you do it.  
-        </para>
-	
-	<sect2 id="usage-mail-organize-folders">
-	  <title>Getting Organized with Folders</title>
-	  <para>
-            Mail, as well as address cards and calendars, is kept in
-            folders.  If you like, you can create new folders by
-            selecting <guisubmenu>New</guisubmenu> and then
-            <guimenuitem>Folder</guimenuitem> from the
-            <guimenu>File</guimenu> menu, or by pressing
-            <keysym>COMBO</keysym>.  (Will there be a dialog box to
-            determine name and location? Must wait for feature to
-            describe.) The new folders will appear in the
-            <interface>tree view</interface>, and you can drag them
-            wherever you want to relocate them.  You can move messages
-            into the folders by dragging and dropping, or by selecting
-            them and choosing <guimenuitem>ITEM</guimenuitem> from the
-            <guimenu>MENU</guimenu>.  If you create filters with the
-            <interface>filter druid</interface>, you can have mail
-            moved to a folder automatically.  An email message can be in
-            only one folder at a time, just like real mail in real
-            folders.  This is also the case for folders of address
-            cards and calendar information.
-          </para>
-	</sect2>    
-
-	<sect2 id="usage-mail-organize-search">
-	  <title>Searching for Messages</title>
+	   <application>Evolution</application> allows you to 
+	    make your email more attractive in a number of ways. You
+	    can send messages formatted with HTML, attach any sort
+	    of file to them, and even include live documents, like
+	    spreadhseets or chess games.  This section will tell
+	    you how.
+	</para>
+
+	<sect4 id="usage-mail-getnsend-send-html">
+	  <title>Colors, pictures, and fonts with HTML Mail</title> 
 	  <para>
-            Because <application>Evolution</application> automatically
-            creates an index of every email you send or receive, it
-            can search through your old messages and present you with
-            results very quickly.  You can search for messages by
-            author, subject, keyword, or headers. (INSERT descriptons
-            of what those terms mean)
-          </para>
-          <para>
-            To create a search, enter the word or phrase you're
-            looking for in the form field below the toolbar, and
-            choose a search type:
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <guilabel>Body or subject contains:</guilabel> This
-                  will search message subjects and the messages
-                  themselves for the word or phrase you've entered in
-                  the search field.
-               </para>
-             </listitem>
-
-              <listitem>
-                <para>
-                  <guilabel>Body contains:</guilabel> This will search
-                   only in message text, not the subject lines.
-               </para>
-             </listitem>
-
-              <listitem>
-                <para>
-                  <guilabel>Subject contains:</guilabel> This will
-                  show you messages where the search text is in the
-                  subject line.  It will not search in the message body.
-               </para>
-             </listitem>
-
-              <listitem>
-                <para>
-                  <guilabel>Body does not contain:</guilabel> This
-                  finds every email message that does not have the
-                  search text in the message body.  It will still show
-                  messages that have the search text in the subject
-                  line, if it is not also in the body.
-               </para>
-             </listitem>
-
-              <listitem>
-                <para>
-                  <guilabel>Subject does not contain:</guilabel>This
-                  finds every mail whose subject does not
-                  contain the search text.
-               </para>
-             </listitem>
-            </itemizedlist>
-
-          </para>
-	</sect2>
-    
-	<sect2 id="usage-mail-organize-vFolders">
-	  <title>Getting Really Organized with Virtual Folders</title>
-	  <para>
-            If you find yourself performing a search frequently, you
-            can save it as a virtual folder. Virtual folders, or
-            vFolders, are an advanced way of viewing your email
-            messages within <application>Evolution</application>.  If
-            you get a lot of mail or often forget where you put
-            messages, vFolders can help you stay on top of things.
-          </para>
-          <para>
-            A vFolder looks and acts a lot like a folder, but it's
-            actually a saved search that you can access in most of the
-            same ways you would a regular folder.  The one important
-            differences between them is that a conventional folder
-            actually contains messages, but a vFolder is a view of
-            messages that may be in several different folders.  This
-            means that while a message may fall into several vFolders,
-            it can be in only one conventional folder.  Also, it means
-            that you cannot remove a message from a vFolder unless you
-            delete it, and you cannot add a message to a vFolder
-            unless you change the vFolder's search criteria.
-          </para>
+	    Most email messages are sent as plain text, but they
+	    can also be sent as HTML, which means they can include
+	    color, text style, and other formatting information.
+	    Evolution will read and display HTML properly without
+	    trouble, and also allows you to send outgoing
+	    email messages as HTML.  To send an HTML message, just
+	    use the composition toolbar to add formatting;
+	    your message text will appear formatted in the composer
+	    window, and the message will be sent as HTML.
+	  </para>
+	  <note>
+	    <title>A Technical note on HTML Tags</title>
+	    <para>
+	      You can't use the composer window to create web pages,
+	      at least not if you plan to hand-code them with HTML.
+	      If you enter HTML directly into the composer&mdash; say,
+	      <markup role="html">&lt;B&gt;Bold
+	      Text&lt;/B&gt</markup>, the the composer will assume you
+	      meant exactly that, and not "make this text bold," as a
+	      HTML composition tool would.  For the very technically
+	      inclined, that means that when the text <markup
+	      role="html">&lt;B&gt</markup> is sent as HTML, it will
+	      be converted to the string
+	      <literal>&amp;lt;B&amp;gt;</literal>.  Real gearheads
+	      should wonder how I got all that stuff straight, given
+	      that I'm writing this in SGML.
+	    </para>
+	  </note>
 	  <para>
-            As messages that meet the vFolder criteria arrive or are
-            deleted, <application>Evolution</application> will
-            automatically place them in and and remove them from the
-            vFolder contents list.  When you delete a message, it gets
-            erased from the folder it actually exists in as well as
-            any vFolders which include it.
-          </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.
+	    <emphasis>Some</emphasis> people refer to HTML mail as
+	    "the root of all evil" and get very angry if you send
+	    them HTML mail, which is why the default in
+	    <application>Evolution</application> is plain text.
+	    If you choose to send HTML mail, but have an address
+	    book entry for someone who does not wish to receive
+	    HTML-enhanced mail, you can note that preference in
+	    their address card.  The mailer will automatically
+	    strip the HTML tags from any messages you send to that
+	    address.
+	  </para>
+	</sect4>
+
+	<sect4 id="usage-mail-getnsend-send-attach">
+	  <title>Attachments</title>
 	  <para>
-            That's pretty complicated.  But it can be useful. For
-            example, if I have a folder for all the email from one
-            person, and another folder for all the email on a given
-            topic, I feel organized. But when the person sends me
-            mail about the topic, my whole email filing universe
-            becomes chaotic.  I need vFolders to save the day for me.
-          </para>
+	    If you want to attach a file to your email message,
+	    you can do so by <!--describe process here-->.  If
+	    your recipients can read HTML mail, you can put an
+	    image inside the mail by dragging the file into the
+	    composer window, or by selecting <guimenuitem>Menu
+	    Item</guimenuitem> from the <guimenu>Menu</guimenu>
+	    menu.  Still, unless you know what email client the
+	    recipient is using, it's best to send a message or
+	    attachment in the simplest manner possible.
+	  </para>
+	</sect4>
+	<sect4 id="usage-mail-getnsend-send-live">
+	  <title>Live Documents</title>
 	  <para>
-            That sounds silly, but imagine a business trying to keep
-	    track of mail from hundreds of vendors and clients, or a
-	    university with overlapping and changing groups of
-	    faculty, staff, administrators and students.  The larger
-	    the system, the less you can afford that sort of
-	    confusion.  vFolders make for better organization because
-	    they can accept overlapping groups in a way that regular
-	    folders and filing systems can't.
-          </para>
-
-	  <example id="usage-mail-organize-vFolders-ex">
-	    <title>Using Folders, Searches, and vFolders</title>
-	    <para>
-	       To organize my mail box, I can set up a vFolder
-	       for emails from my friend Vince, by doing (INSERT
-	       PROCESS HERE).  Then, whenever I want to see the
-	       messages Vince has sent me, I open the vFolder, and
-	       every message he's sent me shows up, no matter where
-	       I've actually filed it.  If I want, I can also create a
-	       vFolder containing any message from my list of
-	       co-workers which also has the name of the project in
-	       it.  That way, when Vince sends me mail about the
-	       project, I can see that message both in the "Vince"
-	       vFolder and in the "Project" vFolder.  That's because
-	       when I open up the "Vince" folder, I'm really
-	       performing a search for all the mail from Vince, and
-	       when I open the "Project" folder I'm really performing
-	       a search for all the mail about the project.
-
-              (INSERT SCREENSHOT HERE)
+	    Later versions of <application>Evolution</application>
+	    will allow you to enliven your email with almost any
+	    sort of document, and even with entire
+	    applications. At this point, however, this feature has not 
+	    yet been implimented.
+	  </para>
+	</sect4>
+      </sect3>
+
+      <sect3 id="usage-getnsend-fwd">
+	<title>Forwarding Mail</title>      
+	<para>
+	  <guilabel>Forward</guilabel> is useful if you have
+	  received a message and you think someone else would like
+	  to see it, or if you get a message intended for someone
+	  else.  You can forward a message as an attachment to a
+	  new message (the default way of forwarding) or you can send it
+	  <glossterm>inline</glossterm> as a quoted portion of the
+	  message you are sending.  Attachment forwarding is best
+	  if you want to send the entire message you received,
+	  unaltered.  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 where, if at all, you have removed or
+	  altered content.
+	</para>
+	<para>
+	  To forward a message, first make sure it is selected by
+	  clicking it once in the message list.  Then, press
+	  <guibutton>Forward</guibutton> on the toolbar, or select
+	  SOMETHING.  To forward a message
+	  <glossterm>inline</glossterm> instead of attached, select
+	  <guimenuitem>Forward Inline </guimenuitem> from the
+	  <guimenu>Message</guimenu> menu.  Choose an addressee as you
+	  would when sending a new message; the subject will already
+	  be entered, but you can alter it.  Enter your comments on
+	  the message in the <interface>composition frame</interface>,
+	  and press <guibutton>Send</guibutton>.
+	</para>
+      </sect3>
+      <sect3 id="usage-mail-getnsend-ettiquette">
+	<title>Seven Tips for Email Usage</title>
+	<para>
+	  I started with ten, but four were "Don't send
+	  <glossterm>spam</glossterm>."
+	  <itemizedlist>
+	    <listitem>
+	      <para>
+		Always begin and close with a salutation. Say
+		"please" and "thank you", just like you do in real
+		life. You can keep your pleasantries short, but be pleasant!
+	      </para>
+	    </listitem>
 
-	    </para>
-	  </example>
-          <para>
-             To create a vFolder, select <guimenuitem>VFolder
-             Druid</guimenuitem> from the <guimenu>Tools</guimenu>
-             menu in the <interface>main window</interface>.  This
-             will bring up a dialog box that looks suspiciously like
-             the Filter Druid (for more information on filters, see
-             <xref linkend="usage-mail-organize-filters">), and which
-             presents you with a list of vFolders you have previously
-             created. If you have already created vFolders, you can
-             click on them in the frame labelled <guilabel>Select Rule
-             Type</guilabel>, and edit or remove them.  If you have
-             not created any, there will be only one available option:
-             click <guibutton>Add</guibutton> to add a new vFolder.
-          </para>
-          <para>
-             You'll be prompted to create a filtering rule. To do so,
-             select one of the base rules, and click
-             <guibutton>Next</guibutton> to customize it.  Your options are:
-        <itemizedlist>
-             <listitem>
-                <para>
-                   For matching messages: you may select one or more
-                   search criteria; the vFolder you create will
-                   contain messages that match all of
-                   them.
-                 </para>
-               </listitem>
-               <listitem>
-                 <para>
-                    Messages from a certain person: you enter an email
-                    address, and the vFolder will contain any messages
-                    from that address.
-                 </para>
-               </listitem>
-               <listitem>
-                 <para>
-                   Messages to a certain address: any messages sent
-                   directly to this address will be in the vFolder you create.
-                  </para>
-               </listitem>
-               <listitem>
-                 <para>
-                    Messages with a given subject: enter a subject,
-                    and the vFolder will contain messages with that
-                    subject.
-                 </para>
-               </listitem>
-              </itemizedlist>
-            as is shown in <xref linkend="usage-mail-vfolder-fig-createrule">
-
-	   <figure id="usage-mail-vfolder-fig-createrule">
-	     <title>Selecting a vFolder Rule</title>
-	     <screenshot>
-	      <screeninfo>Selecting a vFolder Rule</screeninfo>
-	      <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
-          </para>
-          <para>
- 
-            Once you click <guibutton>Next</guibutton>, you'll
-            customize the vFolder rule.  This process is somewhat
-            complicated, but promises to get much more simple in
-            future versions of <application>Evolution</application>.
-            As it stands now, try clicking different things to have
-            the sentence in the bottom frame make sense.
-
-          </para>
-	</sect2>
-
-	<sect2 id="usage-mail-organize-filters">
-	  <title>Staying organized: Mail Filters in Evolution</title>
-	  <para>
-            Filters sort your email for you.  People who subscribe to
-            multiple mailing lists, or who often need to refer to
-            messages they have sent, find filters especially helpful
-            to seperate personal from list-related mail, but they're
-            good for anybody who gets more than a few messages a day.
-            To create a filter, go to your
-            <interface>Inbox</interface>.  Then select
-            <guimenuitem>Filter Druid</guimenuitem> from the
-            <guimenu>Tools</guimenu> menu. This will bring up a
-            <glossterm>druid</glossterm>, or assistant, which will
-            allow you to create filters.  The <interface>filter
-            druid</interface> is shown in <xref linkend="usage-mail-filters-fig-new">
-
-           
-	   <figure id="usage-mail-filters-fig-new">
-	     <title>Creating a new Filter</title>
-	     <screenshot>
-	      <screeninfo>Creating a new Filter</screeninfo>
-	      <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
-
-          </para>
-
-          <para> The <interface>filter druid</interface> window
-            contains a window listing rules, and an option to create a
-            new rule.  To start filtering your mail, click
-            <guibutton>Add</guibutton> to add a filtering rule.
-            You'll decide when it should take place: 
-              <itemizedlist>
-		<listitem>
-                   <para>
-                     <guilabel>When mail arrives:</guilabel> Select
-		     this option to have messages filtered as they
-		     arrive.
-                   </para>
-                 </listitem>
-                 <listitem>
-                   <para>
-                     <guilabel>When mail is sent:</guilabel> Select
-                     this option to filter your outgoing mail.  You
-                     can use this feature to keep your
-                     <interface>Outbox</interface> as organized as
-                     your <interface>Inbox</interface>.
-                 </para>
-              </listitem>
-            </itemizedlist>
-          </para>
+	    <listitem>
+	      <para>
+		ALL CAPS MEANS YOU'RE SHOUTING!
+	      </para>
+	    </listitem>
 
-	  <para>
-           Then, the filter druid will ask you which emails it should
-           act upon.  You can set criteria to include words or phrases
-           in the subject, To:, Cc: or body of the message.  Once
-           you've decided which messages to filter, the druid will ask
-           you the sort of action you wish to take.  More details and
-           screenshots should follow here.
-          </para>
+	    <listitem>
+	      <para>
+		 Never write anything in email you wouldn't say in
+		 public.  Old messages have a nasty habit of
+		 resurfacing when you least expect them to.
+	      </para>
+	    </listitem>
 
+	    <listitem>
+	      <para>
+	       Check your spelling and use complete sentences.
+	      </para>
+	    </listitem>
 
-	  <note>
-	    <title>Two Notable Filter Features</title>
+	    <listitem>
+	      <para>
+		Don't send nasty emails (flames).  If you get one,
+		don't write back.
+	      </para>
+	    </listitem>
+
+	    <listitem>
+	      <para>
+		 Don't send spam or forward chain mail.  If you
+		 must, verify any rumors, and make sure the
+		 message doesn't have multiple layers of email
+		 quotation symbols (&gt;) indicating multiple
+		 layers of careless inline forwarding.
+	      </para>
+	    </listitem>
+
+	    <listitem>
+	      <para>
+		 When you reply or forward, include just enough of
+		 the previous message to provide context. Not too
+		 much, not too little.
+	       </para>
+	    </listitem>
+	  </itemizedlist>
+	</para>
+	<para> Happy mailing! </para>
+      </sect3>
+    </sect2>
+  </sect1>
+
+  <sect1 id="usage-mail-organize">
+    <title>Organizing Your Mail</title>
+    <para>
+      Even if you only get a few email messages a day, you
+      probably want to sort and organize them.  When you get a
+      hundred a day and you want to refer to a message you
+      received six weeks ago, you need to sort and organize them,
+      and <application>Evolution</application> has the tools to
+      help you do it.  
+    </para>
+
+    <sect2 id="usage-mail-organize-folders">
+      <title>Getting Organized with Folders</title>
+      <para>
+	<application>Evolution</application> keeps mail, as well as
+	address cards and calendars, in folders.  Some, like
+	<guilabel>Inbox</guilabel>, <guilabel>Outbox</guilabel>, and
+	<guilabel>Drafts</guilabel> have already been created for
+	you. If you like, you can create new folders by selecting
+	<guisubmenu>New</guisubmenu> and then
+	<guimenuitem>Folder</guimenuitem> from the
+	<guimenu>File</guimenu> menu.  You must specify both the name
+	and the type of the folder; a folder can hold mail, calendars,
+	or address cards, but you can't mix them up.  Some people
+	don't like that. Too bad.
+      </para>
+      <para>
+        The new folders will appear in the <interface>folder
+	view</interface>, and you can drag them wherever you want to
+	relocate them.  You can drag messages around too.  If you
+	create filters with the <interface>filter
+	assistant</interface>, you can have mail moved to a folder
+	automatically.  An email message can be in only one folder at
+	a time, just like real mail in real folders.
+      </para>
+    </sect2>    
+
+    <sect2 id="usage-mail-organize-search">
+      <title>Searching for Messages</title>
+      <para>
+	Because <application>Evolution</application> automatically
+	creates an index of every email you send or receive, it can
+	search through your old messages and present you with results
+	very quickly.  You can search through just the message
+	subjects, just the message body, or both body and subjet.
+      </para>
+      <para>
+	To create a search, enter the word or phrase you're
+	looking for in the form field below the toolbar, and
+	choose a search type:
+	<itemizedlist>
+	  <listitem>
 	    <para>
-              <itemizedlist>
-		<listitem><para>Any incoming email that does not meet
-                filter action criteria remains in the Inbox. </para>
-                </listitem>
-		
-		<listitem><para>If you move a folder, your filters
-                will follow it.  </para></listitem>
-	      </itemizedlist>
-            </para>
-	  </note>
-	</sect2>
-      </sect1>
-    </chapter>
-<!-- ================ END OF MAILER CHAPTER ============= -->
+	      <guilabel>Body or subject contains:</guilabel> This
+	      will search message subjects and the messages
+	      themselves for the word or phrase you've entered in
+	      the search field.
+	   </para>
+	 </listitem>
+
+	  <listitem>
+	    <para>
+	      <guilabel>Body contains:</guilabel> This will search
+	       only in message text, not the subject lines.
+	   </para>
+	 </listitem>
 
+	  <listitem>
+	    <para>
+	      <guilabel>Subject contains:</guilabel> This will
+	      show you messages where the search text is in the
+	      subject line.  It will not search in the message body.
+	   </para>
+	 </listitem>
+
+	  <listitem>
+	    <para>
+	      <guilabel>Body does not contain:</guilabel> This
+	      finds every email message that does not have the
+	      search text in the message body.  It will still show
+	      messages that have the search text in the subject
+	      line, if it is not also in the body.
+	   </para>
+	 </listitem>
+
+	  <listitem>
+	    <para>
+	      <guilabel>Subject does not contain:</guilabel>This
+	      finds every mail whose subject does not
+	      contain the search text.
+	   </para>
+	 </listitem>
+	</itemizedlist>
+
+        Then, press <keycap>Enter</keycap>.
+        <application>Evolution</application> will show your search
+        results in 
+
+      </para>
+    </sect2>
+
+    <sect2 id="usage-mail-organize-filters">
+      <title>Staying organized: Mail Filters in Evolution</title>
+      <para>
+	Filters sort your email for you.  People who subscribe to
+	multiple mailing lists, or who often need to refer to messages
+	they have sent, find filters especially helpful to seperate
+	personal from list-related mail, but they're good for anybody
+	who gets more than a few messages a day.  To create a filter,
+	go to your <interface>Inbox</interface>.  Then select
+	<guimenuitem>Filter Assistant</guimenuitem> from the
+	<guimenu>Tools</guimenu> menu. This will bring up a window
+	which will guide you through filter creation.  The
+	<interface>filter assistant</interface> is shown in <xref
+	linkend="usage-mail-filters-fig-new">
+
+
+       <figure id="usage-mail-filters-fig-new">
+	 <title>Creating a new Filter</title>
+	 <screenshot>
+	  <screeninfo>Creating a new Filter</screeninfo>
+	  <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+
+      </para>
+
+      <para> The <interface>filter assistant</interface> window
+	contains a window listing rules, and an option to create a
+	new rule.  To start filtering your mail, click
+	<guibutton>Add</guibutton> to add a filtering rule.
+	You'll decide when it should take place: 
+	  <itemizedlist>
+	    <listitem>
+	       <para>
+		 <guilabel>When mail arrives:</guilabel> Select
+		 this option to have messages filtered as they
+		 arrive.
+	       </para>
+	     </listitem>
+	     <listitem>
+	       <para>
+		 <guilabel>When mail is sent:</guilabel> Select
+		 this option to filter your outgoing mail.  You
+		 can use this feature to keep your
+		 <interface>Outbox</interface> as organized as
+		 your <interface>Inbox</interface>.
+	     </para>
+	  </listitem>
+	</itemizedlist>
+      </para>
+
+      <para>
+       Then, the filter assistant will ask you which emails it should act
+       upon.  You can set criteria to include words or phrases in the
+       subject, To:, Cc: or body of the message. (FIXME: WHAT ELSE?)
+       Once you've decided which messages to filter, the assistant will
+       ask you the sort of action you wish to take.  More details and
+       screenshots should follow here.
+      </para>
+
+
+      <note>
+	<title>Two Notable Filter Features</title>
+	<para>
+	  <itemizedlist>
+	    <listitem><para>Any incoming email that does not meet
+	    filter action criteria remains in the Inbox. </para>
+	    </listitem>
+
+	    <listitem><para>If you move a folder, your filters
+	    will follow it.  </para></listitem>
+	  </itemizedlist>
+	</para>
+      </note>
+    </sect2>
+
+
+
+    <sect2 id="usage-mail-organize-vFolders">
+      <title>Getting Really Organized with Virtual Folders</title>
+      <para>
+	If you find that filters aren't flexible enough for you, or
+	end up performing the same search again and again, you should
+	consider a virtual folder. Virtual folders, or vFolders, are
+	an advanced way of viewing your email messages within
+	<application>Evolution</application>.  If you get a lot of
+	mail or often forget where you put messages, vFolders can help
+	you stay on top of things.
+      </para>
+      <para>
+	A vFolder 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.  Once you've set it up, you'll be
+	able to open it and read the messages in it as though it were
+	a normal mail folder.  It's not a folder, though, because when
+	you open a vFolder, <application>Evolution</application>
+	performs a search for you.  It's not a regular search, though,
+	because you can build a vFolder with a very complicated set of
+	criteria with multiple inclusions and exclusions, as though
+	you were setting up a filter.
+      </para>
+
+<!-- potentially useful, but doesn't fit at the moment:
+     <para>
+       An important difference between a folder and a virtual folder
+	is that a conventional folder actually contains messages, but
+	a vFolder is a view of messages that may be in several
+	different folders.  This means that while a message may fall
+	into several vFolders, it can be in only one conventional
+	folder.  Also, it means that you cannot remove a message from
+	a vFolder unless you delete it, and you cannot add a message
+	to a vFolder unless you change the vFolder's search criteria.
+      </para>
+-->
+
+      <para>
+	As messages that meet the vFolder criteria arrive or are
+	deleted, <application>Evolution</application> will
+	automatically place them in and and remove them from the
+	vFolder contents list.  When you delete a message, it gets
+	erased from the folder in which it actually exists, as well as
+	any vFolders which include it.
+      </para>
+      <para>
+	That's pretty complicated, but it can be useful. For example,
+	if I have a folder for all the email from one person, and
+	another folder for all the email on a given topic, I
+	<emphasis>feel</emphasis> organized.  But when the person
+	sends me mail about the topic, my whole email filing universe
+	becomes chaotic, and I need vFolders to save the day for me.
+      </para>
+      <para>
+	That sounds silly, but imagine a business trying to keep track
+	of mail from hundreds of vendors and clients, or a university
+	with overlapping and changing groups of faculty, staff,
+	administrators and students.  The larger the system, the less
+	you can afford the sort of confusion that stems from an
+	organizational system that's not flexible enough.  vFolders
+	make for better organization because they can accept
+	overlapping groups in a way that regular folders and filing
+	systems can't.
+      </para>
+
+      <example id="usage-mail-organize-vFolders-ex">
+	<title>Using Folders, Searches, and vFolders</title>
+	<para>
+	   To organize my mail box, I can set up a vFolder
+	   for emails from my friend Vince, by doing (INSERT
+	   PROCESS HERE).  Then, whenever I want to see the
+	   messages Vince has sent me, I open the vFolder, and
+	   every message he's sent me shows up, no matter where
+	   I've actually filed it.  If I want, I can also create a
+	   vFolder containing any message from my list of
+	   co-workers which also has the name of the project in
+	   it.  That way, when Vince sends me mail about the
+	   project, I can see that message both in the "Vince"
+	   vFolder and in the "Project" vFolder.  That's because
+	   when I open up the "Vince" folder, I'm really
+	   performing a search for all the mail from Vince, and
+	   when I open the "Project" folder I'm really performing
+	   a search for all the mail about the project.
+
+	  (INSERT SCREENSHOT HERE)
+
+	</para>
+      </example>
+      <para>
+	 To create a vFolder, select <guimenuitem>VFolder
+	 Assistant</guimenuitem> from the <guimenu>Tools</guimenu>
+	 menu in the <interface>main window</interface>.  This
+	 will bring up a dialog box that looks suspiciously like
+	 the Filter Assistant (for more information on filters, see
+	 <xref linkend="usage-mail-organize-filters">), and which
+	 presents you with a list of vFolders you have previously
+	 created. If you have already created vFolders, you can
+	 click on them in the frame labelled <guilabel>Select Rule
+	 Type</guilabel>, and edit or remove them.  If you have
+	 not created any, there will be only one available option:
+	 click <guibutton>Add</guibutton> to add a new vFolder.
+      </para>
+      <para>
+	 You'll be prompted to create a filtering rule. To do so,
+	 select one of the base rules, and click
+	 <guibutton>Next</guibutton> to customize it.  Your options are:
+    <itemizedlist>
+	 <listitem>
+	    <para>
+	       For matching messages: you may select one or more
+	       search criteria; the vFolder you create will
+	       contain messages that match all of
+	       them.
+	     </para>
+	   </listitem>
+	   <listitem>
+	     <para>
+		Messages from a certain person: you enter an email
+		address, and the vFolder will contain any messages
+		from that address.
+	     </para>
+	   </listitem>
+	   <listitem>
+	     <para>
+	       Messages to a certain address: any messages sent
+	       directly to this address will be in the vFolder you create.
+	      </para>
+	   </listitem>
+	   <listitem>
+	     <para>
+		Messages with a given subject: enter a subject,
+		and the vFolder will contain messages with that
+		subject.
+	     </para>
+	   </listitem>
+	  </itemizedlist>
+	as is shown in <xref linkend="usage-mail-vfolder-fig-createrule">
+
+       <figure id="usage-mail-vfolder-fig-createrule">
+	 <title>Selecting a vFolder Rule</title>
+	 <screenshot>
+	  <screeninfo>Selecting a vFolder Rule</screeninfo>
+	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+      </para>
+      <para>
+
+	Once you click <guibutton>Next</guibutton>, you'll
+	customize the vFolder rule.  This process is somewhat
+	complicated, but promises to get much more simple in
+	future versions of <application>Evolution</application>.
+	As it stands now, try clicking different things to have
+	the sentence in the bottom frame make sense.
+
+      </para>
+    </sect2>
+
+  </sect1>
+</chapter>
diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml
index 0863c2b72e..fc2b894a04 100644
--- a/doc/C/usage-mainwindow.sgml
+++ b/doc/C/usage-mainwindow.sgml
@@ -1,261 +1,310 @@
 
-    <chapter id="usage-mainwindow">
+<chapter id="usage-mainwindow">
+
+  <title>The Main Window: Evolution Basics</title>
+  <para>
+     Start <application>Evolution</application> by selecting
+     <guimenuitem>Evolution</guimenuitem> from the
+     <guisubmenu>Applications</guisubmenu> of the <guimenu>Main Panel
+     Menu</guimenu>, or by typing <command>evolution</command> at the
+     command-line.  After <application>Evolution</application> starts
+     up, you will see the <interface>main window</interface>, with the
+     <interface>Inbox</interface> open.  It should look a lot like the
+     picture in <xref linkend="usage-mainwindow-fig">. On the left of
+     the <interface>main window</interface> is the <interface>shortcut
+     bar</interface>, with several buttons in it.  Just underneath the
+     title bar is a series of menus in the <interface>menu
+     bar</interface>, and below that, the <interface>tool
+     bar</interface> with buttons for different functions. The largest
+     part of the <interface>main window</interface> is taken up by the
+     actual <interface>Inbox</interface>, with a listing of messages
+     you have recieved.  If you're running the program for the first
+     time, you'll just have one: a welcome message from Helix Code.
 
-    <title>The Main Window: Evolution Basics</title>
-      <para>
-	
-        Start <application>Evolution</application> by selecting
-	<guimenuitem>Evolution</guimenuitem> from the
-	<guisubmenu>Applications</guisubmenu> of the <guimenu>Main
-	Panel Menu</guimenu>, or by typing
-	<command>evolution</command> at the command-line.After
-	<application>Evolution</application> starts up, you will see
-	the <interface>main window</interface>, which looks a lot like
-	in <xref linkend="usage-mainwindow-fig">. On the left of the
-	<interface>main window</interface> are the <interface>shortcut
-	bar</interface> and the <interface>tree-view</interface>.
-	Just underneath the title bar is a series of menus in the
-	<interface>menu bar</interface>, and below that, the
-	<interface>tool bar</interface> with buttons for different
-	functions. The largest part of the <interface>main
-	window</interface> is taken up by a welcome message.  <!--
-	para does not end here but after fig! -->
 
 <!-- ==============Figure=================================== -->
 
 <!--
-Make sure that this figure meets its descriptions below: it should
-show the shortcut bar, the tree view with some trees expanded, and so
-forth.  Can these things be labelled with little arrows & stuff?
- -->
-
-	<figure id="usage-mainwindow-fig">
-	<title>Evolution Main Window and Inbox</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-	</figure>
+Make sure that this figure meets its descriptions.
+Can these things be labelled with little arrows & stuff?
+-->
+
+    <figure id="usage-mainwindow-fig">
+    <title>Evolution Main Window and Inbox</title>
+    <screenshot>
+      <screeninfo>Evolution Main Window</screeninfo>
+      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
+	</graphic>
+    </screenshot>
+    </figure>
 <!-- ==============End of Figure=================================== -->
+</para>
 
-
-        <note>
-	  <title>The Way Evolution Looks</title>
-	  <para>
- 	    The appearance of both
-	    <application>Evolution</application> and
-	    <application>GNOME</application> is very easy to
-	    customize, so your screen might not look like this
-	    picture.  You might configure
-	    <application>Evolution</application> to start with a
-	    different view, or without the <interface>shortcut
-	    bar</interface> or <interface>tree view</interface>.
-          </para>
-	</note>
+   <para>
+    <note>
+      <title>The Way Evolution Looks</title>
+      <para>
+	The appearance of both
+	<application>Evolution</application> and
+	<application>GNOME</application> is very easy to
+	customize, so your screen might not look like this
+	picture.  You might configure
+	<application>Evolution</application> to start with a
+	different view, or without the <interface>shortcut
+	bar</interface> or <interface>folder view</interface>.
       </para>
+    </note>
+  </para>
+  
+  <sect1 id="usage-mainwindow-shortcutbar">
+    <title>The Shortcut Bar</title>
+    <para>
+        One of <application>Evolution</application>'s most important
+        job is to give you access to your information, and help you
+        use it quickly.  One way it does that is through the
+        <interface>shortcut bar</interface>, that column of buttons on
+        the left hand side of the main window.  There are actually two
+        kinds of buttons in the shortcut bar: familiar looking icons,
+        and the thin rectangles at the top and bottom of the column
+        which separate your shortcuts by category.
+    </para>
+    <para>
+       The category buttons, labelled <guilabel>Evolution
+       Shortcuts</guilabel> and <guilabel>Internet
+       Directories</guilabel>, slide up and down when you click on
+       them.  When you first start
+       <application>Evolution</application>, you are lookig at the
+       <guilabel>Evolution Shortcuts</guilabel>.  If you click
+       <guilabel>Internet Directories</guilabel>, it will slide up and
+       you'll see buttons for the <guilabel>Bigfoot</guilabel> and
+       <guilabel>Netcenter</guilabel> directories, as well as any
+       others you or your system administrator might have added.
+       Click on <guibutton>Evolution Shortcuts</guibutton> to look at
+       the shortcuts again.  Those buttons give you fast access to the
+       major fucntions that <application>Evolution</application>
+       provides for you.
+    </para>
+    <para>
+     They are:
+      <itemizedlist>
+
+<!--  NOT IMPLEMENTED! 
+	<listitem>
+	  <para>
+	    <guibutton>Today</guibutton>, which will bring up a summary
+	    of any new messages you've recieved, along with the tasks and
+	    appointments you have lined up for today.
+	  </para>
+	</listitem>
+-->
+	<listitem>
+	  <para>
+	    <guibutton>Inbox</guibutton>, which will show you all
+	    of your email.  Your Inbox is also where you can
+	    access Evolution's tools to filter, sort, organize,
+	    and search your mail.
+	  </para>
+	</listitem>
+
+	<listitem>
+	   <para>
+	      The <guibutton>Calendar</guibutton>, which can store
+	      appointments for you.  Connected to a network, you
+	      can use it to keep a group of people on schedule and
+	      up to date.
+	   </para>
+	</listitem>
+
+	<listitem>
+	  <para>
+	    The <guibutton>Contacts</guibutton> tool holds your
+	    addresses, phone numbers, and contact information.
+	    Like calendar information, contact data can be
+	    synchronized with hand-held devices and shared over a
+	    network.  
+	  </para>
+	</listitem>
+
+<!-- NOT IMPLEMENTED YET
 
-      <sect1 id="usage-mainwindow-shortcutbar">
-	<title>The Shortcut Bar</title>
-	<para>
-          The buttons in the <interface>shortcut bar</interface> give
-          you quick access to the different functions that
-          <application>Evolution</application> provides.
-        </para>
-	<para>
-          The buttons in the <interface>shortcut bar</interface> are:
-          <itemizedlist>
-	    <listitem>
-	      <para>
-                <guibutton>Today</guibutton>, which will bring up a summary
-                of any new messages you've recieved, along with the tasks and
-                appointments you have lined up for today.
-              </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-                <guibutton>Inbox</guibutton>, which will show you all
-                of your email.  Your Inbox is also where you can
-                access Evolution's tools to filter, sort, organize,
-                and search your mail.
-              </para>
-	    </listitem>
-
-	    <listitem>
-	       <para>
-                  The <guibutton>Calendar</guibutton>, which can store
-                  appointments for you.  Connected to a network, you
-                  can use it to keep a group of people on schedule and
-                  up to date.
-               </para>
-            </listitem>
-
-	    <listitem>
-	      <para>
-                The <guibutton>Contacts</guibutton> tool holds your
-                addresses, phone numbers, and contact information.
-                Like calendar information, contact data can be
-                synchronized with hand-held devices and shared over a
-                network.  
-              </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-                 The <guibutton>Tasks</guibutton> tool combines a "to
-                 do" list with reminders to help you keep track of
-                 daily events.
-              </para>
-	    </listitem>
-
-	    <listitem>
-	      <para> <guibutton>Notes</guibutton> is your catch-all
-                notepad: write <glossterm>haiku</glossterm>, take down
-                messages from phone conversations, or keep small
-                things organized.
-              </para>
-	    </listitem>
-	  </itemizedlist>
-
-
-        </para>
-	<para>
-          If you prefer to use a keyboard shortcut, or <glossterm>hot
-          key</glossterm>, you can use those instead.  They're
-          shown... (INSERT DESCRIPTION) You can also set your own hot
-          keys for functions that don't have any; this is covered in
-          <xref linkend="config">.  If you're using the keyboard
-          shortcuts you may also want to hide the <interface>shortcut
-          bar</interface> by selecting <guimenuitem>Hide/Show Shortcut
-          Bar</guimenuitem> from the <guimenu>MENU</guimenu> menu.
-        </para>
-     </sect1>
-
-      <sect1 id="usage-mainwindow-treeview">
-	<title>The Tree View</title>
-	<para>
-          The <interface>tree view</interface> is the most comprehensive way to
-          get to your information: it can show you everything you've
-          stored with <application>Evolution</application>
-          appointments, address cards, emails, and so forth.
-        
-          The <interface>tree view</interface> display presents your
-          data like a <glossterm>file tree</glossterm>&mdash; it
-          starts small at the top, and branches downwards. There are a
-          few folders you will always see, because they're at the top.
-          On my computer, I have only one: <guilabel>Local</guilabel>.
-          When I click on the plus sign next to the label, I see the
-          contents:
-          <itemizedlist>
-             <listitem>
-                <para>
-                  <guilabel>Calendar</guilabel>, where you'll find your
-                  appointments and event listings.
-               </para>
-             </listitem> 
-             <listitem>
-                <para>
-                <guilabel>Contacts</guilabel>, where your address
-                cards are stored.
-               </para>
-             </listitem>
-             <listitem>
-                <para>
-              <guilabel>Directories</guilabel>, for search directories, which
-              have not been implemented yet.
-               </para>
-             </listitem>
-             <listitem>
-                <para>
-                 <guilabel>Inbox</guilabel>, for your incoming mail.
-                 This is where you will make the most subfolders.
-               </para>
-             </listitem>
-            <listitem>
-                <para>
-                <guilabel>Outbox</guilabel>, where you can store
-                copies of mail you have sent, or unsent drafts.
-               </para>
-             </listitem>
-             <listitem>
-                <para>
-                <guilabel>Trash</guilabel>, where you can throw things away.
-               </para>
-             </listitem>
-          </itemizedlist>
-
-        </para>
-
-	<para>
-          Right-clicking will bring up a menu for just about anything
-          in GNOME, and <application>Evolution</application> is no
-          exception.  If you right-click on a folder, you'll have a
-          menu with the following options:
-	  <itemizedlist>
-	    <listitem><para>Something</para></listitem>
-	    <listitem><para>Something</para></listitem>
-	    <listitem><para>Something</para></listitem>
-	  </itemizedlist>.
-        </para>
-
-	<tip>
-         <title>Context-Sensitive Help</title>
+	<listitem>
 	  <para>
-            You can almost always get help on an item by
-	    right-clicking it.  If you're not sure what something is,
-	    or don't know what you can do with it, right-clicking and
-	    choosing <guimenuitem>Help</guimenuitem> is a good way to
-	    find out.
-          </para>
-        </tip>
-	
-	<para>
-          If a folder has other folders in it, there will be a plus
-          sign next to it. Click on the plus sign, and the folder will
-          open to let you see the other folders inside.  This may
-          change in the future to something more attractive, like
-          triangles that drop down as you click on them to display the
-          rest of the tree.
-        </para>
-
-	<para>
-          Any time new information arrives in a folder, that folder
-          will be highlighted, or its label displayed as bold
-          text. You can learn more about customizing
-          <application>Evolution</application> alerts and appearance
-          in <xref linkend="config">.
-        </para>
-
-	<para>
-          Moving and deleting folders and other items works in one of
-          two ways: using <glossterm>drag-and-drop</glossterm> or by
-          right-clicking and selecting an item from the
-          <interface>right-click menu</interface>.  You can drag the
-          folders inside the tree view to change their order or put
-          one folder inside another.  To delete a folder, drag it into
-          the trash folder or right-click it and select
-          <guimenuitem>Delete</guimenuitem> from the menu that pops
-          up.  The same goes for individual messages, appointments,
-          and address cards, whether they're in the <interface>tree
-          view</interface> or not: drag them where you want them, and
-          they will go there.  <!-- ****This paragraph could use some
-          work**** -->
-        </para>
-	<para>
-          You can also use the <guimenu>right-click menu</guimenu> to
-          move, rename, and delete folders.
-          <guimenuitem>Delete</guimenuitem> function from the
-          <guimenu>right-click menu</guimenu>.
-        </para>
-	<para>
-          Once you've familiarized yourself with the <interface>main
-          window</interface> you can start doing things with it.
-          We'll start with your email inbox: you've got a letter
-          waiting for you already.
-        </para>
-      </sect1>
-    </chapter>
+	     The <guibutton>Tasks</guibutton> tool combines a "to
+	     do" list with reminders to help you keep track of
+	     daily events.
+	  </para>
+	</listitem>
+
+	<listitem>
+	  <para> <guibutton>Notes</guibutton> is your catch-all
+	    notepad: write <glossterm>haiku</glossterm>, take down
+	    messages from phone conversations, or keep small
+	    things organized.
+	  </para>
+	</listitem>
+-->
+
+      </itemizedlist>
+
+
+    </para>
+    <para>
+      If you prefer to use a keyboard shortcut, or <glossterm>hot
+      key</glossterm>, you can use those instead.  They're shown next
+      to their equivalent menu items in the menu bar. You can also set
+      your own hot keys for functions that don't have any; this is
+      covered in <xref linkend="config">.  If you're using the
+      keyboard shortcuts you may also want to hide the
+      <interface>shortcut bar</interface> by selecting
+      <guimenuitem>Hide/Show Shortcut Bar</guimenuitem> from the
+      <guimenu>MENU</guimenu> menu.
+    </para>
+ </sect1>
+
+  <sect1 id="usage-mainwindow-folderview">
+    <title>The Folder View</title>
+    <para>
+      The <interface>folder view</interface> is the most comprehensive way to
+      get to your information. It can show you everything you've
+      stored with <application>Evolution</application>&mdash;
+      appointments, address cards, emails, and so forth.
+
+      The <interface>folder view</interface> display presents your
+      data like a <glossterm>file tree</glossterm>&mdash; it
+      starts small at the top, and branches downwards. There are a
+      few folders you will always see, because they're at the top.
+      On my computer, I have only one: <guilabel>Local</guilabel>.
+      When I click on the plus sign next to the label, I see the
+      contents:
+      <itemizedlist>
+	 <listitem>
+	    <para>
+	      <guilabel>Calendar</guilabel>, where you'll find your
+	      appointments and event listings.
+	   </para>
+	 </listitem> 
+	 <listitem>
+	    <para>
+	    <guilabel>Contacts</guilabel>, where your address
+	    cards are stored.
+	   </para>
+	 </listitem>
+	 <listitem>
+	    <para>
+	  <guilabel>Directories</guilabel>, for search directories, which
+	  have not been implemented yet.
+	   </para>
+	 </listitem>
+	 <listitem>
+	    <para>
+	     <guilabel>Inbox</guilabel>, for your incoming mail.
+	     This is where you will make the most subfolders.
+	   </para>
+	 </listitem>
+	<listitem>
+	    <para>
+	    <guilabel>Outbox</guilabel>, where you can store
+	    copies of mail you have sent, or unsent drafts.
+	   </para>
+	 </listitem>
+	 <listitem>
+	    <para>
+	    <guilabel>Trash</guilabel>, where you can throw things away.
+	   </para>
+	 </listitem>
+      </itemizedlist>
+
+    </para>
+
+    <para>
+      Right-clicking will bring up a menu for just about anything
+      in GNOME, and <application>Evolution</application> is no
+      exception.  If you right-click on a folder, you'll have a
+      menu with the following options:
+      <itemizedlist>
+	<listitem><para>Something</para></listitem>
+	<listitem><para>Something</para></listitem>
+	<listitem><para>Something</para></listitem>
+      </itemizedlist>.
+    </para>
+
+    <tip>
+     <title>Context-Sensitive Help</title>
+      <para>
+	You can almost always get help on an item by
+	right-clicking it.  If you're not sure what something is,
+	or don't know what you can do with it, right-clicking and
+	choosing <guimenuitem>Help</guimenuitem> is a good way to
+	find out.
+      </para>
+    </tip>
+
+    <para>
+      If a folder has other folders in it, there will be a plus
+      sign next to it. Click on the plus sign, and the folder will
+      open to let you see the other folders inside.  This may
+      change in the future to something more attractive, like
+      triangles that drop down as you click on them to display the
+      rest of the tree.
+    </para>
+
+    <para>
+      Any time new information arrives in a folder, that folder
+      will be highlighted, or its label displayed as bold
+      text. You can learn more about customizing
+      <application>Evolution</application> alerts and appearance
+      in <xref linkend="config">.
+    </para>
+
+    <para>
+      Moving and deleting folders and other items works in one of
+      two ways: using <glossterm>drag-and-drop</glossterm> or by
+      right-clicking and selecting an item from the
+      <interface>right-click menu</interface>.  You can drag the
+      folders inside the folder view to change their order or put
+      one folder inside another.  To delete a folder, drag it into
+      the trash folder or right-click it and select
+      <guimenuitem>Delete</guimenuitem> from the menu that pops
+      up.  The same goes for individual messages, appointments,
+      and address cards, whether they're in the <interface>folder
+      view</interface> or not: drag them where you want them, and
+      they will go there.  <!-- ****This paragraph could use some
+      work**** -->
+    </para>
+    <para>
+      You can also use the <guimenu>right-click menu</guimenu> to
+      move, rename, and delete folders.
+      <guimenuitem>Delete</guimenuitem> function from the
+      <guimenu>right-click menu</guimenu>.
+    </para>
+  </sect1>
+  <sect1 id="usage-mainwindow-menubar">
+    <title>The Menu Bar</title>
+    <para>
+      The <interface>menu bar</interface>'s contents will always
+      provide all the possible actions for any view of your data.
+      That means that, depending on the context, menu bar items will
+      change.  If you're looking at your Inbox, most of the menu items
+      will relate to mail; some will relate to other components of
+      <application>Evolution</application> and some, especially those
+      in the <guimenu>File Menu</guimenu> will relate to the
+      application as a whole. You can probably guess that the
+      <guimenu>Help Menu</guimenu> is where to go for help, and that
+      the <guimenu>View</guimenu> menu controls the way that
+      <application>Evolution</application> looks.  Other menu items
+      are a little less obvious, and change a little more, so we'll
+      cover them later on as we discuss the things you can do with
+      <application>Evolution</application>.
+    </para>
+  </sect1>
+    <para>
+      Once you've familiarized yourself with the <interface>main
+      window</interface> you can start doing things with it.
+      We'll start with your email inbox: you've got a letter
+      waiting for you already.
+    </para>
+
+</chapter>
 
 
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1763085829..5a0a10b948 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,16 @@
+2000-06-14  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.
+
+	* C/usage-mail.sgml: Improved filter and vfolder
+	description, and some minor changes from me and Kevin.
+
+2000-06-07  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.
+	* C/fig/config-cal.png: new file (screenshot for above)
+	* C/fig/config-mail.png: same
+	
 2000-06-05  Aaron Weber  <aaron@helixcode.com>
 
 	* C/usage-calendar.sgml: Incorporated chgs from Kevin.
diff --git a/help/C/fig/config-camel.png b/help/C/fig/config-camel.png
deleted file mode 100644
index e9e5debc78..0000000000
--- a/help/C/fig/config-camel.png
+++ /dev/null
diff --git a/help/C/usage-contact.sgml b/help/C/usage-contact.sgml
index 86cf73fd34..fdd988d55d 100644
--- a/help/C/usage-contact.sgml
+++ b/help/C/usage-contact.sgml
@@ -1,306 +1,359 @@
-    <chapter id="usage-contact">
-      <title>The Evolution Contact Manager</title>
-      <para>
-          The <application>Evolution</application> contact manager can
-          handle all of the functions of an address book, phone book,
-          or Rolodex.  Of course, <application>Evolution</application>
-          allows easier updates than an actual paper book. <application>
-          Evolution </application> also allows easy synchronization with 
-          handheld and remote devices.  Since <application>Evolution>
-          </application> supports most major network protocols, including
-          <glossterm>LDAP</glossterm>, it's easy to use over an existing
-          network.
-        </para>
-	<para>
-          Another advantage of the
-          <application>Evolution</application> address book is its
-          integration with the rest of the application.  That means
-          that when you look for someone's address, you can also see a
-          history of appointments with that person.  Or, you can get
-          an e-mail with contact information in it and create a new
-          address card on the spot.  In addition, searches and folders
-          and all work in the same way they do in the other
-          components, so you don't have to learn another system for
-          similar tasks.
-        </para>
-	<para>
-          This chapter will cover using the
-          <application>Evolution</application> contact manager to
-          organize any amount of contact information, share addresses
-          over a network, and several ways to save time with everyday
-          tasks.  To learn about configuring the contact manager, see
-          <xref linkend="config-prefs-contact">.
-        </para>
 
-      <sect1 id="usage-contact-basic">
-	<title>Getting Started With the Contact Manager</title>	
 
-	<para>
-          To open up your address book, click on
-          <guibutton>Contacts</guibutton> in the shortcut bar.  The
-          contact manager is illustrated in <xref
-          linkend="usage-contact-fig">
-        </para>
+<chapter id="usage-contact">
+  <title>The Evolution Contact Manager</title>
+  <para>
+     The <application>Evolution</application> contact manager can
+     handle all of the functions of an address book, phone book, or
+     Rolodex.  Of course, <application>Evolution</application> allows
+     easier updates than an actual paper book. <application> Evolution
+     </application> also allows easy synchronization with handheld and
+     remote devices.  Since <application>Evolution</application>
+     supports most major network protocols, including
+     <glossterm>LDAP</glossterm>, it's easy to use over an existing
+     network.
+  </para>
+  <para>
+     Another advantage of the <application>Evolution</application>
+     address book is its integration with the rest of the application.
+     That means that when you look for someone's address, you can also
+     see a history of appointments with that person.  Or, you can get
+     an e-mail with contact information in it and create a new address
+     card on the spot.  In addition, searches and folders and all work
+     in the same way they do in the other components, so you don't
+     have to learn another system for similar tasks.
+  </para>
+  <para>
+     This chapter will cover using the
+     <application>Evolution</application> contact manager to organize
+     any amount of contact information, share addresses over a
+     network, and several ways to save time with everyday tasks.  To
+     learn about configuring the contact manager, see <xref
+     linkend="config-prefs-contact">.
+  </para>
+
+  <sect1 id="usage-contact-basic">
+    <title>Getting Started With the Contact Manager</title>	
+    
+    <para>
+       To open up your address book, click on
+       <guibutton>Contacts</guibutton> in the shortcut bar.  The
+       contact manager is illustrated in <xref
+       linkend="usage-contact-fig">
+    </para>
 
 
-	<figure id="usage-contact-fig">
-	<title>Evolution Contact Manager</title>
-	<screenshot>
-	  <screeninfo>Evolution Contact Manager Window</screeninfo>
-	  <graphic fileref="fig/contact.png" format="png" srccredit="Aaron Weber">
+    <figure id="usage-contact-fig">
+      <title>Evolution Contact Manager</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Manager Window</screeninfo>
+	<graphic fileref="fig/contact" format="png" srccredit="Aaron Weber">
 	    </graphic>
-	</screenshot>
-	</figure>
+      </screenshot>
+    </figure>
 
-	<para>
-          The contact manager interface is broken into two main parts.
-          The first part is the contact display section.  This can be
-          found at the bottom right panel of
-          <application>Evolution</application>.  This section is where
-          all your contact information is displayed.  Each of these
-          cards are organized into folders.  The second section is the
-          administrative section which spans the top of the
-          <application> Evolution</application> window.  This is where
-          you can add, edit, or delete records.
-        </para>
-      </sect1>
-      <sect1 id="usage-contact-cards">
-	<title>Creating, Deleting, and Adding Cards</title>
-	<para>
-          You can create a new card by pressing the <guibutton>New
-          Card</guibutton> button, or by pressing
-          <keysym>KEYSYM</keysym>. The
-          <interface>New Card</interface> window will appear.  It has
-          the following fields:
+    <para>
+       The contact manager interface is broken into two main parts.
+       The first part is the contact display section.  This can be
+       found at the bottom right panel of
+       <application>Evolution</application>.  This section is where
+       all your contact information is displayed.  Each of these cards
+       are organized into folders.  The second section is the
+       administrative section which spans the top of the <application>
+       Evolution</application> window.  This is where you can add,
+       edit, or delete records.
+    </para>
+  </sect1>
+  <sect1 id="usage-contact-cards">
+    <title>Creating, Deleting, and Adding Cards</title>
+    <para>
+       You can create a new card by pressing the <guibutton>New
+       Card</guibutton> button, or by pressing
+       <keysym>KEYSYM</keysym>. The <interface>Contact
+       Editor</interface> window will appear.  It has two tabs,
+       <guilabel>General</guilabel>, for basic contact information,
+       and <guilabel>Details</guilabel>, for a more specific
+       description of the person.  In addition, it contains a full
+       menu bar with all the items from the main window (IS THIS TRUE?
+       DESCRIBE MENUBAR AGAIN?)
+    </para>
+    <para>
+      The <guilabel>General</guilabel> tab contains no less than seven
+      sections, each with an icon: a face, for name and company; a
+      telephone for phone numbers; an envelope for email address; a
+      house for postal address; a handshake for contacts; and a
+      briefcase for categories.  The things that go into most of the
+      text fields should be obvious enough, so we'll just describe the
+      more interesting parts of the window.  Aside from the
+      <guilabel>Categories</guilabel> feature, which is discussed in
+      <xref linkend="usage-contact-organize">, there are two things
+      you'll want to know about.
+   </para>
+   <para>
+      Type "Eva Lucianne Tester" into the <guilabel>Full
+      Name</guilabel> field.  You'll notice that the <guilabel>File
+      As</guilabel> field also fills up, but in a phone-book fashion:
+      Tester, Lucianne.  You can pick "Eva Tester" from the drop-down,
+      or type in your own.  I suggest that you don't enter something
+      entirely different from the actual name, however.  You might
+      forget that you've filed Eva's information under "C" for "Code, Helix."
+   </para>
+   <para>
+      The other little feature I want to mention involves the little
+      squares next to several of the fields.  Click on them and you'll
+      get a menu of different labels; for the fields in the telephone
+      section, it's a long list involving things like
+      <guilabel>Home</guilabel>, <guilabel>Home 2</guilabel>,
+      <guilabel>Other Fax</guilabel>, and <guilabel>Pager</guilabel>.
+      Select from among them to determine which four telephone numbers
+      to display at any given time.  Of course, these connected times
+      mean that people often have more than four telephone numbers.
+      You can display only four in the editor, but
+      <application>Evolution</application> can remember them all for
+      you.  When you click the little square button for the list of
+      labels, any that you've already filled in will be marked.
+   </para>
 
+    <figure id="usage-contact-editor-fig">
+      <title>Evolution Contact Editor</title>
+      <screenshot>
+	<screeninfo>Evolution Contact Editor</screeninfo>
+	<graphic fileref="fig/contact-new" format="png" srccredit="Aaron Weber">
+	    </graphic>
+      </screenshot>
+    </figure>
+
+
+!--
+      <variablelist>
+         <listitem>
+	  <term>
           <itemizedlist>
-            <listitem> <para>
+	<listitem> <para>
                <guilabel>Name:</guilabel> Enter the person's name here
             </para></listitem>
-            <listitem> <para>
+	<listitem> <para>
 
             </para></listitem>
-            <listitem> <para>
+	<listitem> <para>
               <guilabel>Business:</guilabel>
             </para></listitem>
-
-            <listitem> <para>
+	
+	<listitem> <para>
               <guilabel>Job Title:</guilabel>
             </para></listitem>
-
-            <listitem> <para>
+	
+	<listitem> <para>
                <guilabel>Home:</guilabel> 
             </para></listitem>
-	  </itemizedlist>
-        </para>
-	<para>
-           You can choose which fields an address card has, and create
-	   new fields for cards.  For example,
-	   <application>Evolution</application> provides for two line
-	   postal addresses by default, but you may have as many or as
-	   few lines to an address as you wish.  To change which
-	   fields an address card has, choose DESCRIBE HERE HOW TO DO
-	   THIS.
+      </itemizedlist>
         </para>
+    
+-->
+    <para>
+       You can choose which fields an address card has, and create new
+       fields for cards.  For example,
+       <application>Evolution</application> provides for two line
+       postal addresses by default, but you may have as many or as few
+       lines to an address as you wish.  To change which fields an
+       address card has, choose DESCRIBE HERE HOW TO DO THIS.
+    </para>
 
-	<note>
-	  <title>Quick ways to add cards</title>
-	  <para>
-            You can add cards from within an email message or calendar
-            appointment.  While looking at an email, right-click on
-            any email address or message, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem> or
-            <guimenuitem>Create Card for this Sender</guimenuitem>from
-            the menu.  While looking at a calendar
-            appointment, right-click any email address, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem>.
-            (NOTE that feature may change! unimplemented!)
-          </para>
-	</note>
+    <note>
+      <title>Quick ways to add cards</title>
+      <para>
+        You can add cards from within an email message or calendar
+        appointment.  While looking at an email, right-click on any
+        email address or message, and choose <guimenuitem>Create Card
+        for this Address</guimenuitem> or <guimenuitem>Create Card for
+        this Sender</guimenuitem> from the menu.  While looking at a
+        calendar appointment, right-click any email address, and
+        choose <guimenuitem>Create Card for this
+        Address</guimenuitem>.  (NOTE that feature may change!
+        unimplemented!)
+      </para>
+    </note>
+    
+    <para>
+       You delete a card by pressing the <guibutton>Delete
+       Card</guibutton> button, or by dragging it into the trash
+       folder.
+    </para>
 
-	<para>
-          You delete a card by pressing the <guibutton>Delete
-          Card</guibutton> button, or by dragging it into the trash
-          folder.
-        </para>
+    <para>
+      You can move cards around just as you would move email messages:
+      dragging and dropping works, as does right-clicking and choosing
+      <guimenuitem>Move</guimenuitem> from the menu that appears.
+    </para>
+  </sect1>
 
-	<para>
-          You can move cards around just as you would move email
-          messages: dragging and dropping works, as does
-          right-clicking and choosing <guimenuitem>Move</guimenuitem>
-          from the menu that appears.
-        </para>
-      </sect1>
+  <sect1 id="usage-contact-organize">
+    <title>Organizing your Contact Manager</title>
+    <para>
+       Organizing your contact manager is a lot like organizing your
+       mail.  You can have folders and searches the same way you can
+       with mail, but the contact manager does not allow vFolders.  It
+       does, however, allow each card to fall under several
+       categories, and allow you to create your own categories.  We'll
+       go over categories in a bit.
+    </para>
+    <para>
+      Another useful UNIMPLEMENTED
+      <application>Evolution</application> feature is its ability to
+      recognize when people live together.  If two people in your
+      contact manager share an address, and you change the address for
+      one of them, <application>Evolution</application> will ask you
+      if you wish to change the address for both of them, or just for
+      one.
+    </para>
 
-      <sect1 id="usage-contact-organize">
-	<title>Organizing your Contact Manager</title>
+    <sect2 id="usage-contact-organize-group">
+      <title>Groups of contacts</title>
+      <para>
+         <application>Evolution</application> lets you put cards into
+         folders, mark them as members of different groups, and search
+         through them in a variety of ways.  This section will
+         describe how to organize and find contact information using
+         <application>Evolution</application>.  CHANGE THIS paragraph:
+         it needs a great deal of work.
+      </para>
+
+      <sect3 id="usage-contact-organize-group-folder">
+	<title>Grouping with Folders</title>
 	<para>
-          Organizing your contact manager is a lot like organizing
-          your mail.  You can have folders and searches the same way
-          you can with mail, but the contact manager does not allow
-          vFolders.  It does, however, allow each card to fall under
-          several categories, and allow you to create your own
-          categories.  We'll go over categories in a bit.
-        </para>
+	   The simplest way to group address cards is to use folders.
+	   By default, cards start in the
+	   <guilabel>Contacts</guilabel> folder.  You can create more
+	   folders inside that one, or create other address book
+	   folders as well.  Each card must be in one and only one
+	   folder.
+	 </para>
 	<para>
-          Another useful UNIMPLEMENTED
-          <application>Evolution</application> feature is its ability
-          to recognize when people live together.  If two people in
-          your contact manager share an address, and you change the
-          address for one of them, <application>Evolution</application>
-          will ask you if you wish to change the address for both of 
-          them, or just for one.
-        </para>
-
-	<sect2 id="usage-contact-organize-group">
-	  <title>Groups of contacts</title>
-	  <para>
-             <application>Evolution</application> lets you put cards
-             into folders, mark them as members of different groups,
-             and search through them in a variety of ways.  This
-             section will describe how to organize and find contact
-             information using <application>Evolution</application>.
-             CHANGE THIS paragraph: it needs a great deal of work.
-          </para>
-
-	  <sect3 id="usage-contact-organize-group-folder">
-	    <title>Grouping with Folders</title>
-	    <para>
-	      The simplest way to group address cards is to use
-	      folders.  By default, cards start in the
-	      <guilabel>Contacts</guilabel> folder.  You can create
-	      more folders inside that one, or create other address
-	      book folders as well.  Each card must be in one and only
-	      one folder.
-	    </para>
-	    <para>
-              To create a new folder, do this:
-	    </para>
-	    <para>
-              To put a card into a folder, do this:
-            </para>
-	  </sect3>
-
-	  <sect3 id="usage-contact-organize-group-category">
-	    <title>Grouping with Categories</title>
-	    <para>
-              The other way to group cards is to mark them as
-              belonging to different categories.  The difference
-              between folders and categories is that folders contain
-              cards, but category membership is a property of each
-              card.  That means that you can mark a card as being in
-              several categories or no category at all.  For example,
-              I put my friend Matthew's card in the "Business" category,
-              because he works with me, the "Friends" category, because
-              he's also my friend, and the "Frequent" category, because
-              I call him all the time and can never remember his phone
-              number.
-            </para>
-	    <para>
-              To mark a card as belonging to a category, do this:
-            </para>
-	    <para>
-              Then, you can refer to all the cards in that category
-              by:
-            </para>
-	    <para>
-              If the default categories don't suit you, you can add
-              your own.  Here's how:
-            </para>
-	  </sect3>
-	</sect2>
-      </sect1>
-
-      <sect1 id="usage-contact-sharing">
-	<title>Sharing your Cards (and keeping them to yourself)</title>
+           To create a new folder, do this:
+	</para>
 	<para>
-           Cards can be shared over a network.  This is the sort of
-           feature you'll want to use if your company has a list of
-           vendors and clients that needs constant updating.  If you
-           also share your calendars, people can avoid duplicating
-           work and keep up to date on developments within their
-           workgroup or across the entire company.
-        </para>
-
-         <example id="usage-contact-sharing-ex">
-            <title>Sharing Address Cards and Calendar Data</title>
-	      <para>
-	        Ray wants to schedule a meeting with someone at
-                Company X, so he checks the network for the Company X
-                address card that states his contacts there.  Since
-                his company also shares calendars, he then learns that
-                his co-worker Deanna has already scheduled a meeting
-                with them next Thursday.  He can either go to the
-                meeting himself or ask Deanna to discuss his concerns
-                for him.  Either way, I avoid scheduling an extra
-                meeting with Company X.
-             </para>
-	  </example>
-
+          To put a card into a folder, do this:
+         </para>
+      </sect3>
+      
+      <sect3 id="usage-contact-organize-group-category">
+	<title>Grouping with Categories</title>
 	<para>
-           Of course, you don't want to share all of your cards&mdash;
-           why overload the network with a list of babysitters, or
-           tell everyone on your network you're talking to new job
-           prospects?  <application>Evolution</application> lets you
-           decide which folders you want to make accessible to others.
-        </para>
+           The other way to group cards is to mark them as belonging
+           to different categories.  The difference between folders
+           and categories is that folders contain cards, but category
+           membership is a property of each card.  That means that you
+           can mark a card as being in several categories or no
+           category at all.  For example, I put my friend Matthew's
+           card in the "Business" category, because he works with me,
+           the "Friends" category, because he's also my friend, and
+           the "Frequent" category, because I call him all the time
+           and can never remember his phone number.
+         </para>
 	<para>
-           To begin sharing a folder of address cards, select (something) <!--
-           DESCRIBE PROCESS HERE -->.  The
-           <interface>Sharing</interface> window will pop up.  It contains:
-           <!--DESCRIBE INTERFACE HERE-->
+           To mark a card as belonging to a category, do this:
         </para>
-      </sect1>
-
-      <sect1 id="usage-contact-automate">
-	<title>Automating the Contact Manager</title>
 	<para>
-          The <application>Evolution</application> contact manager
-          can perform a wide variety of tasks for you.  From speeding
-          up basic tasks like adding a new address card to managing
-          mailing lists, you'll find that the contact manager is more
-          than a mere address book.
-        </para>
+           Then, you can refer to all the cards in that category by:
+         </para>
+	<para>
+           If the default categories don't suit you, you can add your
+           own.  Here's how:
+         </para>
+      </sect3>
+    </sect2>
+  </sect1>
+  
+  <sect1 id="usage-contact-sharing">
+    <title>Sharing your Cards (and keeping them to yourself)</title>
+    <para>
+       Cards can be shared over a network.  This is the sort of
+       feature you'll want to use if your company has a list of
+       vendors and clients that needs constant updating.  If you
+       also share your calendars, people can avoid duplicating
+       work and keep up to date on developments within their
+       workgroup or across the entire company.
+    </para>
 
-	<sect2 id="contact-automation-basic">
-	  <title>Send me a card: Adding New Cards Quickly</title>
+     <example id="usage-contact-sharing-ex">
+	<title>Sharing Address Cards and Calendar Data</title>
 	  <para>
-            When you get information in the mail or in a calendar
-            entry, you can add it to an address card.  To do so, right
-            click on any email address or email message, and select
-            <guimenuitem>Add Address Card</guimenuitem> from the menu
-            that appears.  Of course, <application>
-            Evolution</application> adds cards from a hand-held device
-            during HotSync operation.  For more information about
-            that, see <xref linkend="usage-sync">.
-          </para>
-	</sect2>
+	    Ray wants to schedule a meeting with someone at
+	    Company X, so he checks the network for the Company X
+	    address card that states his contacts there.  Since
+	    his company also shares calendars, he then learns that
+	    his co-worker Deanna has already scheduled a meeting
+	    with them next Thursday.  He can either go to the
+	    meeting himself or ask Deanna to discuss his concerns
+	    for him.  Either way, I avoid scheduling an extra
+	    meeting with Company X.
+	 </para>
+      </example>
 
-	<sect2 id="contact-automation-lists">
-	  <title>Managing a Mailing list</title>
-	  <para>
-             You already know that when you are writing an email, you
-             can address it to one or more people, and that
-             <application>Evolution</application> will fill in
-             addresses from your contact manager's address cards if
-             you let it.  In addition to that, you can send email to
-             everyone in a particular group by doing SOMETHING HERE.
-             Future versions of <application>Evolution</application>
-             will allow you to you export a group of cards to a
-             spreadsheet, database, or word processor so you can print
-             address labels or prepare large postal mailings.
-          </para>
-	</sect2>
-	<sect2 id="usage-contact-automation-extra">
-	  <title>Map It! and other extra features</title>
-	  <para>
-             Need a map or directions? Click
-             <guibutton>MapIt</guibutton> from within the contact
-             manager, and <application>Evolution</application> will
-             map the address for you online.
-          </para>
-	</sect2>
-      </sect1>
-    </chapter> 
+    <para>
+       Of course, you don't want to share all of your cards&mdash;
+       why overload the network with a list of babysitters, or
+       tell everyone on your network you're talking to new job
+       prospects?  <application>Evolution</application> lets you
+       decide which folders you want to make accessible to others.
+    </para>
+    <para>
+       To begin sharing a folder of address cards, select (something) <!--
+       DESCRIBE PROCESS HERE -->.  The
+       <interface>Sharing</interface> window will pop up.  It contains:
+       <!--DESCRIBE INTERFACE HERE-->
+    </para>
+  </sect1>
+
+  <sect1 id="usage-contact-automate">
+    <title>Automating the Contact Manager</title>
+    <para>
+      The <application>Evolution</application> contact manager
+      can perform a wide variety of tasks for you.  From speeding
+      up basic tasks like adding a new address card to managing
+      mailing lists, you'll find that the contact manager is more
+      than a mere address book.
+    </para>
+
+    <sect2 id="contact-automation-basic">
+      <title>Send me a card: Adding New Cards Quickly</title>
+      <para>
+	When you get information in the mail or in a calendar
+	entry, you can add it to an address card.  To do so, right
+	click on any email address or email message, and select
+	<guimenuitem>Add Address Card</guimenuitem> from the menu
+	that appears.  Of course, <application>
+	Evolution</application> adds cards from a hand-held device
+	during HotSync operation.  For more information about
+	that, see <xref linkend="usage-sync">.
+      </para>
+    </sect2>
+
+    <sect2 id="contact-automation-lists">
+      <title>Managing a Mailing list</title>
+      <para>
+	 You already know that when you are writing an email, you
+	 can address it to one or more people, and that
+	 <application>Evolution</application> will fill in
+	 addresses from your contact manager's address cards if
+	 you let it.  In addition to that, you can send email to
+	 everyone in a particular group by doing SOMETHING HERE.
+	 Future versions of <application>Evolution</application>
+	 will allow you to you export a group of cards to a
+	 spreadsheet, database, or word processor so you can print
+	 address labels or prepare large postal mailings.
+      </para>
+    </sect2>
+    <sect2 id="usage-contact-automation-extra">
+      <title>Map It! and other extra features</title>
+      <para>
+	 Need a map or directions? Click
+	 <guibutton>MapIt</guibutton> from within the contact
+	 manager, and <application>Evolution</application> will
+	 map the address for you online.
+      </para>
+    </sect2>
+  </sect1>
+</chapter> 
 
 
diff --git a/help/C/usage-mail.sgml b/help/C/usage-mail.sgml
index d612b71062..2215689b31 100644
--- a/help/C/usage-mail.sgml
+++ b/help/C/usage-mail.sgml
@@ -1,858 +1,880 @@
 
-    <chapter id="usage-mail"> 
-      <title>Evolution Mail</title>
-      <abstract>
-	<title> An Overview of the Evolution Mailer</title>
+
+<chapter id="usage-mail"> 
+  <title>Evolution Mail</title>
+  <abstract>
+    <title> An Overview of the Evolution Mailer</title>
+    <para>
+      Email is an integral part of life these days, and
+      <application>Evolution</application> mail is here to help
+      you keep track of it.  <application>Evolution</application>
+      email is like other email programs in all the ways you would
+      hope:
+     <itemizedlist>
+       <listitem>
+	 <para>
+	   It can sort and organize your mail in a wide variety of ways with
+	   folders, searches, and filters.
+	 </para>
+       </listitem>
+       <listitem>
+	 <para>
+	  It can send and recieve mail in HTML or as plain text, and
+	  supports file attachments.
+	 </para>
+       </listitem>
+       <listitem>
+	 <para>
+	   It lets you use a wide variety of mail sources, including
+	   IMAP, POP3, and local files.
+	 </para>
+       </listitem>
+     </itemizedlist>
+    </para>
+    <para>
+      However, <application>Evolution</application> has some
+      important differences.  First, it's built to handle very
+      large amounts of mail without slowing down or crashing.  We
+      had high mail volumes in mind when we designed our <link
+      linkend="usage-mail-organize-filters">filtering</link> and
+      <link linkend="usage-mail-organize-search">searching</link>
+      functions.  There's also the
+      <application>Evolution</application> <link
+      linkend="usage-mail-organize-vFolders">vFolder</link>, an
+      advanced organizational feature not found in other mail
+      clients.  If you get a lot of mail, or if you keep every
+      message you get in case you need to refer to it later,
+      you'll find that feature especially useful.
+    </para>
+
+    <para>
+       You can start reading email by clicking
+       <guibutton>Inbox</guibutton> in the shortcut bar.  By
+       default, the <interface>Inbox</interface> is open when you
+       start <application>Evolution</application>, and the first
+       time you see your inbox, there's a message in it from Helix
+       Code welcoming you to the application.
+    </para>
+  </abstract>
+
+  <sect1 id="usage-mail-getnsend">
+    <title>Reading, Getting and Sending Mail</title>
+    <sect2 id="usage-mail-getnsend-read">
+      <title>Reading a Message</title>
+      <para>
+	The first time you open your
+	<application>Evolution</application>
+	<guilabel>Inbox</guilabel>, you will see a window like the one
+	in <xref linkend="usage-mail-intro-fig">, with a message from
+	Helix Code in the <interface>message list</interface>.  The
+	message is displayed below that, in the <interface>view
+	pane</interface>.  If you find the <interface>view
+	pane</interface> too small, you can double-click on the
+	message in the <interface>message list</interface> to have it
+	open in a new window.  As is the case with folders, you can
+	right-click on messages in the message list and get a menu of
+	possible actions.
+      </para>
+      <para>
+	Go ahead and click on the message in the <interface>message
+	list</interface>.  That selects the message.  Then click on
+	the <guibutton>Delete</guibutton> button in the tool bar.  The
+	message now has a line through it, because you've marked it
+	for deletion.  If you really want to get rid of it, choose
+	<guimenuitem>Expunge</guimenuitem> from the
+	<guimenu>Tools</guimenu> menu.  That will delete it
+	permanently. If you want to keep it, click
+	<guibutton>Delete</guibutton> again, and it will no longer be
+	marked as deleted.  At some point in the future, this feature
+	will change to something a little less counter-intuitive.
+      </para>
+ <!-- ==============Figure=================================== -->
+ <!-- MAKE SURE THIS SCREENSHOT HAS THE WELCOME MESSAGE! -->
+      <figure id="usage-mail-intro-fig">
+	  <title>Evolution Mail</title>
+	  <screenshot>
+	    <screeninfo>Evolution Mail</screeninfo>
+	    <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+<!-- ==============End of Figure===================================
+-->
+
+    </sect2>
+
+    <sect2 id="usage-mail-getnsend-get">
+      <title>Getting Mail</title>
+      <para>
+	To check your email, just click <guibutton>Get
+	mail</guibutton> in the toolbar.  If this is the first time
+	you've done so, the <interface>mail setup
+	assistant</interface> will ask you for the information it
+	needs to check your mail (see <xref
+	linkend="config-setupassist"> for more information).  Then,
+	<application>Evolution</application> will download your mail
+	for you and send any mail you've marked ready to send. New
+	mail will appear in your <interface>Inbox</interface> and also
+	in the <interface>Today View</interface>.
+      </para>
+
+      <para>
+	If you get an error message instead of mail, you probably
+	need to change your network settings.  To learn how to
+	do that, have a look at <xref
+	linkend="config-prefs-mail-network">, or ask your system
+	administrator.
+      </para>
+
+      <sect3 id="usage-mail-getnsend-get-attach">
+	<title>Attachments, HTML Mail, and Live Documents</title>
 	<para>
-          Email is an integral part of life these days, and
-          <application>Evolution</application> mail is here to help
-          you keep track of it.  <application>Evolution</application>
-          email is like other email programs in all the ways you would
-          hope:
-         <itemizedlist>
-           <listitem>
-             <para>
-               Item: Description
-             </para>
-           </listitem>
-           <listitem>
-             <para>
-               Item: Description
-             </para>
-           </listitem>
-           <listitem>
-             <para>
-               Item: Description
-             </para>
-           </listitem>
-         </itemizedlist>.
-        </para>
-        <para>
-          However, <application>Evolution</application> has some
-          important differences.  First, it's built to handle very
-          large amounts of mail without slowing down or crashing.  We
-          had high mail volumes in mind when we designed our <link
-          linkend="usage-mail-organize-filters">filtering</link> and
-          <link linkend="usage-mail-organize-search">searching</link>
-          functions.  There's also the
-          <application>Evolution</application> <link
-          linkend="usage-mail-organize-vFolders">vFolder</link>, an
-          advanced organizational feature not found in other mail
-          clients.  If you get a lot of mail, or if you keep every
-          message you get in case you need to refer to it later,
-          you'll find that feature especially useful.
-        </para>
-        
+	  If you receive a file attached to an email,
+	  <application>Evolution</application> will display it at the
+	  bottom of the message to which it's attached.  Click on the
+	  attachment icon or text, and
+	  <application>Evolution</application> will ask you where you
+	  want to put the file.  Once you've done that, you can
+	  open, move, copy, or execute it just like any other, using
+	  <application>Nautilus</application> or your favorite shell
+	  or file manager.
+	</para>
+
 	<para>
-           You can start reading email by clicking
-           <guibutton>Inbox</guibutton> in the shortcut bar.  By
-           default, the <interface>Inbox</interface> is open when you
-           start <application>Evolution</application>, and the first
-           time you see your inbox, there's a message in it from Helix
-           Code welcoming you to the application.
-        </para>
-      </abstract>
-   
-      <sect1 id="usage-mail-getnsend">
-	<title>Reading, Getting and Sending Mail</title>
-	<sect2 id="usage-mail-getnsend-read">
-	  <title>Reading a Message</title>
-	  <para>
-            The first time you open your
-            <application>Evolution</application>
-            <guilabel>Inbox</guilabel>, you will see a window like the
-            one in <xref linkend="usage-mail-intro-fig">, with a
-            message from Helix Code in the<interface> message
-            list</interface>.  The message is displayed
-            below that, in the <interface>view pane</interface>.  If
-            you find the<interface> view pane</interface> too small,
-            you can double-click on the message in the
-            <interface>message list</interface> to have it open in a
-            new window.  As is the case with folders, you can
-            right-click on messages in the message list and get a 
-            menu of possible actions.
-          </para>
-	  <para>
-            Go ahead and right-click on the message, and select
-            <guimenuitem>Delete Message</guimenuitem> from the menu
-            that appears.  The message will move into the
-            <guilabel>Trash</guilabel> folder.  If you want to keep
-            it, you can open the <guilabel>Trash</guilabel> folder
-            and drag the message back to your
-            <guilabel>Inbox</guilabel>.  The trash will be
-            automatically emptied the next time you quit
-            <application>Evolution</application>. (FEATURE
-            UNIMPLEMENTED! Text may change to fit featureset)
- 
-     <!-- ==============Figure=================================== -->
-     <!-- MAKE SURE THIS SCREENSHOT HAS THE WELCOME MESSAGE! -->
-	  <figure id="usage-mail-intro-fig">
-	      <title>Evolution Mail</title>
-	      <screenshot>
-		<screeninfo>Evolution Mail</screeninfo>
-		<graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
-   <!-- ==============End of Figure===================================
-   -->
-          </para>
-	</sect2>
-
-
- 	
-	<sect2 id="usage-mail-getnsend-get">
-	  <title>Getting Mail</title>
-	  <para>
-            To check your email, just click <guibutton>Send and
-            Receive</guibutton> in the toolbar.  If this is the first
-            time you've done so, the <interface>mail druid</interface>
-            will ask you for the information it needs to check your
-            mail (see <xref linkend="config-setupassist"> for more
-            information).  Then, <application>Evolution</application>
-            will download your mail for you and send any mail you've
-            marked ready to send. New mail will appear in your
-            <interface>Inbox</interface> and also in the
-            <interface>Today View</interface>.
-          </para>
+	   <application>Evolution</application> can also display
+	   HTML-formatted mail, complete with graphics.  HTML
+	   formatting will display automatically, although you can
+	   turn it off if you prefer.
+	</para>
 
+	<para>
+	   It can also display <glossterm>live
+	   documents</glossterm>, which have scripted or
+	   executable contents&mdash; for example, a working
+	   spreadsheet page or a chess game.  
+	</para>
+	<tip id="badidea-attachment">
+	  <title>Bad Idea</title>
 	  <para>
-            If you get an error message instead of mail, you probably
-            need to change your network preferences.  To learn how to
-            do that, have a look at <xref
-            linkend="config-prefs-mail-network">, or ask your system
-            administrator.
-          </para>
-
-	  <sect3 id="usage-mail-getnsend-get-attach">
-	    <title>Attachments, HTML Mail, and Live Documents</title>
-	    <para>
-              If you receive a file attached to an email,
-              <application>Evolution</application> will ask where you
-              want to put it.  Once you've downloaded a file, you can
-              open, move, copy, or execute it just like any other,
-              using <application>Nautilus</application> or your
-              favorite shell or file manager. (This text will change
-              to fit app behavior, once features are implemented.)
-            </para>
+	    Don't worry about security. When someone you don't know
+	    sends you a program by email, assume it's a really cool
+	    game.  Mark it executable and run it, no matter what.
+	  </para>
+	</tip>
+      </sect3>
+    </sect2>
+
+    <sect2 id="usage-mail-getnsend-send">
+      <title>Writing and Sending Mail</title>
+      <para>
+	 You can start writing a new
+	 email message by selecting <guimenuitem>New
+	 Mail</guimenuitem> from the <guimenu>File Menu</guimenu>,
+	 or by pressing <guibutton>Ctrl-N</guibutton>.  When you do so,
+	 the <interface>New Message</interface> window will open,
+	 as shown in <xref linkend="usage-mail-newmsg-fig">.
 
-	    <para>
-               <application>Evolution</application> can also display
-               HTML-formatted mail, complete with graphics.  HTML
-               formatting will display automatically, although you can
-               turn it off if you prefer.
-            </para>
-
-	    <para>
-               It can also display <glossterm>live
-               documents</glossterm>, which have scripted or
-               executable contents&mdash; for example, a working
-               spreadsheet page or a chess game.  
-            </para>
-	    <tip id="badidea-attachment">
-	      <title>Bad Idea</title>
-	      <para>
-                When someone you don't know sends you an attached
-                program, go ahead and run it.  Set your preferences to
-                always run live documents when you recieve them, too.
-                Everybody knows all that virus stuff is just a Windows
-                problem.
-              </para>
-	    </tip>
-	  </sect3>
-	</sect2>
-	
-	<sect2 id="usage-mail-getnsend-send">
-	  <title>Writing and Sending Mail</title>
-	  <para>
-             You can start writing a new
-             email message by selecting <guimenuitem>New
-             Mail</guimenuitem> from the <guimenu>File Menu</guimenu>,
-             or by pressing <keysym>Ctrl-N</keysym>.  When you do so,
-             the <interface>New Message</interface> window will open,
-             as shown in <xref linkend="usage-mail-newmsg-fig">.
-          </para>
 
 <!--   ==============Figure=================================== -->
-	   <figure id="usage-mail-newmsg-fig">
-	     <title>New Message Window</title>
-	     <screenshot>
-	      <screeninfo>Evolution Main Window</screeninfo>
-	      <graphic fileref="newmsg-pic" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
+       <figure id="usage-mail-newmsg-fig">
+	 <title>New Message Window</title>
+	 <screenshot>
+	  <screeninfo>Evolution Main Window</screeninfo>
+	  <graphic fileref="newmsg-pic" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
 <!-- ==============End of Figure=================================== -->
-	 
-	  <para>	  
-             Enter an address in the <guilabel>To:</guilabel> field, a
-             message in the <guilabel>Message:</guilabel> field, and
-             press <guibutton>Send and Receive</guibutton>.  That's
-             easy.  It may even be too easy, which is why I like to
-             queue my messages up to be sent a few minutes later.
-
-	     <tip id="usage-mail-getnsend-send-attach-tip">
-	      <title>Send Now, Send Later</title>
-	      <para>
-                Evolution will send mail immediately unless you tell
-                it to do otherwise by selecting <guimenuitem>Send
-                Later</guimenuitem> from the <guimenu>MENU</guimenu>.
-                Then, when you press <guibutton>Send &
-                Receive</guibutton>, all your unsent messages will go
-                out at once.  I like to use "Send Later" because it
-                gives me a chance to change my mind about a message
-                before it goes out.  That way, I don't send anything I'll
-                regret the next day.
-              </para>
-	      <para>
-                To learn more about how you can specify message queue
-                and filter behavior, see <xref linkend="config-prefs-mail">.
-              </para>
-	     </tip>
-           </para>
-
+ <!-- Check the alignment of the following paragraph in the PS and HTMl output, 
+as putting the fig inside the paragraph may or may not have fixed an error -->
+      </para>
+      <para>	  
+	 Enter an address in the <guilabel>To:</guilabel> field, a
+	 message in the <guilabel>Message:</guilabel> field, and
+	 press <guibutton>Send</guibutton>.  That's
+	 easy.  It may even be too easy, which is why I like to
+	 queue my messages up to be sent a few minutes later.
+
+	 <tip id="usage-mail-getnsend-send-attach-tip">
+	  <title>Send Now, Send Later</title>
 	  <para>
-            There is quite a bit more to sending mail, though.  In the
-            next few sections, you'll see how
-            <application>Evolution</application> handles additional features,
-            including mailing lists, attachments, and forwarding.
-          </para>
-
-   
-	  <sect3 id="usage-mail-getnsend-send-to">
-	    <title>Choosing Recipients</title>
-	    <para>
-              If you have created address cards in the contact
-	      manager, you can also enter nicknames or other portions
-	      of address data, and
-	      <application>Evolution</application> will complete the
-	      address for you. (INSERT description of UI for this
-	      feature, once it is decided upon). If you enter a name
-	      or nickname that can go with more than one card,
-	      Evolution will open a dialog box to ask you which person
-	      you meant.  (QUESTION: will users be able to drag & drop
-	      address cards to send email?).  For more information
-	      about using email together with the contact manager and
-	      the calendar, see <xref
-	      linkend="usage-contact-automate"> and <xref
-	      linkend="usage-calendar-apts-group">.
-            </para>
-	    <para>
-              In addition, you can mark recipients in three different
-              ways.  The <guilabel>To:</guilabel> field is for the
-              primary recipients of the message you are going to send.
-              However, it is considered bad form to have more than a
-              few email addresses in this section.
-            </para>
-	    <para>
-              If you're writing to one person, but want to keep a
-              third party up to date, you can use
-              <guilabel>Cc:</guilabel>.  Hearkening back to the dark
-              ages when people used typewriters and there were no copy
-              machines, "Cc" stands for "Carbon Copy."  Use it
-              whenever you want to share a message you've written to
-              someone else.
-              <example>
-		<title>Using the Cc: field</title>
-		<para>
-                   Say, for example, Susan sends an email to a client.
-                   She puts her co-worker, Tim, in the in the
-                   <guilabel>Cc:</guilabel> field, so that he know
-                   what's going on.  The client can see that Tim also
-                   recieved the message, and know that they can talk
-                   to Tim about the message as well.
-                </para>
-	      </example>
-            </para>
-	    <para>
-              If you have a large number of recipients, or if you want
-              to send mail to several people without sharing the
-              recipient list, you should use
-              <guilabel>BCc:</guilabel>. "BCc" stands for "Blind
-              Carbon Copy", and means that people listed in the
-              <guilabel>BCc:</guilabel> are excluded from the
-              recipient list, although they will receive the message
-              and the list of addresses from the
-              <guilabel>To:</guilabel> and <guilabel>Cc:</guilabel>
-              fields.  
-
-              <example id="ex-mail-bcc">
-                 <title>Using the BCc: field</title>
-                 <para>
-                   Let's say Tim sends an email to a client, and wants
-                   his supervisor to know what he wrote.  He doesn't,
-                   however, want the client to start writing his
-                   supervisor about the project&mdash; it's Tim's job
-                   to deal with the client.  So Tim puts his
-                   supervisor's email address in the
-                   <guilabel>BCc:</guilabel> field.  That way, the
-                   client has one contact, and the boss stays in the
-                   loop.
-               </para>
-             </example>
-            </para>
-	  </sect3>
-
-       <sect3 id="usage-mail-getnsend-send-reply">
-	    <title>Replying to Messages</title>
+	    Evolution will send mail immediately unless you tell
+	    it to do otherwise by selecting <guimenuitem>Send
+	    Later</guimenuitem> from the <guimenu>MENU</guimenu>.
+	    Then, when you press <guibutton>Send &
+	    Receive</guibutton>, all your unsent messages will go
+	    out at once.  I like to use "Send Later" because it
+	    gives me a chance to change my mind about a message
+	    before it goes out.  That way, I don't send anything I'll
+	    regret the next day.
+	  </para>
+	  <para>
+	    To learn more about how you can specify message queue
+	    and filter behavior, see <xref linkend="config-prefs-mail">.
+	  </para>
+	 </tip>
+       </para>
+
+      <para>
+	There is quite a bit more to sending mail, though.  In the
+	next few sections, you'll see how
+	<application>Evolution</application> handles additional features,
+	including mailing lists, attachments, and forwarding.
+      </para>
+
+
+      <sect3 id="usage-mail-getnsend-send-to">
+	<title>Choosing Recipients</title>
+	<para>
+	  If you have created address cards in the contact
+	  manager, you can also enter nicknames or other portions
+	  of address data, and
+	  <application>Evolution</application> will complete the
+	  address for you. (INSERT description of UI for this
+	  feature, once it is decided upon). If you enter a name
+	  or nickname that can go with more than one card,
+	  Evolution will open a dialog box to ask you which person
+	  you meant.  (QUESTION: will users be able to drag & drop
+	  address cards to send email?).  For more information
+	  about using email together with the contact manager and
+	  the calendar, see <xref
+	  linkend="usage-contact-automate"> and <xref
+	  linkend="usage-calendar-apts-group">.
+	</para>
+	<para>
+	  In addition, you can mark recipients in three different
+	  ways.  The <guilabel>To:</guilabel> field is for the
+	  primary recipients of the message you are going to send.
+	  However, it is considered bad form to have more than a
+	  few email addresses in this section.
+	</para>
+	<para>
+	  If you're writing to one person, but want to keep a
+	  third party up to date, you can use
+	  <guilabel>Cc:</guilabel>.  Hearkening back to the dark
+	  ages when people used typewriters and there were no copy
+	  machines, "Cc" stands for "Carbon Copy."  Use it
+	  whenever you want to share a message you've written to
+	  someone else.
+	  <example>
+	    <title>Using the Cc: field</title>
 	    <para>
-               In order to reply to a message, click on it once in the
-               message list to select it.  Then press the
-               <guibutton>Reply</guibutton> button, or use the
-               <keysym>REPLY COMBO</keysym> hot key.  A window like
-               the <interface>New Message</interface> window will
-               appear, but the subject will already be present&mdash;
-               typically, your new message will have the same subject
-               as the message to which you are replying, but with Re:
-               before it, to mark it as a reply.  In addition, the
-               full text of the previous message may be inserted into
-               the new message, with the &gt; character before each
-               line.  This indicates quoting.  You can intersperse
-               your message with the quoted material as shown in <xref
-               linkend="usage-mail-getnsend-reply-fig">
-
-<!-- note that this figure should have a reply mail ready to send, with quoted materials and the relevant replies interspersed-->
-<!--   ==============Figure=================================== -->
-	   <figure id="usage-mail-getnsend-reply-fig">
-	     <title>Reply Message Window</title>
-	     <screenshot>
-	      <screeninfo>Evolution Main Window</screeninfo>
-	      <graphic fileref="replymsg-pic" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
+	       Say, for example, Susan sends an email to a client.
+	       She puts her co-worker, Tim, in the in the
+	       <guilabel>Cc:</guilabel> field, so that he know
+	       what's going on.  The client can see that Tim also
+	       recieved the message, and know that they can talk
+	       to Tim about the message as well.
+	    </para>
+	  </example>
+	</para>
+	<para>
+	  If you have a large number of recipients, or if you want
+	  to send mail to several people without sharing the
+	  recipient list, you should use
+	  <guilabel>BCc:</guilabel>. "BCc" stands for "Blind
+	  Carbon Copy", and means that people listed in the
+	  <guilabel>BCc:</guilabel> are excluded from the
+	  recipient list, although they will receive the message
+	  and the list of addresses from the
+	  <guilabel>To:</guilabel> and <guilabel>Cc:</guilabel>
+	  fields.  
+
+	  <example id="ex-mail-bcc">
+	     <title>Using the BCc: field</title>
+	     <para>
+	       Let's say Tim sends an email to a client, and wants
+	       his supervisor to know what he wrote.  He doesn't,
+	       however, want the client to start writing his
+	       supervisor about the project&mdash; it's Tim's job
+	       to deal with the client.  So Tim puts his
+	       supervisor's email address in the
+	       <guilabel>BCc:</guilabel> field.  That way, the
+	       client has one contact, and the boss stays in the
+	       loop.
+	   </para>
+	 </example>
+	</para>
+      </sect3>
+
+   <sect3 id="usage-mail-getnsend-send-reply">
+	<title>Replying to Messages</title>
+	<para>
+	   In order to reply to a message, click on it once in the
+	   message list to select it.  Then press the
+	   <guibutton>Reply</guibutton> button.  A window like the
+	   <interface>New Message</interface> window will appear, but
+	   the subject will already be present&mdash; the same subject
+	   as the message to which you are replying, but with Re:
+	   before it, to mark it as a reply.  In addition, the full
+	   text of the previous message is inserted into the new
+	   message, either in italics (for HTML display) or with the
+	   &gt; character (in plain text mode) before each line.  This
+	   indicates quoting.  You can intersperse your message with
+	   the quoted material as shown in <xref
+	   linkend="usage-mail-getnsend-reply-fig">
+
+<!-- note that this figure should have a reply mail ready to send,
+with quoted materials and the relevant replies interspersed-->
+ <!-- ==============Figure=================================== -->
+       <figure id="usage-mail-getnsend-reply-fig">
+	 <title>Reply Message Window</title>
+	 <screenshot>
+	  <screeninfo>Evolution Main Window</screeninfo>
+	  <graphic fileref="replymsg-pic" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
 <!-- ==============End of Figure=================================== -->
+	</para>
 
-            </para>
-
-	    <para>
-              If a message has several recipients, as in the case of
-              mailing lists or messages that have been carbon copied,
-              you may wish to select one of the items under the
-              <guimenuitem>Reply-To</guimenuitem> submenu on the
-              <guimenu>MENU</guimenu> menu.  This will allow you to
-              choose one or several of the other message recipients in
-              addition to the person who originally sent you the
-              message. If there are large numbers of people in the
-              <guilabel>Cc:</guilabel> or <guilabel>To:</guilabel>
-              fields, this can save substantial amounts of time.  In
-              addition, Reply-To makes it very easy to keep off-topic
-              conversation away from mailing lists and newsgroups.
-              <example>
-		<title>Using the Reply-To feature</title>
-		<para>
-                  Returning again to the email Susan sent to Tim and
-                  their client, you'll note that the Reply-To feature
-                  allows the client to decide whether to reply just to
-                  Susan, or to both Tim and Susan by selecting
-                  a menu item, rather than by cutting and pasting the
-                  email addresses. 
-                </para>
-	      </example>
-            </para>
-	  </sect3>
-	  
-	  <sect3 id="usage-mail-getnsend-send-fancy">
-	    <title>Embellishing that email</title>
-	    <para>
-               <application>Evolution</application> allows you to 
-                make your email more attractive in a number of ways. You
-                can send messages formatted with HTML, attach any sort
-                of file to them, and even include live documents, like
-                spreadhseets or chess games.  This section will tell
-                you how.
-            </para>
-	    
-	    <sect4 id="usage-mail-getnsend-send-html">
-	      <title>Colors, pictures, and fonts with HTML Mail</title> 
-	      <para>
-                Most email messages are sent as plain text, but they
-                can also be sent as HTML, which means they can include
-                color, text style, and other formatting information.
-                Evolution will read and display HTML properly without
-                trouble, and also allows you to send outgoing
-                email messages as HTML.  To send an HTML message, just
-                use the composition toolbar to add formatting;
-                your message text will appear formatted in the composer
-                window, and the message will be sent as HTML.
-              </para>
-	      <note>
-		<title>A Technical note on HTML Tags</title>
-                <para>
-		  Any text, including HTML tags, entered into the
-                  message composition window is assumed to be plain
-                  text.  If you enter HTML directly into the
-                  composer&mdash; say, <markup
-                  role="html">&lt;BR&gt;Bold Text&lt;/BR&gt</markup>,
-                  the the composer will assume you meant exactly that,
-                  and not "make this text bold," as a HTML composition
-                  tool would.  For the very technically inclined, that
-                  means that when the text <markup
-                  role="html">&lt;BR&gt</markup> is sent as HTML, it
-                  will be converted to the string
-                  <literal>&amp;lt;BR&amp;gt;</literal>.
-                </para>
-	      </note>
-	      <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.
-                <emphasis>Some</emphasis> people refer to HTML mail as
-                "the root of all evil" and get very angry if you send
-                them HTML mail, which is why the default in
-                <application>Evolution</application> is plain text.
-                If you choose to send HTML mail, but have an address
-                book entry for someone who does not wish to receive
-                HTML-enhanced mail, you can note that preference in
-                their address card.  The mailer will automatically
-                strip the HTML tags from any messages you send to that
-                address.
-              </para>
-	    </sect4>
-      
-	    <sect4 id="usage-mail-getnsend-send-attach">
-	      <title>Attachments</title>
-	      <para>
-                If you want to attach a file to your email message,
-                you can do so by <!--describe process here-->.  If
-                your recipients can read HTML mail, you can put an
-                image inside the mail by dragging the file into the
-                composer window, or by selecting <guimenuitem>Menu
-                Item</guimenuitem> from the <guimenu>Menu</guimenu>
-                menu.  Still, unless you know what email client the
-                recipient is using, it's best to send a message or
-                attachment in the simplest manner possible.
-              </para>
-	    </sect4>
-	    <sect4 id="usage-mail-getnsend-send-live">
-	      <title>Live Documents</title>
-	      <para>
-                Later versions of <application>Evolution</application>
-                will allow you to enliven your email with almost any
-                sort of document, and even with entire
-                applications. At this point, however, I don't know how
-                that will work.
-              </para>
-	    </sect4>
-	  </sect3>
-       
-	  <sect3 id="usage-getnsend-fwd">
-	    <title>Forwarding Mail</title>      
-	    <para>
-              <guilabel>Forward</guilabel> is useful if you have
-	      received a message and you think someone else would like
-	      to see it, or if you get a message intended for someone
-	      else.  You can forward a message as an attachment to a
-	      new message (the default way of forwarding) or you can send it
-	      <glossterm>inline</glossterm> as a quoted portion of the
-	      message you are sending.  Attachment forwarding is best
-	      if you want to send the entire message you received,
-	      unaltered.  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 where, if at all, you have removed or
-	      altered content.
-            </para>
-	    <para>
-              To forward a message, first make sure it is selected by
-              clicking it once in the message list.  Then, press
-              <guibutton>Forward</guibutton> on the toolbar, or select
-              SOMETHING.  To forward a message inline instead of as an
-              attachment, DO SOMETHING ELSE.  Choose an addressee as
-              you would when sending a new message; the subject will
-              already be entered, but you can alter it.  Enter your
-              comments on the message in the <interface>composition
-              frame</interface>, and press <guibutton>Send and
-              Receive</guibutton>.  To forward it
-              <glossterm>inline</glossterm> instead of attached,
-              select <guimenuitem>Forward Inline</guimenuitem> from
-              the <guimenu>Message</guimenu> menu.
-            </para>
-	  </sect3>
-	  <sect3 id="usage-mail-getnsend-ettiquette">
-	    <title>Seven Tips for Email Usage</title>
+	<para>
+	  If a message has several recipients, as in the case of
+	  mailing lists or messages that have been carbon copied,
+	  you may wish to select one of the items under the
+	  <guimenuitem>Reply-To</guimenuitem> submenu on the
+	  <guimenu>MENU</guimenu> menu.  This will allow you to
+	  choose one or several of the other message recipients in
+	  addition to the person who originally sent you the
+	  message. If there are large numbers of people in the
+	  <guilabel>Cc:</guilabel> or <guilabel>To:</guilabel>
+	  fields, this can save substantial amounts of time.  In
+	  addition, Reply-To makes it very easy to keep off-topic
+	  conversation away from mailing lists and newsgroups.
+	  <example>
+	    <title>Using the Reply-To feature</title>
 	    <para>
-              I started with ten, but four were "Don't send
-              <glossterm>spam</glossterm>."
-              <itemizedlist>
-  	        <listitem>
-		  <para>
-                    Always begin and close with a salutation. Say
-                    "please" and "thank you", just like you do in real
-                    life. You can keep your pleasantries short, but be pleasant!
-                  </para>
-		</listitem>
-	      
-		<listitem>
-		  <para>
-                    ALL CAPS MEANS YOU'RE SHOUTING!
-                  </para>
-		</listitem>
-	      
-		<listitem>
-		  <para>
-                     Never write anything in email you wouldn't say in
-                     public.  Old messages have a nasty habit of
-                     resurfacing when you least expect them to.
-                  </para>
-		</listitem>
-	      
-		<listitem>
-		  <para>
-                   Check your spelling and use complete sentences.
-                  </para>
-		</listitem>
-	     
-		<listitem>
-		  <para>
-                    Don't send nasty emails (flames).  If you get one,
-		    don't write back.
-                  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-                     Don't send spam or forward chain mail.  If you
-                     must, verify any rumors, and make sure the
-                     message doesn't have multiple layers of email
-                     quotation symbols (&gt;) indicating multiple
-                     layers of careless inline forwarding.
-                  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-                     When you reply or forward, include just enough of
-		     the previous message to provide context. Not too
-		     much, not too little.
-                   </para>
-		</listitem>
-	      </itemizedlist>
-            </para>
-	    <para> Happy mailing! </para>
-	  </sect3>
-	</sect2>
-      </sect1>
-
-      <sect1 id="usage-mail-organize">
-	<title>Organizing Your Mail</title>
+	      Returning again to the email Susan sent to Tim and
+	      their client, you'll note that the Reply-To feature
+	      allows the client to decide whether to reply just to
+	      Susan, or to both Tim and Susan by selecting
+	      a menu item, rather than by cutting and pasting the
+	      email addresses. 
+	    </para>
+	  </example>
+	</para>
+      </sect3>
+
+      <sect3 id="usage-mail-getnsend-send-fancy">
+	<title>Embellishing that email</title>
 	<para>
-          Even if you only get a few email messages a day, you
-          probably want to sort and organize them.  When you get a
-          hundred a day and you want to refer to a message you
-          received six weeks ago, you need to sort and organize them,
-          and <application>Evolution</application> has the tools to
-          help you do it.  
-        </para>
-	
-	<sect2 id="usage-mail-organize-folders">
-	  <title>Getting Organized with Folders</title>
-	  <para>
-            Mail, as well as address cards and calendars, is kept in
-            folders.  If you like, you can create new folders by
-            selecting <guisubmenu>New</guisubmenu> and then
-            <guimenuitem>Folder</guimenuitem> from the
-            <guimenu>File</guimenu> menu, or by pressing
-            <keysym>COMBO</keysym>.  (Will there be a dialog box to
-            determine name and location? Must wait for feature to
-            describe.) The new folders will appear in the
-            <interface>tree view</interface>, and you can drag them
-            wherever you want to relocate them.  You can move messages
-            into the folders by dragging and dropping, or by selecting
-            them and choosing <guimenuitem>ITEM</guimenuitem> from the
-            <guimenu>MENU</guimenu>.  If you create filters with the
-            <interface>filter druid</interface>, you can have mail
-            moved to a folder automatically.  An email message can be in
-            only one folder at a time, just like real mail in real
-            folders.  This is also the case for folders of address
-            cards and calendar information.
-          </para>
-	</sect2>    
-
-	<sect2 id="usage-mail-organize-search">
-	  <title>Searching for Messages</title>
+	   <application>Evolution</application> allows you to 
+	    make your email more attractive in a number of ways. You
+	    can send messages formatted with HTML, attach any sort
+	    of file to them, and even include live documents, like
+	    spreadhseets or chess games.  This section will tell
+	    you how.
+	</para>
+
+	<sect4 id="usage-mail-getnsend-send-html">
+	  <title>Colors, pictures, and fonts with HTML Mail</title> 
 	  <para>
-            Because <application>Evolution</application> automatically
-            creates an index of every email you send or receive, it
-            can search through your old messages and present you with
-            results very quickly.  You can search for messages by
-            author, subject, keyword, or headers. (INSERT descriptons
-            of what those terms mean)
-          </para>
-          <para>
-            To create a search, enter the word or phrase you're
-            looking for in the form field below the toolbar, and
-            choose a search type:
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <guilabel>Body or subject contains:</guilabel> This
-                  will search message subjects and the messages
-                  themselves for the word or phrase you've entered in
-                  the search field.
-               </para>
-             </listitem>
-
-              <listitem>
-                <para>
-                  <guilabel>Body contains:</guilabel> This will search
-                   only in message text, not the subject lines.
-               </para>
-             </listitem>
-
-              <listitem>
-                <para>
-                  <guilabel>Subject contains:</guilabel> This will
-                  show you messages where the search text is in the
-                  subject line.  It will not search in the message body.
-               </para>
-             </listitem>
-
-              <listitem>
-                <para>
-                  <guilabel>Body does not contain:</guilabel> This
-                  finds every email message that does not have the
-                  search text in the message body.  It will still show
-                  messages that have the search text in the subject
-                  line, if it is not also in the body.
-               </para>
-             </listitem>
-
-              <listitem>
-                <para>
-                  <guilabel>Subject does not contain:</guilabel>This
-                  finds every mail whose subject does not
-                  contain the search text.
-               </para>
-             </listitem>
-            </itemizedlist>
-
-          </para>
-	</sect2>
-    
-	<sect2 id="usage-mail-organize-vFolders">
-	  <title>Getting Really Organized with Virtual Folders</title>
-	  <para>
-            If you find yourself performing a search frequently, you
-            can save it as a virtual folder. Virtual folders, or
-            vFolders, are an advanced way of viewing your email
-            messages within <application>Evolution</application>.  If
-            you get a lot of mail or often forget where you put
-            messages, vFolders can help you stay on top of things.
-          </para>
-          <para>
-            A vFolder looks and acts a lot like a folder, but it's
-            actually a saved search that you can access in most of the
-            same ways you would a regular folder.  The one important
-            differences between them is that a conventional folder
-            actually contains messages, but a vFolder is a view of
-            messages that may be in several different folders.  This
-            means that while a message may fall into several vFolders,
-            it can be in only one conventional folder.  Also, it means
-            that you cannot remove a message from a vFolder unless you
-            delete it, and you cannot add a message to a vFolder
-            unless you change the vFolder's search criteria.
-          </para>
+	    Most email messages are sent as plain text, but they
+	    can also be sent as HTML, which means they can include
+	    color, text style, and other formatting information.
+	    Evolution will read and display HTML properly without
+	    trouble, and also allows you to send outgoing
+	    email messages as HTML.  To send an HTML message, just
+	    use the composition toolbar to add formatting;
+	    your message text will appear formatted in the composer
+	    window, and the message will be sent as HTML.
+	  </para>
+	  <note>
+	    <title>A Technical note on HTML Tags</title>
+	    <para>
+	      You can't use the composer window to create web pages,
+	      at least not if you plan to hand-code them with HTML.
+	      If you enter HTML directly into the composer&mdash; say,
+	      <markup role="html">&lt;B&gt;Bold
+	      Text&lt;/B&gt</markup>, the the composer will assume you
+	      meant exactly that, and not "make this text bold," as a
+	      HTML composition tool would.  For the very technically
+	      inclined, that means that when the text <markup
+	      role="html">&lt;B&gt</markup> is sent as HTML, it will
+	      be converted to the string
+	      <literal>&amp;lt;B&amp;gt;</literal>.  Real gearheads
+	      should wonder how I got all that stuff straight, given
+	      that I'm writing this in SGML.
+	    </para>
+	  </note>
 	  <para>
-            As messages that meet the vFolder criteria arrive or are
-            deleted, <application>Evolution</application> will
-            automatically place them in and and remove them from the
-            vFolder contents list.  When you delete a message, it gets
-            erased from the folder it actually exists in as well as
-            any vFolders which include it.
-          </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.
+	    <emphasis>Some</emphasis> people refer to HTML mail as
+	    "the root of all evil" and get very angry if you send
+	    them HTML mail, which is why the default in
+	    <application>Evolution</application> is plain text.
+	    If you choose to send HTML mail, but have an address
+	    book entry for someone who does not wish to receive
+	    HTML-enhanced mail, you can note that preference in
+	    their address card.  The mailer will automatically
+	    strip the HTML tags from any messages you send to that
+	    address.
+	  </para>
+	</sect4>
+
+	<sect4 id="usage-mail-getnsend-send-attach">
+	  <title>Attachments</title>
 	  <para>
-            That's pretty complicated.  But it can be useful. For
-            example, if I have a folder for all the email from one
-            person, and another folder for all the email on a given
-            topic, I feel organized. But when the person sends me
-            mail about the topic, my whole email filing universe
-            becomes chaotic.  I need vFolders to save the day for me.
-          </para>
+	    If you want to attach a file to your email message,
+	    you can do so by <!--describe process here-->.  If
+	    your recipients can read HTML mail, you can put an
+	    image inside the mail by dragging the file into the
+	    composer window, or by selecting <guimenuitem>Menu
+	    Item</guimenuitem> from the <guimenu>Menu</guimenu>
+	    menu.  Still, unless you know what email client the
+	    recipient is using, it's best to send a message or
+	    attachment in the simplest manner possible.
+	  </para>
+	</sect4>
+	<sect4 id="usage-mail-getnsend-send-live">
+	  <title>Live Documents</title>
 	  <para>
-            That sounds silly, but imagine a business trying to keep
-	    track of mail from hundreds of vendors and clients, or a
-	    university with overlapping and changing groups of
-	    faculty, staff, administrators and students.  The larger
-	    the system, the less you can afford that sort of
-	    confusion.  vFolders make for better organization because
-	    they can accept overlapping groups in a way that regular
-	    folders and filing systems can't.
-          </para>
-
-	  <example id="usage-mail-organize-vFolders-ex">
-	    <title>Using Folders, Searches, and vFolders</title>
-	    <para>
-	       To organize my mail box, I can set up a vFolder
-	       for emails from my friend Vince, by doing (INSERT
-	       PROCESS HERE).  Then, whenever I want to see the
-	       messages Vince has sent me, I open the vFolder, and
-	       every message he's sent me shows up, no matter where
-	       I've actually filed it.  If I want, I can also create a
-	       vFolder containing any message from my list of
-	       co-workers which also has the name of the project in
-	       it.  That way, when Vince sends me mail about the
-	       project, I can see that message both in the "Vince"
-	       vFolder and in the "Project" vFolder.  That's because
-	       when I open up the "Vince" folder, I'm really
-	       performing a search for all the mail from Vince, and
-	       when I open the "Project" folder I'm really performing
-	       a search for all the mail about the project.
-
-              (INSERT SCREENSHOT HERE)
+	    Later versions of <application>Evolution</application>
+	    will allow you to enliven your email with almost any
+	    sort of document, and even with entire
+	    applications. At this point, however, this feature has not 
+	    yet been implimented.
+	  </para>
+	</sect4>
+      </sect3>
+
+      <sect3 id="usage-getnsend-fwd">
+	<title>Forwarding Mail</title>      
+	<para>
+	  <guilabel>Forward</guilabel> is useful if you have
+	  received a message and you think someone else would like
+	  to see it, or if you get a message intended for someone
+	  else.  You can forward a message as an attachment to a
+	  new message (the default way of forwarding) or you can send it
+	  <glossterm>inline</glossterm> as a quoted portion of the
+	  message you are sending.  Attachment forwarding is best
+	  if you want to send the entire message you received,
+	  unaltered.  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 where, if at all, you have removed or
+	  altered content.
+	</para>
+	<para>
+	  To forward a message, first make sure it is selected by
+	  clicking it once in the message list.  Then, press
+	  <guibutton>Forward</guibutton> on the toolbar, or select
+	  SOMETHING.  To forward a message
+	  <glossterm>inline</glossterm> instead of attached, select
+	  <guimenuitem>Forward Inline </guimenuitem> from the
+	  <guimenu>Message</guimenu> menu.  Choose an addressee as you
+	  would when sending a new message; the subject will already
+	  be entered, but you can alter it.  Enter your comments on
+	  the message in the <interface>composition frame</interface>,
+	  and press <guibutton>Send</guibutton>.
+	</para>
+      </sect3>
+      <sect3 id="usage-mail-getnsend-ettiquette">
+	<title>Seven Tips for Email Usage</title>
+	<para>
+	  I started with ten, but four were "Don't send
+	  <glossterm>spam</glossterm>."
+	  <itemizedlist>
+	    <listitem>
+	      <para>
+		Always begin and close with a salutation. Say
+		"please" and "thank you", just like you do in real
+		life. You can keep your pleasantries short, but be pleasant!
+	      </para>
+	    </listitem>
 
-	    </para>
-	  </example>
-          <para>
-             To create a vFolder, select <guimenuitem>VFolder
-             Druid</guimenuitem> from the <guimenu>Tools</guimenu>
-             menu in the <interface>main window</interface>.  This
-             will bring up a dialog box that looks suspiciously like
-             the Filter Druid (for more information on filters, see
-             <xref linkend="usage-mail-organize-filters">), and which
-             presents you with a list of vFolders you have previously
-             created. If you have already created vFolders, you can
-             click on them in the frame labelled <guilabel>Select Rule
-             Type</guilabel>, and edit or remove them.  If you have
-             not created any, there will be only one available option:
-             click <guibutton>Add</guibutton> to add a new vFolder.
-          </para>
-          <para>
-             You'll be prompted to create a filtering rule. To do so,
-             select one of the base rules, and click
-             <guibutton>Next</guibutton> to customize it.  Your options are:
-        <itemizedlist>
-             <listitem>
-                <para>
-                   For matching messages: you may select one or more
-                   search criteria; the vFolder you create will
-                   contain messages that match all of
-                   them.
-                 </para>
-               </listitem>
-               <listitem>
-                 <para>
-                    Messages from a certain person: you enter an email
-                    address, and the vFolder will contain any messages
-                    from that address.
-                 </para>
-               </listitem>
-               <listitem>
-                 <para>
-                   Messages to a certain address: any messages sent
-                   directly to this address will be in the vFolder you create.
-                  </para>
-               </listitem>
-               <listitem>
-                 <para>
-                    Messages with a given subject: enter a subject,
-                    and the vFolder will contain messages with that
-                    subject.
-                 </para>
-               </listitem>
-              </itemizedlist>
-            as is shown in <xref linkend="usage-mail-vfolder-fig-createrule">
-
-	   <figure id="usage-mail-vfolder-fig-createrule">
-	     <title>Selecting a vFolder Rule</title>
-	     <screenshot>
-	      <screeninfo>Selecting a vFolder Rule</screeninfo>
-	      <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
-          </para>
-          <para>
- 
-            Once you click <guibutton>Next</guibutton>, you'll
-            customize the vFolder rule.  This process is somewhat
-            complicated, but promises to get much more simple in
-            future versions of <application>Evolution</application>.
-            As it stands now, try clicking different things to have
-            the sentence in the bottom frame make sense.
-
-          </para>
-	</sect2>
-
-	<sect2 id="usage-mail-organize-filters">
-	  <title>Staying organized: Mail Filters in Evolution</title>
-	  <para>
-            Filters sort your email for you.  People who subscribe to
-            multiple mailing lists, or who often need to refer to
-            messages they have sent, find filters especially helpful
-            to seperate personal from list-related mail, but they're
-            good for anybody who gets more than a few messages a day.
-            To create a filter, go to your
-            <interface>Inbox</interface>.  Then select
-            <guimenuitem>Filter Druid</guimenuitem> from the
-            <guimenu>Tools</guimenu> menu. This will bring up a
-            <glossterm>druid</glossterm>, or assistant, which will
-            allow you to create filters.  The <interface>filter
-            druid</interface> is shown in <xref linkend="usage-mail-filters-fig-new">
-
-           
-	   <figure id="usage-mail-filters-fig-new">
-	     <title>Creating a new Filter</title>
-	     <screenshot>
-	      <screeninfo>Creating a new Filter</screeninfo>
-	      <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	    </screenshot>
-	  </figure>
-
-          </para>
-
-          <para> The <interface>filter druid</interface> window
-            contains a window listing rules, and an option to create a
-            new rule.  To start filtering your mail, click
-            <guibutton>Add</guibutton> to add a filtering rule.
-            You'll decide when it should take place: 
-              <itemizedlist>
-		<listitem>
-                   <para>
-                     <guilabel>When mail arrives:</guilabel> Select
-		     this option to have messages filtered as they
-		     arrive.
-                   </para>
-                 </listitem>
-                 <listitem>
-                   <para>
-                     <guilabel>When mail is sent:</guilabel> Select
-                     this option to filter your outgoing mail.  You
-                     can use this feature to keep your
-                     <interface>Outbox</interface> as organized as
-                     your <interface>Inbox</interface>.
-                 </para>
-              </listitem>
-            </itemizedlist>
-          </para>
+	    <listitem>
+	      <para>
+		ALL CAPS MEANS YOU'RE SHOUTING!
+	      </para>
+	    </listitem>
 
-	  <para>
-           Then, the filter druid will ask you which emails it should
-           act upon.  You can set criteria to include words or phrases
-           in the subject, To:, Cc: or body of the message.  Once
-           you've decided which messages to filter, the druid will ask
-           you the sort of action you wish to take.  More details and
-           screenshots should follow here.
-          </para>
+	    <listitem>
+	      <para>
+		 Never write anything in email you wouldn't say in
+		 public.  Old messages have a nasty habit of
+		 resurfacing when you least expect them to.
+	      </para>
+	    </listitem>
 
+	    <listitem>
+	      <para>
+	       Check your spelling and use complete sentences.
+	      </para>
+	    </listitem>
 
-	  <note>
-	    <title>Two Notable Filter Features</title>
+	    <listitem>
+	      <para>
+		Don't send nasty emails (flames).  If you get one,
+		don't write back.
+	      </para>
+	    </listitem>
+
+	    <listitem>
+	      <para>
+		 Don't send spam or forward chain mail.  If you
+		 must, verify any rumors, and make sure the
+		 message doesn't have multiple layers of email
+		 quotation symbols (&gt;) indicating multiple
+		 layers of careless inline forwarding.
+	      </para>
+	    </listitem>
+
+	    <listitem>
+	      <para>
+		 When you reply or forward, include just enough of
+		 the previous message to provide context. Not too
+		 much, not too little.
+	       </para>
+	    </listitem>
+	  </itemizedlist>
+	</para>
+	<para> Happy mailing! </para>
+      </sect3>
+    </sect2>
+  </sect1>
+
+  <sect1 id="usage-mail-organize">
+    <title>Organizing Your Mail</title>
+    <para>
+      Even if you only get a few email messages a day, you
+      probably want to sort and organize them.  When you get a
+      hundred a day and you want to refer to a message you
+      received six weeks ago, you need to sort and organize them,
+      and <application>Evolution</application> has the tools to
+      help you do it.  
+    </para>
+
+    <sect2 id="usage-mail-organize-folders">
+      <title>Getting Organized with Folders</title>
+      <para>
+	<application>Evolution</application> keeps mail, as well as
+	address cards and calendars, in folders.  Some, like
+	<guilabel>Inbox</guilabel>, <guilabel>Outbox</guilabel>, and
+	<guilabel>Drafts</guilabel> have already been created for
+	you. If you like, you can create new folders by selecting
+	<guisubmenu>New</guisubmenu> and then
+	<guimenuitem>Folder</guimenuitem> from the
+	<guimenu>File</guimenu> menu.  You must specify both the name
+	and the type of the folder; a folder can hold mail, calendars,
+	or address cards, but you can't mix them up.  Some people
+	don't like that. Too bad.
+      </para>
+      <para>
+        The new folders will appear in the <interface>folder
+	view</interface>, and you can drag them wherever you want to
+	relocate them.  You can drag messages around too.  If you
+	create filters with the <interface>filter
+	assistant</interface>, you can have mail moved to a folder
+	automatically.  An email message can be in only one folder at
+	a time, just like real mail in real folders.
+      </para>
+    </sect2>    
+
+    <sect2 id="usage-mail-organize-search">
+      <title>Searching for Messages</title>
+      <para>
+	Because <application>Evolution</application> automatically
+	creates an index of every email you send or receive, it can
+	search through your old messages and present you with results
+	very quickly.  You can search through just the message
+	subjects, just the message body, or both body and subjet.
+      </para>
+      <para>
+	To create a search, enter the word or phrase you're
+	looking for in the form field below the toolbar, and
+	choose a search type:
+	<itemizedlist>
+	  <listitem>
 	    <para>
-              <itemizedlist>
-		<listitem><para>Any incoming email that does not meet
-                filter action criteria remains in the Inbox. </para>
-                </listitem>
-		
-		<listitem><para>If you move a folder, your filters
-                will follow it.  </para></listitem>
-	      </itemizedlist>
-            </para>
-	  </note>
-	</sect2>
-      </sect1>
-    </chapter>
-<!-- ================ END OF MAILER CHAPTER ============= -->
+	      <guilabel>Body or subject contains:</guilabel> This
+	      will search message subjects and the messages
+	      themselves for the word or phrase you've entered in
+	      the search field.
+	   </para>
+	 </listitem>
+
+	  <listitem>
+	    <para>
+	      <guilabel>Body contains:</guilabel> This will search
+	       only in message text, not the subject lines.
+	   </para>
+	 </listitem>
 
+	  <listitem>
+	    <para>
+	      <guilabel>Subject contains:</guilabel> This will
+	      show you messages where the search text is in the
+	      subject line.  It will not search in the message body.
+	   </para>
+	 </listitem>
+
+	  <listitem>
+	    <para>
+	      <guilabel>Body does not contain:</guilabel> This
+	      finds every email message that does not have the
+	      search text in the message body.  It will still show
+	      messages that have the search text in the subject
+	      line, if it is not also in the body.
+	   </para>
+	 </listitem>
+
+	  <listitem>
+	    <para>
+	      <guilabel>Subject does not contain:</guilabel>This
+	      finds every mail whose subject does not
+	      contain the search text.
+	   </para>
+	 </listitem>
+	</itemizedlist>
+
+        Then, press <keycap>Enter</keycap>.
+        <application>Evolution</application> will show your search
+        results in 
+
+      </para>
+    </sect2>
+
+    <sect2 id="usage-mail-organize-filters">
+      <title>Staying organized: Mail Filters in Evolution</title>
+      <para>
+	Filters sort your email for you.  People who subscribe to
+	multiple mailing lists, or who often need to refer to messages
+	they have sent, find filters especially helpful to seperate
+	personal from list-related mail, but they're good for anybody
+	who gets more than a few messages a day.  To create a filter,
+	go to your <interface>Inbox</interface>.  Then select
+	<guimenuitem>Filter Assistant</guimenuitem> from the
+	<guimenu>Tools</guimenu> menu. This will bring up a window
+	which will guide you through filter creation.  The
+	<interface>filter assistant</interface> is shown in <xref
+	linkend="usage-mail-filters-fig-new">
+
+
+       <figure id="usage-mail-filters-fig-new">
+	 <title>Creating a new Filter</title>
+	 <screenshot>
+	  <screeninfo>Creating a new Filter</screeninfo>
+	  <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+
+      </para>
+
+      <para> The <interface>filter assistant</interface> window
+	contains a window listing rules, and an option to create a
+	new rule.  To start filtering your mail, click
+	<guibutton>Add</guibutton> to add a filtering rule.
+	You'll decide when it should take place: 
+	  <itemizedlist>
+	    <listitem>
+	       <para>
+		 <guilabel>When mail arrives:</guilabel> Select
+		 this option to have messages filtered as they
+		 arrive.
+	       </para>
+	     </listitem>
+	     <listitem>
+	       <para>
+		 <guilabel>When mail is sent:</guilabel> Select
+		 this option to filter your outgoing mail.  You
+		 can use this feature to keep your
+		 <interface>Outbox</interface> as organized as
+		 your <interface>Inbox</interface>.
+	     </para>
+	  </listitem>
+	</itemizedlist>
+      </para>
+
+      <para>
+       Then, the filter assistant will ask you which emails it should act
+       upon.  You can set criteria to include words or phrases in the
+       subject, To:, Cc: or body of the message. (FIXME: WHAT ELSE?)
+       Once you've decided which messages to filter, the assistant will
+       ask you the sort of action you wish to take.  More details and
+       screenshots should follow here.
+      </para>
+
+
+      <note>
+	<title>Two Notable Filter Features</title>
+	<para>
+	  <itemizedlist>
+	    <listitem><para>Any incoming email that does not meet
+	    filter action criteria remains in the Inbox. </para>
+	    </listitem>
+
+	    <listitem><para>If you move a folder, your filters
+	    will follow it.  </para></listitem>
+	  </itemizedlist>
+	</para>
+      </note>
+    </sect2>
+
+
+
+    <sect2 id="usage-mail-organize-vFolders">
+      <title>Getting Really Organized with Virtual Folders</title>
+      <para>
+	If you find that filters aren't flexible enough for you, or
+	end up performing the same search again and again, you should
+	consider a virtual folder. Virtual folders, or vFolders, are
+	an advanced way of viewing your email messages within
+	<application>Evolution</application>.  If you get a lot of
+	mail or often forget where you put messages, vFolders can help
+	you stay on top of things.
+      </para>
+      <para>
+	A vFolder 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.  Once you've set it up, you'll be
+	able to open it and read the messages in it as though it were
+	a normal mail folder.  It's not a folder, though, because when
+	you open a vFolder, <application>Evolution</application>
+	performs a search for you.  It's not a regular search, though,
+	because you can build a vFolder with a very complicated set of
+	criteria with multiple inclusions and exclusions, as though
+	you were setting up a filter.
+      </para>
+
+<!-- potentially useful, but doesn't fit at the moment:
+     <para>
+       An important difference between a folder and a virtual folder
+	is that a conventional folder actually contains messages, but
+	a vFolder is a view of messages that may be in several
+	different folders.  This means that while a message may fall
+	into several vFolders, it can be in only one conventional
+	folder.  Also, it means that you cannot remove a message from
+	a vFolder unless you delete it, and you cannot add a message
+	to a vFolder unless you change the vFolder's search criteria.
+      </para>
+-->
+
+      <para>
+	As messages that meet the vFolder criteria arrive or are
+	deleted, <application>Evolution</application> will
+	automatically place them in and and remove them from the
+	vFolder contents list.  When you delete a message, it gets
+	erased from the folder in which it actually exists, as well as
+	any vFolders which include it.
+      </para>
+      <para>
+	That's pretty complicated, but it can be useful. For example,
+	if I have a folder for all the email from one person, and
+	another folder for all the email on a given topic, I
+	<emphasis>feel</emphasis> organized.  But when the person
+	sends me mail about the topic, my whole email filing universe
+	becomes chaotic, and I need vFolders to save the day for me.
+      </para>
+      <para>
+	That sounds silly, but imagine a business trying to keep track
+	of mail from hundreds of vendors and clients, or a university
+	with overlapping and changing groups of faculty, staff,
+	administrators and students.  The larger the system, the less
+	you can afford the sort of confusion that stems from an
+	organizational system that's not flexible enough.  vFolders
+	make for better organization because they can accept
+	overlapping groups in a way that regular folders and filing
+	systems can't.
+      </para>
+
+      <example id="usage-mail-organize-vFolders-ex">
+	<title>Using Folders, Searches, and vFolders</title>
+	<para>
+	   To organize my mail box, I can set up a vFolder
+	   for emails from my friend Vince, by doing (INSERT
+	   PROCESS HERE).  Then, whenever I want to see the
+	   messages Vince has sent me, I open the vFolder, and
+	   every message he's sent me shows up, no matter where
+	   I've actually filed it.  If I want, I can also create a
+	   vFolder containing any message from my list of
+	   co-workers which also has the name of the project in
+	   it.  That way, when Vince sends me mail about the
+	   project, I can see that message both in the "Vince"
+	   vFolder and in the "Project" vFolder.  That's because
+	   when I open up the "Vince" folder, I'm really
+	   performing a search for all the mail from Vince, and
+	   when I open the "Project" folder I'm really performing
+	   a search for all the mail about the project.
+
+	  (INSERT SCREENSHOT HERE)
+
+	</para>
+      </example>
+      <para>
+	 To create a vFolder, select <guimenuitem>VFolder
+	 Assistant</guimenuitem> from the <guimenu>Tools</guimenu>
+	 menu in the <interface>main window</interface>.  This
+	 will bring up a dialog box that looks suspiciously like
+	 the Filter Assistant (for more information on filters, see
+	 <xref linkend="usage-mail-organize-filters">), and which
+	 presents you with a list of vFolders you have previously
+	 created. If you have already created vFolders, you can
+	 click on them in the frame labelled <guilabel>Select Rule
+	 Type</guilabel>, and edit or remove them.  If you have
+	 not created any, there will be only one available option:
+	 click <guibutton>Add</guibutton> to add a new vFolder.
+      </para>
+      <para>
+	 You'll be prompted to create a filtering rule. To do so,
+	 select one of the base rules, and click
+	 <guibutton>Next</guibutton> to customize it.  Your options are:
+    <itemizedlist>
+	 <listitem>
+	    <para>
+	       For matching messages: you may select one or more
+	       search criteria; the vFolder you create will
+	       contain messages that match all of
+	       them.
+	     </para>
+	   </listitem>
+	   <listitem>
+	     <para>
+		Messages from a certain person: you enter an email
+		address, and the vFolder will contain any messages
+		from that address.
+	     </para>
+	   </listitem>
+	   <listitem>
+	     <para>
+	       Messages to a certain address: any messages sent
+	       directly to this address will be in the vFolder you create.
+	      </para>
+	   </listitem>
+	   <listitem>
+	     <para>
+		Messages with a given subject: enter a subject,
+		and the vFolder will contain messages with that
+		subject.
+	     </para>
+	   </listitem>
+	  </itemizedlist>
+	as is shown in <xref linkend="usage-mail-vfolder-fig-createrule">
+
+       <figure id="usage-mail-vfolder-fig-createrule">
+	 <title>Selecting a vFolder Rule</title>
+	 <screenshot>
+	  <screeninfo>Selecting a vFolder Rule</screeninfo>
+	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
+	</graphic>
+	</screenshot>
+      </figure>
+      </para>
+      <para>
+
+	Once you click <guibutton>Next</guibutton>, you'll
+	customize the vFolder rule.  This process is somewhat
+	complicated, but promises to get much more simple in
+	future versions of <application>Evolution</application>.
+	As it stands now, try clicking different things to have
+	the sentence in the bottom frame make sense.
+
+      </para>
+    </sect2>
+
+  </sect1>
+</chapter>
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 0863c2b72e..fc2b894a04 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -1,261 +1,310 @@
 
-    <chapter id="usage-mainwindow">
+<chapter id="usage-mainwindow">
+
+  <title>The Main Window: Evolution Basics</title>
+  <para>
+     Start <application>Evolution</application> by selecting
+     <guimenuitem>Evolution</guimenuitem> from the
+     <guisubmenu>Applications</guisubmenu> of the <guimenu>Main Panel
+     Menu</guimenu>, or by typing <command>evolution</command> at the
+     command-line.  After <application>Evolution</application> starts
+     up, you will see the <interface>main window</interface>, with the
+     <interface>Inbox</interface> open.  It should look a lot like the
+     picture in <xref linkend="usage-mainwindow-fig">. On the left of
+     the <interface>main window</interface> is the <interface>shortcut
+     bar</interface>, with several buttons in it.  Just underneath the
+     title bar is a series of menus in the <interface>menu
+     bar</interface>, and below that, the <interface>tool
+     bar</interface> with buttons for different functions. The largest
+     part of the <interface>main window</interface> is taken up by the
+     actual <interface>Inbox</interface>, with a listing of messages
+     you have recieved.  If you're running the program for the first
+     time, you'll just have one: a welcome message from Helix Code.
 
-    <title>The Main Window: Evolution Basics</title>
-      <para>
-	
-        Start <application>Evolution</application> by selecting
-	<guimenuitem>Evolution</guimenuitem> from the
-	<guisubmenu>Applications</guisubmenu> of the <guimenu>Main
-	Panel Menu</guimenu>, or by typing
-	<command>evolution</command> at the command-line.After
-	<application>Evolution</application> starts up, you will see
-	the <interface>main window</interface>, which looks a lot like
-	in <xref linkend="usage-mainwindow-fig">. On the left of the
-	<interface>main window</interface> are the <interface>shortcut
-	bar</interface> and the <interface>tree-view</interface>.
-	Just underneath the title bar is a series of menus in the
-	<interface>menu bar</interface>, and below that, the
-	<interface>tool bar</interface> with buttons for different
-	functions. The largest part of the <interface>main
-	window</interface> is taken up by a welcome message.  <!--
-	para does not end here but after fig! -->
 
 <!-- ==============Figure=================================== -->
 
 <!--
-Make sure that this figure meets its descriptions below: it should
-show the shortcut bar, the tree view with some trees expanded, and so
-forth.  Can these things be labelled with little arrows & stuff?
- -->
-
-	<figure id="usage-mainwindow-fig">
-	<title>Evolution Main Window and Inbox</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-	</figure>
+Make sure that this figure meets its descriptions.
+Can these things be labelled with little arrows & stuff?
+-->
+
+    <figure id="usage-mainwindow-fig">
+    <title>Evolution Main Window and Inbox</title>
+    <screenshot>
+      <screeninfo>Evolution Main Window</screeninfo>
+      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Aaron Weber">
+	</graphic>
+    </screenshot>
+    </figure>
 <!-- ==============End of Figure=================================== -->
+</para>
 
-
-        <note>
-	  <title>The Way Evolution Looks</title>
-	  <para>
- 	    The appearance of both
-	    <application>Evolution</application> and
-	    <application>GNOME</application> is very easy to
-	    customize, so your screen might not look like this
-	    picture.  You might configure
-	    <application>Evolution</application> to start with a
-	    different view, or without the <interface>shortcut
-	    bar</interface> or <interface>tree view</interface>.
-          </para>
-	</note>
+   <para>
+    <note>
+      <title>The Way Evolution Looks</title>
+      <para>
+	The appearance of both
+	<application>Evolution</application> and
+	<application>GNOME</application> is very easy to
+	customize, so your screen might not look like this
+	picture.  You might configure
+	<application>Evolution</application> to start with a
+	different view, or without the <interface>shortcut
+	bar</interface> or <interface>folder view</interface>.
       </para>
+    </note>
+  </para>
+  
+  <sect1 id="usage-mainwindow-shortcutbar">
+    <title>The Shortcut Bar</title>
+    <para>
+        One of <application>Evolution</application>'s most important
+        job is to give you access to your information, and help you
+        use it quickly.  One way it does that is through the
+        <interface>shortcut bar</interface>, that column of buttons on
+        the left hand side of the main window.  There are actually two
+        kinds of buttons in the shortcut bar: familiar looking icons,
+        and the thin rectangles at the top and bottom of the column
+        which separate your shortcuts by category.
+    </para>
+    <para>
+       The category buttons, labelled <guilabel>Evolution
+       Shortcuts</guilabel> and <guilabel>Internet
+       Directories</guilabel>, slide up and down when you click on
+       them.  When you first start
+       <application>Evolution</application>, you are lookig at the
+       <guilabel>Evolution Shortcuts</guilabel>.  If you click
+       <guilabel>Internet Directories</guilabel>, it will slide up and
+       you'll see buttons for the <guilabel>Bigfoot</guilabel> and
+       <guilabel>Netcenter</guilabel> directories, as well as any
+       others you or your system administrator might have added.
+       Click on <guibutton>Evolution Shortcuts</guibutton> to look at
+       the shortcuts again.  Those buttons give you fast access to the
+       major fucntions that <application>Evolution</application>
+       provides for you.
+    </para>
+    <para>
+     They are:
+      <itemizedlist>
+
+<!--  NOT IMPLEMENTED! 
+	<listitem>
+	  <para>
+	    <guibutton>Today</guibutton>, which will bring up a summary
+	    of any new messages you've recieved, along with the tasks and
+	    appointments you have lined up for today.
+	  </para>
+	</listitem>
+-->
+	<listitem>
+	  <para>
+	    <guibutton>Inbox</guibutton>, which will show you all
+	    of your email.  Your Inbox is also where you can
+	    access Evolution's tools to filter, sort, organize,
+	    and search your mail.
+	  </para>
+	</listitem>
+
+	<listitem>
+	   <para>
+	      The <guibutton>Calendar</guibutton>, which can store
+	      appointments for you.  Connected to a network, you
+	      can use it to keep a group of people on schedule and
+	      up to date.
+	   </para>
+	</listitem>
+
+	<listitem>
+	  <para>
+	    The <guibutton>Contacts</guibutton> tool holds your
+	    addresses, phone numbers, and contact information.
+	    Like calendar information, contact data can be
+	    synchronized with hand-held devices and shared over a
+	    network.  
+	  </para>
+	</listitem>
+
+<!-- NOT IMPLEMENTED YET
 
-      <sect1 id="usage-mainwindow-shortcutbar">
-	<title>The Shortcut Bar</title>
-	<para>
-          The buttons in the <interface>shortcut bar</interface> give
-          you quick access to the different functions that
-          <application>Evolution</application> provides.
-        </para>
-	<para>
-          The buttons in the <interface>shortcut bar</interface> are:
-          <itemizedlist>
-	    <listitem>
-	      <para>
-                <guibutton>Today</guibutton>, which will bring up a summary
-                of any new messages you've recieved, along with the tasks and
-                appointments you have lined up for today.
-              </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-                <guibutton>Inbox</guibutton>, which will show you all
-                of your email.  Your Inbox is also where you can
-                access Evolution's tools to filter, sort, organize,
-                and search your mail.
-              </para>
-	    </listitem>
-
-	    <listitem>
-	       <para>
-                  The <guibutton>Calendar</guibutton>, which can store
-                  appointments for you.  Connected to a network, you
-                  can use it to keep a group of people on schedule and
-                  up to date.
-               </para>
-            </listitem>
-
-	    <listitem>
-	      <para>
-                The <guibutton>Contacts</guibutton> tool holds your
-                addresses, phone numbers, and contact information.
-                Like calendar information, contact data can be
-                synchronized with hand-held devices and shared over a
-                network.  
-              </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-                 The <guibutton>Tasks</guibutton> tool combines a "to
-                 do" list with reminders to help you keep track of
-                 daily events.
-              </para>
-	    </listitem>
-
-	    <listitem>
-	      <para> <guibutton>Notes</guibutton> is your catch-all
-                notepad: write <glossterm>haiku</glossterm>, take down
-                messages from phone conversations, or keep small
-                things organized.
-              </para>
-	    </listitem>
-	  </itemizedlist>
-
-
-        </para>
-	<para>
-          If you prefer to use a keyboard shortcut, or <glossterm>hot
-          key</glossterm>, you can use those instead.  They're
-          shown... (INSERT DESCRIPTION) You can also set your own hot
-          keys for functions that don't have any; this is covered in
-          <xref linkend="config">.  If you're using the keyboard
-          shortcuts you may also want to hide the <interface>shortcut
-          bar</interface> by selecting <guimenuitem>Hide/Show Shortcut
-          Bar</guimenuitem> from the <guimenu>MENU</guimenu> menu.
-        </para>
-     </sect1>
-
-      <sect1 id="usage-mainwindow-treeview">
-	<title>The Tree View</title>
-	<para>
-          The <interface>tree view</interface> is the most comprehensive way to
-          get to your information: it can show you everything you've
-          stored with <application>Evolution</application>
-          appointments, address cards, emails, and so forth.
-        
-          The <interface>tree view</interface> display presents your
-          data like a <glossterm>file tree</glossterm>&mdash; it
-          starts small at the top, and branches downwards. There are a
-          few folders you will always see, because they're at the top.
-          On my computer, I have only one: <guilabel>Local</guilabel>.
-          When I click on the plus sign next to the label, I see the
-          contents:
-          <itemizedlist>
-             <listitem>
-                <para>
-                  <guilabel>Calendar</guilabel>, where you'll find your
-                  appointments and event listings.
-               </para>
-             </listitem> 
-             <listitem>
-                <para>
-                <guilabel>Contacts</guilabel>, where your address
-                cards are stored.
-               </para>
-             </listitem>
-             <listitem>
-                <para>
-              <guilabel>Directories</guilabel>, for search directories, which
-              have not been implemented yet.
-               </para>
-             </listitem>
-             <listitem>
-                <para>
-                 <guilabel>Inbox</guilabel>, for your incoming mail.
-                 This is where you will make the most subfolders.
-               </para>
-             </listitem>
-            <listitem>
-                <para>
-                <guilabel>Outbox</guilabel>, where you can store
-                copies of mail you have sent, or unsent drafts.
-               </para>
-             </listitem>
-             <listitem>
-                <para>
-                <guilabel>Trash</guilabel>, where you can throw things away.
-               </para>
-             </listitem>
-          </itemizedlist>
-
-        </para>
-
-	<para>
-          Right-clicking will bring up a menu for just about anything
-          in GNOME, and <application>Evolution</application> is no
-          exception.  If you right-click on a folder, you'll have a
-          menu with the following options:
-	  <itemizedlist>
-	    <listitem><para>Something</para></listitem>
-	    <listitem><para>Something</para></listitem>
-	    <listitem><para>Something</para></listitem>
-	  </itemizedlist>.
-        </para>
-
-	<tip>
-         <title>Context-Sensitive Help</title>
+	<listitem>
 	  <para>
-            You can almost always get help on an item by
-	    right-clicking it.  If you're not sure what something is,
-	    or don't know what you can do with it, right-clicking and
-	    choosing <guimenuitem>Help</guimenuitem> is a good way to
-	    find out.
-          </para>
-        </tip>
-	
-	<para>
-          If a folder has other folders in it, there will be a plus
-          sign next to it. Click on the plus sign, and the folder will
-          open to let you see the other folders inside.  This may
-          change in the future to something more attractive, like
-          triangles that drop down as you click on them to display the
-          rest of the tree.
-        </para>
-
-	<para>
-          Any time new information arrives in a folder, that folder
-          will be highlighted, or its label displayed as bold
-          text. You can learn more about customizing
-          <application>Evolution</application> alerts and appearance
-          in <xref linkend="config">.
-        </para>
-
-	<para>
-          Moving and deleting folders and other items works in one of
-          two ways: using <glossterm>drag-and-drop</glossterm> or by
-          right-clicking and selecting an item from the
-          <interface>right-click menu</interface>.  You can drag the
-          folders inside the tree view to change their order or put
-          one folder inside another.  To delete a folder, drag it into
-          the trash folder or right-click it and select
-          <guimenuitem>Delete</guimenuitem> from the menu that pops
-          up.  The same goes for individual messages, appointments,
-          and address cards, whether they're in the <interface>tree
-          view</interface> or not: drag them where you want them, and
-          they will go there.  <!-- ****This paragraph could use some
-          work**** -->
-        </para>
-	<para>
-          You can also use the <guimenu>right-click menu</guimenu> to
-          move, rename, and delete folders.
-          <guimenuitem>Delete</guimenuitem> function from the
-          <guimenu>right-click menu</guimenu>.
-        </para>
-	<para>
-          Once you've familiarized yourself with the <interface>main
-          window</interface> you can start doing things with it.
-          We'll start with your email inbox: you've got a letter
-          waiting for you already.
-        </para>
-      </sect1>
-    </chapter>
+	     The <guibutton>Tasks</guibutton> tool combines a "to
+	     do" list with reminders to help you keep track of
+	     daily events.
+	  </para>
+	</listitem>
+
+	<listitem>
+	  <para> <guibutton>Notes</guibutton> is your catch-all
+	    notepad: write <glossterm>haiku</glossterm>, take down
+	    messages from phone conversations, or keep small
+	    things organized.
+	  </para>
+	</listitem>
+-->
+
+      </itemizedlist>
+
+
+    </para>
+    <para>
+      If you prefer to use a keyboard shortcut, or <glossterm>hot
+      key</glossterm>, you can use those instead.  They're shown next
+      to their equivalent menu items in the menu bar. You can also set
+      your own hot keys for functions that don't have any; this is
+      covered in <xref linkend="config">.  If you're using the
+      keyboard shortcuts you may also want to hide the
+      <interface>shortcut bar</interface> by selecting
+      <guimenuitem>Hide/Show Shortcut Bar</guimenuitem> from the
+      <guimenu>MENU</guimenu> menu.
+    </para>
+ </sect1>
+
+  <sect1 id="usage-mainwindow-folderview">
+    <title>The Folder View</title>
+    <para>
+      The <interface>folder view</interface> is the most comprehensive way to
+      get to your information. It can show you everything you've
+      stored with <application>Evolution</application>&mdash;
+      appointments, address cards, emails, and so forth.
+
+      The <interface>folder view</interface> display presents your
+      data like a <glossterm>file tree</glossterm>&mdash; it
+      starts small at the top, and branches downwards. There are a
+      few folders you will always see, because they're at the top.
+      On my computer, I have only one: <guilabel>Local</guilabel>.
+      When I click on the plus sign next to the label, I see the
+      contents:
+      <itemizedlist>
+	 <listitem>
+	    <para>
+	      <guilabel>Calendar</guilabel>, where you'll find your
+	      appointments and event listings.
+	   </para>
+	 </listitem> 
+	 <listitem>
+	    <para>
+	    <guilabel>Contacts</guilabel>, where your address
+	    cards are stored.
+	   </para>
+	 </listitem>
+	 <listitem>
+	    <para>
+	  <guilabel>Directories</guilabel>, for search directories, which
+	  have not been implemented yet.
+	   </para>
+	 </listitem>
+	 <listitem>
+	    <para>
+	     <guilabel>Inbox</guilabel>, for your incoming mail.
+	     This is where you will make the most subfolders.
+	   </para>
+	 </listitem>
+	<listitem>
+	    <para>
+	    <guilabel>Outbox</guilabel>, where you can store
+	    copies of mail you have sent, or unsent drafts.
+	   </para>
+	 </listitem>
+	 <listitem>
+	    <para>
+	    <guilabel>Trash</guilabel>, where you can throw things away.
+	   </para>
+	 </listitem>
+      </itemizedlist>
+
+    </para>
+
+    <para>
+      Right-clicking will bring up a menu for just about anything
+      in GNOME, and <application>Evolution</application> is no
+      exception.  If you right-click on a folder, you'll have a
+      menu with the following options:
+      <itemizedlist>
+	<listitem><para>Something</para></listitem>
+	<listitem><para>Something</para></listitem>
+	<listitem><para>Something</para></listitem>
+      </itemizedlist>.
+    </para>
+
+    <tip>
+     <title>Context-Sensitive Help</title>
+      <para>
+	You can almost always get help on an item by
+	right-clicking it.  If you're not sure what something is,
+	or don't know what you can do with it, right-clicking and
+	choosing <guimenuitem>Help</guimenuitem> is a good way to
+	find out.
+      </para>
+    </tip>
+
+    <para>
+      If a folder has other folders in it, there will be a plus
+      sign next to it. Click on the plus sign, and the folder will
+      open to let you see the other folders inside.  This may
+      change in the future to something more attractive, like
+      triangles that drop down as you click on them to display the
+      rest of the tree.
+    </para>
+
+    <para>
+      Any time new information arrives in a folder, that folder
+      will be highlighted, or its label displayed as bold
+      text. You can learn more about customizing
+      <application>Evolution</application> alerts and appearance
+      in <xref linkend="config">.
+    </para>
+
+    <para>
+      Moving and deleting folders and other items works in one of
+      two ways: using <glossterm>drag-and-drop</glossterm> or by
+      right-clicking and selecting an item from the
+      <interface>right-click menu</interface>.  You can drag the
+      folders inside the folder view to change their order or put
+      one folder inside another.  To delete a folder, drag it into
+      the trash folder or right-click it and select
+      <guimenuitem>Delete</guimenuitem> from the menu that pops
+      up.  The same goes for individual messages, appointments,
+      and address cards, whether they're in the <interface>folder
+      view</interface> or not: drag them where you want them, and
+      they will go there.  <!-- ****This paragraph could use some
+      work**** -->
+    </para>
+    <para>
+      You can also use the <guimenu>right-click menu</guimenu> to
+      move, rename, and delete folders.
+      <guimenuitem>Delete</guimenuitem> function from the
+      <guimenu>right-click menu</guimenu>.
+    </para>
+  </sect1>
+  <sect1 id="usage-mainwindow-menubar">
+    <title>The Menu Bar</title>
+    <para>
+      The <interface>menu bar</interface>'s contents will always
+      provide all the possible actions for any view of your data.
+      That means that, depending on the context, menu bar items will
+      change.  If you're looking at your Inbox, most of the menu items
+      will relate to mail; some will relate to other components of
+      <application>Evolution</application> and some, especially those
+      in the <guimenu>File Menu</guimenu> will relate to the
+      application as a whole. You can probably guess that the
+      <guimenu>Help Menu</guimenu> is where to go for help, and that
+      the <guimenu>View</guimenu> menu controls the way that
+      <application>Evolution</application> looks.  Other menu items
+      are a little less obvious, and change a little more, so we'll
+      cover them later on as we discuss the things you can do with
+      <application>Evolution</application>.
+    </para>
+  </sect1>
+    <para>
+      Once you've familiarized yourself with the <interface>main
+      window</interface> you can start doing things with it.
+      We'll start with your email inbox: you've got a letter
+      waiting for you already.
+    </para>
+
+</chapter>
 
 
 
diff --git a/help/ChangeLog b/help/ChangeLog
index 1763085829..5a0a10b948 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,16 @@
+2000-06-14  Aaron Weber  <aaron@helixcode.com>
+
+	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.
+
+	* C/usage-mail.sgml: Improved filter and vfolder
+	description, and some minor changes from me and Kevin.
+
+2000-06-07  Aaron Weber  <aaron@helixcode.com>
+
+	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.
+	* C/fig/config-cal.png: new file (screenshot for above)
+	* C/fig/config-mail.png: same
+	
 2000-06-05  Aaron Weber  <aaron@helixcode.com>
 
 	* C/usage-calendar.sgml: Incorporated chgs from Kevin.