diff --git a/help/C/accounts.page b/help/C/accounts.page
index 16ab97b5..3f1c942a 100644
--- a/help/C/accounts.page
+++ b/help/C/accounts.page
@@ -16,9 +16,9 @@
 	select if your account is Gmail, Yahoo, Outlook.com, or other.  For other account types, you will
 	need to enter your IMAP and SMTP login settings manually.</p>
 	
-	<p>Additional accounts can be added from the Accounts dialog.  Click Accounts in the Gear menu
-	(or press <keyseq><key>Ctrl</key><key>M</key></keyseq>) to open the Accounts dialog.  To add an account, click the + button.</p>
-	
+	<p>Additional accounts can be added from the Accounts dialog.  Click Accounts in the application
+	menu or gear menu (or press <keyseq><key>Ctrl</key><key>M</key></keyseq>) to open the Accounts
+	dialog.  To add an account, click the + button.</p>
 	</section>
 	
 	<section>
@@ -31,6 +31,19 @@
 	<p>To change the order that accounts are displayed in the folder list, drag the accounts in the
 	Accounts dialog to the desired order.</p>
 	
+	<p>There are some advanced options available when editing accounts:</p>
+	<list>
+	<item><p>The <gui>Save sent mail</gui> checkbox controls whether Geary will push successfully sent
+	messages up to the account's <gui>Sent Mail</gui> folder.  For Gmail accounts, this happens
+	automatically.  Yahoo and some other accounts can be configured to do this automatically as well.
+	For other accounts, if you disable this setting, you may be unable to view messages you've
+	sent.</p></item>
+	
+	<item><p>The <gui>Download mail</gui> drop-down allows you to configure how much mail Geary will keep
+	locally.  Geary can only use locally available mail when searching and forming
+	conversations.</p></item>
+	</list>
+	
 	</section>
 	
 	<section>
diff --git a/help/C/archive.page b/help/C/archive.page
index 89e5c84c..ae001d62 100644
--- a/help/C/archive.page
+++ b/help/C/archive.page
@@ -13,9 +13,10 @@
 	The <gui>Archive</gui> toolbar button archives the selected conversation(s).
 	Archived messages appear in the <gui>All Mail</gui> folder.</p>
 
-    <p>With other mail servers, you can delete but not archive messages.  To delete
-    one or more conversations, select them and press the <gui>Delete</gui>
-    button on the toolbar.</p>
-    
+	<p>With other mail servers, you can trash or delete, but not archive, messages.  To move
+	one or more conversations to the <gui>Trash</gui> folder, select them and press the <gui>Trash</gui>
+	button on the toolbar.  To permanently delete the conversations, hold down <key>Shift</key> and press
+	the <gui>Delete</gui> button that appears in place of the <gui>Trash</gui> button.</p>
+
 </page>
 
diff --git a/help/C/bugs.page b/help/C/bugs.page
index 0d04c0b7..8195fa94 100644
--- a/help/C/bugs.page
+++ b/help/C/bugs.page
@@ -8,8 +8,15 @@
    <title>Think you've found a bug?</title>
    <p>If you suspect you've found a bug in Geary, follow these steps to report it:</p>
    <steps>
-   	<item><p>Search Geary's Redmine<link href="http://redmine.yorba.org/projects/geary/issues"> issue tracker </link>to see if someone else has reported the bug.</p></item>
-   	<item><p>Don't see your bug listed? Congratulations! You've found a new bug. To create an bug report, create an account on Redmine and create a new issue. Be as specific as you can and describe the steps to reproduce it. Don't forget to include details about your operating system and what version of Geary you're running.</p></item>
-   	<item><p>For general inquiries, please join the <link href="http://lists.yorba.org/cgi-bin/mailman/listinfo/geary"> Geary mailing list</link>.</p></item>
+	<item><p>Search Geary's <link href="https://bugzilla.gnome.org/browse.cgi?product=geary">bug
+	database</link> to see if someone else has reported the bug.</p></item>
+	<item><p>Don't see your bug listed? Congratulations! You've found a new bug. To create an bug report,
+	create an account on GNOME's Bugzilla and
+	<link href="https://bugzilla.gnome.org/enter_bug.cgi?product=geary">file a new bug</link>.  Be as
+	specific as you can and describe the steps to reproduce it. Don't forget to include details about
+	your operating system and what version of Geary you're running.</p></item>
+	<item><p>For general inquiries, please join the
+	<link href="https://mail.gnome.org/mailman/listinfo/geary-list"> Geary mailing
+	list</link>.</p></item>
    </steps>
 </page>
diff --git a/help/C/limits.page b/help/C/limits.page
index ea6705ee..01c4f240 100644
--- a/help/C/limits.page
+++ b/help/C/limits.page
@@ -11,7 +11,7 @@
     <title>Limitations</title>
     <p>Geary is still in early development. Geary supports IMAP and has been tested with Gmail, Yahoo, and the free Dovecot mail server.  Experimental support for Outlook.com is provided.  Geary may not yet work well with some IMAP servers.  At this time Geary is still missing numerous features including offline mode.</p>
     
