diff --git a/src/lib-sieve/ext-envelope.c b/src/lib-sieve/ext-envelope.c
index efaafeb11b63f3fa8bd9c5f8362823a23095d52a..0be8299ae728c27c624df20c2be5352e7de8f325 100644
--- a/src/lib-sieve/ext-envelope.c
+++ b/src/lib-sieve/ext-envelope.c
@@ -176,6 +176,9 @@ static bool tst_envelope_validate
 	if ( !sieve_validator_argument_activate(validator, tst, arg, FALSE) )
 		return FALSE;
 		
+	/* Check whether supplied envelope parts are supported
+	 *   FIXME: verify dynamic envelope parts at runtime 
+	 */
 	epart = arg;
 	if ( !sieve_ast_stringlist_map(&epart, NULL, _envelope_part_is_supported) ) {		
 		sieve_command_validate_error(validator, tst, 
diff --git a/src/lib-sieve/tst-address.c b/src/lib-sieve/tst-address.c
index 7c693b0926e0d3c6ece86fba76225251172d542f..5b5bc4308db5ac4376c4aa222ead72776bcc0ba1 100644
--- a/src/lib-sieve/tst-address.c
+++ b/src/lib-sieve/tst-address.c
@@ -138,7 +138,6 @@ static bool tst_address_validate
 		return FALSE;
 	}
 	
-	/* FIXME: Are header names supposed to be const ? */
 	if ( !sieve_validator_argument_activate(validator, tst, arg, FALSE) )
 		return FALSE;