diff --git a/NEWS b/NEWS
index 035e25e6..40fb900f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,7 @@
 Notmuch 0.3.1 (2010-04-27)
 ==========================
-General bug fix
----------------
-Fix a potential SEGV in "notmuch search"
-
-  This bug could be triggered by an author name ending in a ','.
-  Admittedly - that's almost certainly a spam email. Still needs
-  to be handled correctly.
-
+General bug fixes
+-----------------
 Fix an infinite loop in "notmuch reply"
 
   This bug could be triggered by replying to a message where the
@@ -15,6 +9,12 @@ Fix an infinite loop in "notmuch reply"
   the user had not configured any secondary email addresses. The bug
   was a simple re-use of the same iterator variable in nested loops.
 
+Fix a potential SEGV in "notmuch search"
+
+  This bug could be triggered by an author name ending in a ','.
+  Admittedly - that's almost certainly a spam email, but we never
+  want notmuch to crash.
+
 Emacs bug fixes
 ---------------
 Fix calculations for line wrapping in the primary "notmuch" view.