-    <p>To learn more about the features we're working on and the future of Geary, please visit Geary's <link href="http://redmine.yorba.org/projects/geary/wiki">Redmine page</link>.</p>
+    <p>To learn more about the features we're working on and the future of Geary, please visit Geary's <link href="https://wiki.gnome.org/Apps/Geary">wiki page</link>.</p>
   
 </page>
 
diff --git a/help/C/overview.page b/help/C/overview.page
index 5584cb48..5716403a 100644
--- a/help/C/overview.page
+++ b/help/C/overview.page
@@ -48,7 +48,9 @@ support the IMAP protocol, including popular services such as Gmail, Yahoo Mail,
     lets you open the <em>message menu</em> with commands that operate on the message.</p>
    	<p>When you view a conversation, Geary collapses messages that you've already read. Click collapsed messages to expand them. Click an expanded message's header to collapse it.</p>
     <p>Any attachments in a message appear at the bottom of the message.  You can click
-    an attachment to open it.</p>
+    an attachment to open it or right-click to save it.</p>
+    <p>Geary uses <link href="https://secure.gravatar.com/">Gravatar</link> to display an avatar for each
+    message's sender in its header.</p>
 
     </section>
 	
diff --git a/help/C/preferences.page b/help/C/preferences.page
index ec9667c9..443530f1 100644
--- a/help/C/preferences.page
+++ b/help/C/preferences.page
@@ -8,7 +8,7 @@
         <link type="next" xref="search" />
     </info>
    <title>Preferences</title>
-	<p>To set preferences in Geary, click the gear menu at the upper right
+	<p>To set preferences in Geary, open the application menu or click the gear menu at the upper right
 	of the toolbar and choose <gui>Preferences</gui>.</p>
 	
     <section>
diff --git a/help/C/search.page b/help/C/search.page
index 03f62ef2..57471db0 100644
--- a/help/C/search.page
+++ b/help/C/search.page
@@ -16,8 +16,46 @@
 	<p>The full text search includes email text, email addresses (to, from, and cc), subject lines and
 	attachment filenames.</p>
 	
-	<p>Keywords that match your search are highlighted the message view.  Geary will match different
+	<p>Keywords that match your search are highlighted in the message view.  Geary will match different
 	forms of the same word, for example searching for "walk" will also match "walking" and "walked."</p>
 	
+	<section>
+	<title>Search operators</title>
+	<p>Geary supports the following operators to limit the scope of searches:</p>
+	<table frame="all" rules="rows">
+	<tr>
+		<td><p><input>attachment:<var>filename</var></input></p></td>
+		<td><p>Finds messages with attachments whose name matches <var>filename</var>.</p></td>
+	</tr>
+	<tr>
+		<td><p><input>bcc:<var>recipient</var></input></p></td>
+		<td><p>Finds messages where <var>recipient</var> matches the BCC header.</p></td>
+	</tr>
+	<tr>
+		<td><p><input>body:<var>text</var></input></p></td>
+		<td><p>Finds messages whose body contains <var>text</var>.</p></td>
+	</tr>
+	<tr>
+		<td><p><input>cc:<var>recipient</var></input></p></td>
+		<td><p>Finds messages where <var>recipient</var> matches the CC header.</p></td>
+	</tr>
+	<tr>
+		<td><p><input>from:<var>sender</var></input></p></td>
+		<td><p>Finds messages where <var>sender</var> matches the From header.</p></td>
+	</tr>
+	<tr>
+		<td><p><input>subject:<var>text</var></input></p></td>
+		<td><p>Finds messages whose subject contains <var>text</var>.</p></td>
+	</tr>
+	<tr>
+		<td><p><input>to:<var>recipient</var></input></p></td>
+		<td><p>Finds messages where <var>sender</var> matches the To, CC, or BCC header.</p></td>
+	</tr>
+	</table>
+	
+	<p>As a special case, the <input>bcc</input>, <input>cc</input>, <input>from</input>, and
+	<input>to</input> operators support <input>me</input> as their argument, which searches for the
+	account's email address in the appropriate context.</p>
+	</section>
 </page>
 
diff --git a/help/C/shortcuts.page b/help/C/shortcuts.page
index b672224b..70dedc5e 100644
--- a/help/C/shortcuts.page
+++ b/help/C/shortcuts.page
@@ -12,7 +12,8 @@
    <p>Geary has keyboard shortcuts for most common operations. </p>
      <table frame="all" rules="rows">
   	<tr>
-  		<td><p>Compose a new message</p></td> 			<td><p><keyseq><key>Ctrl</key><key>N</key></keyseq> or <key>N</key></p></td>
+  		<td><p>Compose a new message</p></td>
+  		<td><p><keyseq><key>Ctrl</key><key>N</key></keyseq> or <key>N</key></p></td>
   	</tr>
  	<tr>
   		<td><p>Reply to sender</p></td>