diff --git a/help/C/apx-bugs.sgml b/help/C/apx-bugs.sgml
index e4a96a8155..0b3779141e 100644
--- a/help/C/apx-bugs.sgml
+++ b/help/C/apx-bugs.sgml
@@ -4,20 +4,32 @@
     <abstract>
     <para>
      This appendix describes known bugs and limitations of
-    <application>Evolution</application>.  Please use the GNOME
-    <application>Bug Report Tool</application> (known as
-    <command>bug-buddy</command> at the command line) if you find one
-    we have not listed.
+    <application>Evolution</application>. Ximian Evolution bug
+    tracking is done at the <ulink
+    url="http://bugzilla.ximian.com">Ximian bug tracking
+    System</ulink>.  You may use that, or the GNOME <application>Bug
+    Report Tool</application> (known as <command>bug-buddy</command>
+    at the command line) if you find bugs, or would like to request
+    new features
     </para>
     </abstract>
 
     <para>
-      Evolution is still beta software, so the bug tracking is best
-      left to the bugzilla system and to the programmers.  However,
-      there are a number of limitations that will not be addressed
-      before version 1.0. The most notable are: Import of Microsoft
-      Outlook .pst files, and compatibility with the Microsoft
-      Exchange protocol.
+      A number of popular features will not make it into Ximian
+      Evolution 1.0, but we plan to include them for version 1.1.
+      Some of them are:
+    <simplelist>
+    <member>Direct import of Microsoft Outlook contact cards</member>
+    <member>Synchronization of email with handheld devices</member>
+    <member>S/MIME support</member>
+    <member>Read foreign mail folders without importing them</member>
+    <member>Import of WINMAIL.DAT attachments</member>
+    <member>A "You have new mail" popup or other indicator</member>
     </para>
+    <para>
+     A more complete list of feature requests and other issues with
+     Evolution is available online in the Ximian bug tracking system.
+    </para>
+
   </appendix>
 
diff --git a/help/C/preface.sgml b/help/C/preface.sgml
index 839dbdcb93..722f40a7f4 100644
--- a/help/C/preface.sgml
+++ b/help/C/preface.sgml
@@ -26,7 +26,7 @@
           <simplelist>
 	    <member><application>Applications</application></member>
 	    <member><command>Commands</command> you type at the command line</member>
-	    <member><guilabel>Labels</guilabel> for </member>
+	    <member><guilabel>Labels</guilabel> for buttons and other portions of the graphical interface</member>
 
             <member> Menu selections look like this:
                        <menuchoice>
@@ -43,7 +43,7 @@
             that are defined in the <xref linkend="apx-gloss">.</member>
 	  </simplelist>
 	  <tip id="example-tip">
-	      <title>Example Tip</title>
+	      <title>Tip</title>
 	      <para>
 		Tips and bits of extra information will look like
 		this.
@@ -53,14 +53,17 @@
 	  <example>
 	    <title>Example Example</title>
 	    <para>
-	      This is what an example looks like. 
+	      This is what an example looks like.  We'll provide
+	      examples for some of the more complicated tasks you
+	      might be performing.
 	    </para>
 	  </example>
 
 	    <warning id="example-warning">
 	      <title>Example Warning</title>
 	      <para>
-		This is what a warning looks like.
+		This is what a warning looks like. If there's a chance
+		you'll run into trouble, we'll warn you beforehand.
 	      </para>
 	  </warning>
         </para>
diff --git a/help/C/usage-exec-summary.sgml b/help/C/usage-exec-summary.sgml
index be59cb389d..455a7cc47e 100644
--- a/help/C/usage-exec-summary.sgml
+++ b/help/C/usage-exec-summary.sgml
@@ -2,10 +2,10 @@
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
 <chapter id="usage-summary">
-  <title>Using the Ximian Evolution Summary</title>
+  <title>Getting Oriented with the Ximian Evolution Summary</title>
   
   <sect1 id="summary-intro">
-    <title>Introducing the Summary</title>
+    <title>Using the Summary</title>
     <para>
       The Ximian Evolution Summary can show you what you need to know
       quickly.  It will show you your tasks for that day, how many
diff --git a/help/C/usage-mainwindow.sgml b/help/C/usage-mainwindow.sgml
index 7794c8c54f..7b57548423 100644
--- a/help/C/usage-mainwindow.sgml
+++ b/help/C/usage-mainwindow.sgml
@@ -291,10 +291,13 @@
   <sect2 id="fourth-step">
       <title>Importing Mail (Optional)</title>
       <para>
-	If <application>Ximian Evolution</application> finds mail or address
-	files from another application, it will offer to import them.
-	If you're not sure which file format your mail program uses,
-	ask your system administrator.
+	If <application>Ximian Evolution</application> finds mail or
+	address files from another application, it will offer to
+	import them.  If you're not sure which file format your mail
+	program uses, ask your system administrator.  If you want, you
+	can skip this step and return to it at a later time by
+	selecting
+	<menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
       </para>
       <para>
 	<application>Ximian Evolution</application> can import the following types of
