diff --git a/TODO b/TODO
index 29a00685c3a8c43b9769d4784e215ac18b638520..14d62bdb87892640d942c2fb08e303d63831902a 100644
--- a/TODO
+++ b/TODO
@@ -10,10 +10,6 @@ Next (in order of descending priority/precedence):
 	- Vacation: If the Sieve variables extension is used, the arguments 
 	  MUST NOT have undergone variable expansion prior to their use in response 
 	  tracking.
-	- Vacation: The ":subject" parameter specifies a subject line to attach to 
-	  any vacation response that is generated. UTF-8 characters can be used in
-	  the string argument; implementations MUST convert the string to [RFC2047] 
-	  encoded words if and only if non-ASCII characters are present.
 * Fix security issues:
 	- Impose limitations on the imapflags extension regarding the number of
 	  set flags and the length of each flag name.
@@ -36,6 +32,10 @@ Next (in order of descending priority/precedence):
 	- Detect assignment of too large constant values to variables at runtime.
 	- Verify outgoing mail addresses at runtime when necessary
 	  (e.g. after variables substitution)
+	- Vacation: The ":subject" parameter specifies a subject line to attach to 
+	  any vacation response that is generated. UTF-8 characters can be used in
+	  the string argument; implementations MUST convert the string to [RFC2047]
+ 	  encoded words if and only if non-ASCII characters are present.
 * Imapflags: merge execution of setflags, removeflags and addflags into one 
   common implementation. 
 * Warn about the use of syntactically invalid header names. 
diff --git a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c b/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c
index 8b08acfbd94d95b451ee4032a9b6a5c13f89a5b1..c88296ddd6ad5f06e0c1efdb9c6ab60bcb5a3de4 100644
--- a/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c
+++ b/src/lib-sieve/plugins/imapflags/ext-imapflags-common.c
@@ -310,6 +310,9 @@ static bool flag_is_valid(const char *flag)
 		 * target mailbox for the message is known. Meaning that the 
 		 * verfication of keyword can only be performed when the
 		 * action side effect is about to be executed.
+		 *
+		 * FIXME: technically this is nonsense, since we can simply parse
+		 * using the flag-keyword grammar provided by imap.
 		 */					
 	}