diff --git a/TODO b/TODO
index cb6dcc35..dc9932c0 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,10 @@
 
 ** Future stuff
 
+*** mu
+   
+   - handling of signed / encrypted messages
+
 *** mu4e
 
   - identities (see Jacek's 'mu4e: From field in replies' mail)
@@ -12,7 +16,6 @@
   - actions for /all/ headers, actions for /all/ attachment
   - custom header fields in headers-view, message-view
   - guile integration
-
   - 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
@@ -20,8 +23,8 @@
     threads when searching
   - mark message, decide what to do with them later
   - refactor fill_database function in test cases
-
-  - *BUG* having multiple header views visible
+  - 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
 
@@ -43,9 +46,7 @@
   - *FIX* add runtime check for imagemagick
   - *FIX* no error note if target message already exists (when moving)
   - sorting + show / hide threads
-
-
-
+  - *FIX* having multiple header views visible
 
 
 # Local Variables: