diff --git a/TODO b/TODO
index 8dd08780..f352faf2 100644
--- a/TODO
+++ b/TODO
@@ -128,6 +128,16 @@ provide more MIME-structure information in its output first).
 Replace the "notmuch search-tags" command with "notmuch search
 --output=tags".
 
+Fix to avoid this ugly message:
+
+	(process:17197): gmime-CRITICAL **: g_mime_message_get_mime_part: assertion `GMIME_IS_MESSAGE (message)' failed
+	Warning: Not indexing empty mime part.
+
+  This probably means adding a test case to generate that message,
+  filing an upstream bug against GMime, and then silencing the
+  notmuch-generated portion of the warning (so that once GMime is
+  fixed, this is all silent).
+
 notmuch library
 ---------------
 Add an interface to accept a "key" and a byte stream, rather than a