diff --git a/docsrc/imap/rfc-support.rst b/docsrc/imap/rfc-support.rst
index 07c121f7d8..16a74097fe 100644
--- a/docsrc/imap/rfc-support.rst
+++ b/docsrc/imap/rfc-support.rst
@@ -433,10 +433,6 @@ The following is an inventory of RFCs supported by Cyrus IMAP.
 
     Sieve Email Filtering: Subaddress Extension
 
-:rfc:`5235`
-
-    Sieve Email Filtering: Spamtest and Virustest Extensions
-
 :rfc:`5256`
 
     Internet Message Access Protocol - SORT and THREAD Extensions
@@ -557,11 +553,6 @@ The following is an inventory of RFCs supported by Cyrus IMAP.
 
     Extended MKCOL for Web Distributed Authoring and Versioning (WebDAV)
 
-:rfc:`5703`
-
-    Sieve Email Filtering: MIME Part Tests, Iteration, Extraction,
-    Replacement, and Enclosure
-
 :rfc:`5804`
 
     A protocol for Remotely Managing Sieve Scripts
@@ -584,6 +575,11 @@ The following is an inventory of RFCs supported by Cyrus IMAP.
     Sieve Email Filtering: Delivery Status Notifications and
     Deliver-By Extensions
 
+    .. NOTE::
+
+       envelope-dsn and envelope-deliverby are implemented.  redirect-dsn
+       and redirect-deliverby are not implemented.
+
 :rfc:`6047`
 
     iCalendar Message-Based Interoperability Protocol (iMIP)
@@ -636,10 +632,6 @@ The following is an inventory of RFCs supported by Cyrus IMAP.
 
     DomainKeys Identified Mail (DKIM) Signatures
 
-:rfc:`6558`
-
-    Sieve Extension for Converting Messages before Delivery
-
 :rfc:`6455`
 
     The WebSocket Protocol
@@ -968,6 +960,10 @@ RFC Wishlist
 
     Delta encoding in HTTP
 
+:rfc:`5235`
+
+    Sieve Email Filtering: Spamtest and Virustest Extensions
+
 :rfc:`5255`
 
     Internet Message Access Protocol Internationalization
@@ -985,6 +981,11 @@ RFC Wishlist
 
     IMAP4 Extension for Named Searches (Filters)
 
+:rfc:`5703`
+
+    Sieve Email Filtering: MIME Part Tests, Iteration, Extraction,
+    Replacement, and Enclosure
+
 :rfc:`5842`
 
     Binding Extensions to Web Distributed Authoring and Versioning (WebDAV)
@@ -993,6 +994,10 @@ RFC Wishlist
 
     Sieve Notification Mechanism: SIP MESSAGE
 
+:rfc:`6558`
+
+    Sieve Extension for Converting Messages before Delivery
+
 :rfc:`6785`
 
     Support for Internet Message Access Protocol (IMAP) Events in Sieve
diff --git a/sieve/interp.c b/sieve/interp.c
index 789ff07a83..532b4077ae 100644
--- a/sieve/interp.c
+++ b/sieve/interp.c
@@ -505,7 +505,7 @@ static const struct sieve_capa_t {
 
     /* MIME Part Handling - RFC 5703 */
     { "enclose",      SIEVE_CAPA_ENCLOSE },
-    { "extracttest",  SIEVE_CAPA_EXTRACT },
+    { "extracttext",  SIEVE_CAPA_EXTRACT },
     { "foreverypart", SIEVE_CAPA_FOREVERYPART },
     { "mime",         SIEVE_CAPA_MIME },
     { "replace",      SIEVE_CAPA_REPLACE },