@@ -304,16 +307,21 @@
 	    <term>VCard (.vcf, gcrd)</term>
 	    <listitem>
 	      <para>
-	         The most common addressbook format.
+	         The addressbook format used by the GNOME, KDE, and
+	         many other contact management applications. You
+	         should be able to export to VCard format from any
+	         address book application.
 	      </para>
 	    </listitem>
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Outlook Express 4 (.mbx)</term>
+	    <term>Microsoft Outlook Express 4 (.mbx)</term>
 	    <listitem>
 	      <para>
-                 Email file format used by Outlook Express 4.
+                 Email file format used by Microsoft Outlook Express
+4. For other versions of Microsoft Outlook and Outlook Express, see
+the workaround described in the note below.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -331,11 +339,13 @@
 </para>
 <para>
     <note>
-      <title>Outlook 2000 Users</title>
+      <title>Microsoft Outlook and Outlook Express Users</title>
       <para>
-	Outlook 2000 uses a proprietary format that
-	<application>Ximian Evolution</application> cannot import directly.
-	To import files from Outlook 2000, do the following:
+	Microsoft Outlook, and versions of Outlook Express after
+	version 4, use proprietary formats that <application>Ximian
+	Evolution</application> cannot read or import.  For contacts,
+	you may have to email them to yourself and import them that
+	way.  For email, there is a simpler workaround:
 	<orderedlist numeration="arabic">
 
 	<listitem>
@@ -356,8 +366,8 @@
 	<listitem>
 	<para>
 	  Use the <application>Ximian Evolution</application> import
-          tool to import the files.  Read the FAQ at the Ximian
-          website for more information.
+          tool to import the files.  There's more information about
+          why this works, and how, at the Ximian support website.
       </para>
         </listitem>
      </orderedlist>
@@ -533,8 +543,8 @@
 	  <term><guibutton>Contacts</guibutton></term>
 	  <listitem>
 	    <para>
-	      The Contact Manager holds your addresses, phone numbers,
-	      and contact information.  Like calendar information,
+	      The Addressbook holds contacts, with address, phone, and
+	      other personal information. Like calendar information,
 	      contact data can be synchronized with hand-held devices
 	      and shared over a network.
 	   </para>
@@ -883,8 +893,8 @@
               It supports multiple mail sources, including <glossterm
               linkend="imap">IMAP</glossterm>, <glossterm
               linkend="pop">POP3</glossterm>, local
-              <filename>mbox</filename> and
-              <filename>mh</filename> files.
+              <filename>mbox</filename> and <filename>mh</filename>
+              spools and files created by other mail programs.
 
 <!-- NOT FOR 1.0, but maybe later 
               and even NNTP messages (newsgroups), which aren't
@@ -940,11 +950,11 @@
 
       <para>
         <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2"
-        format="png"></imageobject></inlinemediaobject> <guilabel>Email List</guilabel>
+        format="png"></imageobject></inlinemediaobject> <guilabel>Message List</guilabel>
       </para>
     
       <para>
-        The <guilabel>Email List</guilabel> displays all the emails
+        The <guilabel>Message List</guilabel> displays all the emails
         that you have.  This includes all your read, unread, and email
         that is flagged to be deleted.
       </para>
@@ -955,9 +965,13 @@
         message in the <interface>message list</interface> to have it
         open in a new window.  To change the sizes of a pane, just click
         and hold on the divider between the two panes.  Then you can drag
-        up and down to select the size of the panes.  Just like with
-        folders, you can right-click on messages in the message list and
-        get a menu of possible actions.
+        up and down to select the size of the panes.
+
+</para>
+<para> Just like with folders, you can right-click on messages in the
+        message list and get a menu of possible actions: you can move,
+        delete, or undelete them, and create filters or vFolders based
+        on them.
       </para>
       <para>
         Most of the mail-related actions you'll want to perform are
@@ -1048,16 +1062,14 @@
     <sect2 id="basics-contacts">
       <title>Introducing the Address Book</title>
       <para>
-        The <application>Ximian Evolution</application> address book can
-        handle all of the functions of an address book, phone book, or
-        Rolodex.  Of course, it's a lot easier to update
-        <application>Ximian Evolution</application> than it is to change an
-        actual paper book. <application>Ximian Evolution</application> also
-        allows easy synchronization with hand-held devices.  Since
-        <application>Ximian Evolution</application> supports the <glossterm
-        linkend="ldap">LDAP</glossterm> directory protocol, you can
-        use it with almost any type of existing directory server on
-        your network.
+        The <application>Ximian Evolution</application> address book
+        can handle all of the functions of an address book, phone
+        book, or Rolodex.  Of course, it's a lot easier to update
+        <application>Ximian Evolution</application> than it is to
+        change an actual paper book. <application>Ximian
+        Evolution</application> also allows easy synchronization with
+        hand-held devices and functions with <glossterm
+        linkend="ldap">LDAP</glossterm> directories on a network.
       </para>
       <para>
         Another advantage of the <application>Ximian Evolution</application>