diff --git a/TODO b/TODO
index dc9932c0..ac4be8bf 100644
--- a/TODO
+++ b/TODO
@@ -4,8 +4,13 @@
 ** Future stuff
 
 *** mu
-   
-   - handling of signed / encrypted messages
+
+  - handling of signed / encrypted messages
+  - maybe use gstringchunk in mu-msg-cache
+  - put threading information in the database, and enable getting the complete
+     threads when searching
+  - refactor fill_database function in test cases
+  - make guile/gtk/webkit dependency optional
 
 *** mu4e
 
@@ -19,14 +24,11 @@
   - check if we can speed up mu4e-proc parsing by using search rather than
     regexp search
   - show maildirs as a tree, not a list in speed bar
-  - put threading information in the database, and enable getting the complete
-    threads when searching
   - mark message, decide what to do with them later
-  - refactor fill_database function in test cases
-  - make sure marks correspond to *current* message in message view
   - make killing all windows (i.e.. 'fullscreen mode' optional)
-  - *BUG* fix for strings where len (g_utf8_strdown (str)) > len (str)
-  - *BUG* don't remove unknown message flags when moving
+  - *BUG* don't remove unknown message flags when moving (see
+    https://github.com/djcb/mu/issues/20)
+  - improve fringe marks (see https://github.com/djcb/mu/issues/21)
 
 ** Done
 
@@ -47,6 +49,10 @@
   - *FIX* no error note if target message already exists (when moving)
   - sorting + show / hide threads
   - *FIX* having multiple header views visible
+  - *FIX* fix for strings where len (g_utf8_strdown (str)) > len (str)
+  - make sure marks correspond to the *current* message in message view (see
+    https://github.com/djcb/mu/issues/26)
+
 
 
 # Local Variables: