diff --git a/TODO b/TODO
index 9a08702b11c4bc961b1f6022a5b1654368fad97a..eaa307a8605358a94d84d2f29e76a2ea7f12457f 100644
--- a/TODO
+++ b/TODO
@@ -4,14 +4,11 @@ Current activities:
   script.
 	- Add commandline options to fully customixe execution
 	- Write manual page
-* Implement the mailbox extension
-	- Implement mailboxexists command
-	- Build testsuite tests
 * Testsuite:
 	- add support for testing binary load/save
 	- add support for testing messages stored into a mailbox by looping these back
 	  as the tested mail message
-	- add execution tests for fileinto, imap4flags and mailbox extensions.
+	- add execution tests for fileinto and imap4flags extensions.
 
 Next (in order of descending priority/precedence):
 
@@ -70,6 +67,7 @@ Next (in order of descending priority/precedence):
 	  are tested at least once.
 * Code cleanup:
 	- Make address handling more uniform. 
+	- Review all FIXMEs 
 
 * Build a server with test mail accounts that processes lots and lots of mail 
   (e.g. spam, mailing lists etc.)
diff --git a/src/lib-sieve/plugins/mailbox/cmd-mailboxexists.c b/src/lib-sieve/plugins/mailbox/cmd-mailboxexists.c
index f838f3067e841f9c373b326f3c961f875ee03908..67f0a024a614c2bb3dc25d2d83d9d142390d5b83 100644
--- a/src/lib-sieve/plugins/mailbox/cmd-mailboxexists.c
+++ b/src/lib-sieve/plugins/mailbox/cmd-mailboxexists.c
@@ -158,6 +158,9 @@ static int tst_mailboxexists_operation_execute
 			if ( mailbox_is_readonly(box) )
 				all_exist = FALSE;
 
+			/* FIXME: check acl for 'p' or 'i' ACL permissions as required by RFC */
+
+			/* Close mailbox */
 			mailbox_close(&box);
 		}
 	}
diff --git a/src/lib-sieve/plugins/mailbox/ext-mailbox.c b/src/lib-sieve/plugins/mailbox/ext-mailbox.c
index 3ea6588025edc5ccbd9bae0c73cc6ab7ff9408ef..3419e3c90627b14889a3fc16cfaa9a4c219ffdac 100644
--- a/src/lib-sieve/plugins/mailbox/ext-mailbox.c
+++ b/src/lib-sieve/plugins/mailbox/ext-mailbox.c
@@ -6,7 +6,7 @@
  *
  * Authors: Stephan Bosch
  * Specification: RFC 5490
- * Implementation: full
+ * Implementation: almost full; acl support is missing for mailboxexists
  * Status: experimental, largely untested
  * 
  */