Merge branch '0.3.x' immediately after the 0.3.1 release

This brings one bug fix into master that was originally applied
directly to the 0.3.x branch.

diff --cc NEWS
index 3c8f0b3592a496fa49df106ba2e875f01839a085,40fb900f74a939142f6ddee312b81cc203189c14..9d913791ed4e846c06e901d7164a659c60732fb3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,25 -1,7 +1,25 @@@
 +New emacs features
 +------------------
 +Add a new, optional hook for detecting inline patches
 +
 +  This hook is disabled by default but can be enabled with a checkbox
 +  under ""Notmuch Show Insert Text/Plain Hook" in the notmuch
 +  customize interface. It allows for inline patches to be detected and
 +  treated as if they were attachments, (with context-sensitive
 +  highlighting).
 +
 +Automatically tag messages as "replied" when sending a reply
 +
 +  This feature adds a "replied" tag by default, but can easily be
 +  customized to add or remove other tags as well. For example, a user
 +  might use a tag of "needs-reply" and can configure this feature to
 +  automatically remove that tag when replying. See "Notmuch Message
 +  Mark Replied" in the notmuch customize interface.
 +
  Notmuch 0.3.1 (2010-04-27)
  ==========================
- General bug fix
- ---------------
+ General bug fixes
+ -----------------
  Fix an infinite loop in "notmuch reply"
  
    This bug could be triggered by replying to a message where the