diff --git a/TODO b/TODO
index 3044ae4f0011a2ba81a03223a8938bbcd2b5d694..e4bc25e80c82441197e19856413cd5873cb4afc0 100644
--- a/TODO
+++ b/TODO
@@ -5,9 +5,14 @@ Current:
 
 Next (in order of descending priority/precedence):
 
-* Improve error handling. Now it is not very consistent, especially for the sieve
+* Improve error handling. Now it is not very consistent, especially for the Sieve
   command line tools and multiscript. 
 * Implement dropping errors in the user's mailbox as a mail message.
+* Implement a better way to encode source line numbers into a binary for reporting 
+  errors at runtime. Currently, this is done explicitly for each command that adds 
+  actions to the result. However, some tests, match types etc. will also need this 
+  when the variables extension is active. Many of the RFC deviations listed below 
+  depend on this.
 * Fix remaining RFC deviations:
 	- Fix issues listed in doc/rfc/RFC-questions.txt based on answers
 	- Allow for the existance of dynamic comparators (i.e. specified by