diff --git a/NEWS.org b/NEWS.org
index f8b28a90..a24e880e 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,39 +1,53 @@
 #+STARTUP:showall
 * NEWS (user visible changes)
 
-** 0.9.17
+** 0.9.18
 
    New development series which will lead to 0.9.18.
 
 *** mu
 
-   - Increase the maximum default for message to index to 500 Mb; you
-     can customize this using the --max-msg-size parameter to mu
-     index.
+   - Increase the default maximum size for messages to index to 500
+     Mb; you can customize this using the --max-msg-size parameter to
+     mu index.
    - implement "lazy-checking", which makes mu not descend into
      subdirectories when the directory-timestamp is up to date;
      greatly speeds up indexing.
    - prefer gpg2 for crypto
+   - fix a crash when running on OpenBSD
+   - fix --clear-links (broken filenames)
     
 *** mu4e
-    
-   - Add `mu4e-action-view-with-xwidget`, and action for viewing e-mails
-     inside a Webkit-widget inside emacs (requires emacs 25.x)
-   - Explicitly specify utf8 for external html viewing, so browser can
-     handle it correctly.
+
+**** reading messages
+     
+   - Add `mu4e-action-view-with-xwidget`, and action for viewing
+     e-mails inside a Webkit-widget inside emacs (requires emacs 25.x
+     with xwidget/webkit/gtk3 support)
+   - Explicitly specify utf8 for external html viewing, so browsers
+     can handle it correctly.
+   - Make `shr' the default renderer for rich-text emails (when
+     available)
+   - Add a :user-agent field to the message-sexp (in mu4e-view), which
+     is either the User-Agent or X-Mailer field, when present.
+
+**** composing messages
+     
    - Cleanly handle early exits from message composition as well as
      while composing.
-   - Add a hook `mu4e-mark-execute-pre-hook`, which is run just before
-     executing marks.
-   - Remove the 'z' keybinding for leaving the headers
-     view. Keybindings are precious!
-   - Make `shr' the default renderer for rich-text emails (when available)
    - Allow for resending existing messages, possibly editing them. M-x
      mu4e-compose-resend, or use the menu; no shortcut.
-   - Let `mu4e~read-char-choice' become case-insensitive if there is
-     no exact match; small convenience that affects most the
-     single-char option reading in mu4e.
-   - Now, just before executing any search, a hook-function
+   - Better handle the closing of separate compose frames
+   - Improved font-locking for the compose buffers, and more extensive
+     checks for cited parts.
+   - automatically sign/encrypt replies to signed/encrypted messages
+     (subject to `mu4e-compose-crypto-reply-policy')
+
+**** searching & marking
+
+   - Add a hook `mu4e-mark-execute-pre-hook`, which is run just before
+     executing marks.
+   - Just before executing any search, a hook-function
      `mu4e-headers-search-hook` is invoked, which receives the
      search expression as its parameter.
    - In addition, there's a `mu4e-headers-search-bookmark-hook` which
@@ -41,29 +55,46 @@
      `mu4e-headers-search-hook` will also be called just
      afterwards). This hook also receives the search expression as its
      parameter.
-   - Better handle the closing of separate compose frames
+   - Remove the 'z' keybinding for leaving the headers
+     view. Keybindings are precious!
+   - Fix parentheses/precedence in narrowing search terms
+
+**** indexing
+     
+   - Allow for indexing in the background; see
+     `mu4e-index-update-in-background`.
+   - Better handle mbsync output in the update buffer
+   - Add variables mu4e-index-cleanup and mu4e-index-lazy to enable
+     lazy checking from mu4e; you can sit from mu4e using something
+     like:
+#+BEGIN_SRC elisp
+(setq
+  mu4e-index-cleanup nil      ;; don't do a full cleanup check
+  mu4e-index-lazy-check t)    ;; don't consider up-to-date dirs
+#+END_SRC
+
+**** misc
+     
+   - don't overwrite global-mode-string, append to it.
    - Make org-links (and more general, all users of
      mu4e-view-message-with-message-id) use a headers buffer, then
      view the message. This way, those linked message are just like
      any other, and can be deleted, moved etc.
    - Support org-mode 9.x
-   - Allow for indexing in the background; see
-     `mu4e-index-update-in-background`.
-   - Add a :user-agent field to the message-sexp (in mu4e-view), which
-     is either the User-Agent or X-Mailer field, when present.
    - Improve file-name escaping, and make it support non-ascii filenames
    - Attempt to jump to the same messages after a re-search update operation
    - Add action for spam-filter options
-   - Fixing parentheses in narrowing search terms
-   - Better handle mbsync output in the update buffer
-   - Improved font-locking for the compose buffers, and more extensive
-     checks for cited parts.
-   - automatically sign/encrypt replies to signed/encrypted messages
-     (subject to `mu4e-compose-crypto-reply-policy')
-   - Add variables mu4e-index-cleanup and mu4e-index-lazy to enable
-     lazy checking from mu4e.
-   - don't overwrite global-mode-string, append to it.
-             
+   - Let `mu4e~read-char-choice' become case-insensitive if there is
+     no exact match; small convenience that affects most the
+     single-char option-reading in mu4e.
+            
+
+
+* Old news
+  :PROPERTIES:
+  :VISIBILITY: folded
+  :END:
+
 ** 0.9.16
 
 *** Release
@@ -274,12 +305,7 @@ End of search results
     - ported to gtk+ 3; remove gtk+ 2.x code
 
 
-
-* Old news
-  :PROPERTIES:
-  :VISIBILITY: folded
-  :END:
-
+  
 ** Release 0.9.9 <2012-10-14>
 
 *** mu4e