diff --git a/TODO b/TODO
index 687b6bc2..fe733d14 100644
--- a/TODO
+++ b/TODO
@@ -9,9 +9,6 @@
   - mu4e~view-wrap-lines (use visual-line-mode? see Jacek's mu4e~view-wrap-lines
     mail)
   - contact completion (see Jacek's 'mu4e: using' mail)
-
-  - rich text composing (with org-mode)
-
   - actions for /all/ headers, actions for /all/ attachment
   - custom header fields in headers-view, message-view
   - guile integration
@@ -26,10 +23,8 @@
   - refactor fill_database function in test cases
 
   - *BUG* having multiple header views visible
-  - *BUG* add runtime check for imagemagick
   - *BUG* fix for strings where len (g_utf8_strdown (str)) > len (str)
   - *BUG* don't remove unknown message flags when moving
-  - *BUG* wrong buffer deleted after sending (see '(non mu) buffer is killed')
 
 ** Done
 
@@ -43,6 +38,12 @@
   - *FIX* slow maildirs when there are many
   - *FIX* ignore unrecognized maildir flag letters
   - *FIX*: reply-to does not make it to the frontend
+  - *FIX* wrong buffer deleted after sending (see '(non mu) buffer is killed')
+  - rich text composing (with org-mode)
+  - let message-mode deal with burying/killing compose buffers
+  - *FIX* add runtime check for imagemagick
+
+