diff --git a/docsrc/imap/rfc-support.rst b/docsrc/imap/rfc-support.rst
index abced76950..648c8a55ed 100644
--- a/docsrc/imap/rfc-support.rst
+++ b/docsrc/imap/rfc-support.rst
@@ -693,6 +693,11 @@ The following is an inventory of RFCs supported by Cyrus IMAP.
 
     IMAP Support for UTF-8
 
+    .. NOTE::
+
+        This extension will only be advertised and supported
+        if both 'reject8bit' and 'munge8bit' are disabled.
+
 :rfc:`6901`
 
     JavaScript Object Notation (JSON) Pointer
diff --git a/lib/imapoptions b/lib/imapoptions
index f5fe062aaa..000e7bb442 100644
--- a/lib/imapoptions
+++ b/lib/imapoptions
@@ -2486,7 +2486,7 @@ If all partitions are over that limit, this feature is not used anymore.
 { "search_skipdiacrit", 1, SWITCH, "2.5.0" }
 /* When searching, should diacriticals be stripped from the search
    terms.  The default is "true", a search for "hav" will match
-   "Håvard".  This is not RFC 5051 compliant, but it backwards
+   "Håvard".  This is not RFC 5051 compliant, but is backwards
    compatible, and may be preferred by some sites. */
 
 { "search_skiphtml", 0, SWITCH, "3.0.0" }