diff --git a/TODO b/TODO
index 49485d19..b68be371 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,14 @@
+Fix "notmuch show" to actually MIME-decode messages.
+
+Add support to format a reply buffer for a particular message.
+
+Add feedback for tag addition/removal to notmuch.el.
+
+Hide thread IDs in notmuch-search mode in notmuch.el.
+
+Selectively hide headers and bodies in notmuch-show mode in
+notmuch.el, (for example, for read messages).
+
 Compile and install a libnotmuch library.
 
 Make "notmuch setup" not index all messages, but only what it can do