diff --git a/TODO b/TODO
index 137d757b6174425d4a57b48817cf4ca8a8571945..2eabe976098698224b5c4731a058407a29ddabb2 100644
--- a/TODO
+++ b/TODO
@@ -18,6 +18,9 @@ Parallel plugin-based efforts (on hold at the moment):
 
 Next (mostly in order of descending priority/precedence):
 
+* Implement message modification and extraction API in order to:
+	- Properly implement the interaction between editheader and foreverypart/mime.
+	- Implement replace, enclose, and extracttext extensions.
 * Properly implement Sieve internationalization support (utf-8 handling),
   currently it is not complete:
 	- Make this implementation fully conform section 2.7.2 of RFC5228 (Comparisons
@@ -33,8 +36,6 @@ Next (mostly in order of descending priority/precedence):
 	  loaded from different storages linked to the same LDAP server.
 	- Adjust Sieve script API to support asynchronous script retrieval to
 	  retrieve scripts in parallel when possible.
-* Implement message modification and extraction API in order to:
-	- Implement replace, enclose, and extracttext extensions
 * Improve error handling.
 	- Implement dropping errors in the user's mailbox as a mail message.
 * Finish body extension: