diff --git a/TODO b/TODO
index 8e81b57d..51a5b9c1 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,10 @@
+Add back full-text indexing, (see last version of
+notmuch-index-message.c in the archives).
+
+Investigate using just a simple hash while constructing threads during
+"notmuch setup", then just writing out to Xapian in one shot at the
+end without haivng to rewrite documents nor look anything up.
+
 Rename notmuch_thread_results_t and notmuch_message_results_t to
 notmuch_threads_t and notmuch_messages_t respectively.