diff --git a/README.md b/README.md
index 42d5673..1c3acaf 100644
--- a/README.md
+++ b/README.md
@@ -141,9 +141,10 @@ https://nlnet.nl/project/Mox/.
 - Automate DNS management, for setup and maintenance, such as DANE/DKIM key rotation
 - Config options for "transactional email domains", for which mox will only
   send messages
-- More IMAP extensions (UNAUTHENTICATE, NOTIFY, OBJECTID, UIDONLY)
+- More IMAP extensions (NOTIFY, UIDONLY)
 - Encrypted storage of files (email messages, TLS keys), also with per account keys
 - Recognize common deliverability issues and help postmasters solve them
+- JMAP, IMAP OBJECTID extension, IMAP JMAPACCESS extension
 - Calendaring with CalDAV/iCal
 - Introbox, to which first-time senders are delivered
 - Add special IMAP mailbox ("Queue?") that contains queued but
@@ -160,7 +161,6 @@ https://nlnet.nl/project/Mox/.
 - Privilege separation, isolating parts of the application to more restricted
   sandbox (e.g. new unauthenticated connections)
 - Using mox as backup MX
-- JMAP
 - Sieve for filtering (for now see Rulesets in the account config)
 - ARC, with forwarded email from trusted source
 - Milter support, for integration with external tools
diff --git a/rfc/index.txt b/rfc/index.txt
index 17d83ee..d65947d 100644
--- a/rfc/index.txt
+++ b/rfc/index.txt
@@ -226,7 +226,7 @@ https://www.iana.org/assignments/message-headers/message-headers.xhtml
 7377	Roadmap	-	IMAP4 Multimailbox SEARCH Extension
 7888	Yes	-	IMAP4 Non-synchronizing Literals
 7889	Yes	-	The IMAP APPENDLIMIT Extension
-8437	Roadmap	-	IMAP UNAUTHENTICATE Extension for Connection Reuse
+8437	No	-	IMAP UNAUTHENTICATE Extension for Connection Reuse
 8438	Yes	-	IMAP Extension for STATUS=SIZE
 8440	?	-	IMAP4 Extension for Returning MYRIGHTS Information in Extended LIST
 8457	No	-	IMAP "$Important" Keyword and "\Important" Special-Use Attribute