diff --git a/TODO b/TODO
index dc5a4d86..5d7e74b0 100644
--- a/TODO
+++ b/TODO
@@ -12,8 +12,6 @@
      threads when searching
   - refactor fill_database function in test cases
   - handling of command line options / help
-  - handle exception 'The revision being read has been discarded - you should
-    call Xapian::Database::reopen() and retry the operation'
   - improved checked for gmime-2.6 crypto funcs
   - handle attached messages with attachments
   - add 'contact:' as alias for to: or cc: or bcc: or from:
@@ -21,6 +19,7 @@
 *** mu-guile
 
   - move contact export to separate scm
+  - fix logging
 
 *** mu4e
 
@@ -52,7 +51,6 @@
      mu4e-view-message-with-msgid)
   - improve mouse interaction (i.e., cursor vs point)
   - add example 'run shellscript on message'
-  - fix ' realpath() failed for...' stuff
   - check move + create new dir
   - show counts of messages in searches (in main view)
   - show flush only if there's something to flush (and # of flushables)
@@ -91,6 +89,14 @@
   - fixed iso-2022-jp (japanese) decoding
   - make address completion case-insensitive
   - recognize '*' in urls
+  - handle exception 'The revision being read has been discarded - you should
+    call Xapian::Database::reopen() and retry the operation'
+  - handle passwords from get-mail shell command
+  - support fancy (non-ascii) chars for header flags, thread prefix strings
+  - improve performance of getting the list of maildirs
+  - fix setting wrapped/hide state in viewer
+  - fix ' realpath() failed for...' stuff
+  - allow for fancy chars (> ascii), make it configurable (mu4e-use-fancy-chars)  
 
 * Done
   :PROPERTIES: