diff --git a/README b/README
index 4578fd7d1b643e1b848f795ee5fb9ba6f1b1b26b..c3ce15ffecad3c0cbe7718e002b880fec5a0d617 100644
--- a/README
+++ b/README
@@ -160,8 +160,10 @@ Extensions and their implementation status:
     imapflags: full
     variables: mostly full; currently no support for future namespaces 
 
-  Low priority:
+  Next in order of descending priority:
+	environment: planned
     notify: planned, first mailto only 
+	date,index: planned
     editheader: planned, needs additional support from Dovecot though.
     mimeloop: planned
 
diff --git a/TODO b/TODO
index 00b5bdb56bd7317d226854553d5beb9db56575f8..7091f9933465f9af241bb813aaf87288147d9e83 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,11 @@ Next (in order of descending priority/precedence):
 
 * ## MAKE A FIRST RELEASE ##
 
+* Build a server test mail accounts that processes lots and lots of mail 
+  (e.g. spam, mailing lists etc.)
+* Implement environment extension
 * Implement notify extension with sole support for mailto mechanism. 
+* Implement date and index extensions
 * Make this implementation conform section 2.7.2 of RFC3028 (Comparisons Across
   Character Sets). 
 * Verify outgoing mail addresses at runtime when necessary (e.g. after variables