diff --git a/mu4e/mu4e-bookmarks.el b/mu4e/mu4e-bookmarks.el
index 8c796006..89c6ffa8 100644
--- a/mu4e/mu4e-bookmarks.el
+++ b/mu4e/mu4e-bookmarks.el
@@ -65,9 +65,9 @@ bookmark uses a very slow query.
 implied when `:query' is a function.
 
 Note: for efficiency, queries used to determine the unread/all
-counts do not apply `mu4e-query-rewrite-function', nor do they
-discard duplicate or unreadable messages. Thus, the numbers shown
-may differ from the number you get from a 'real' query."
+counts do not discard duplicate or unreadable messages. Thus, the
+numbers shown may differ from the number you get from a normal
+query."
   :type '(repeat (plist))
   :group 'mu4e-bookmarks)
 
diff --git a/mu4e/mu4e-contacts.el b/mu4e/mu4e-contacts.el
index e10b3bd5..a44434e2 100644
--- a/mu4e/mu4e-contacts.el
+++ b/mu4e/mu4e-contacts.el
@@ -56,13 +56,14 @@ time-based restriction."
   :type 'string
   :group 'mu4e-compose)
 
-(defcustom mu4e-compose-complete-max 2000
+(defcustom mu4e-compose-complete-max nil
   "Consider only the top-n contacts.
 After considering the other
 constraints (`mu4e-compose-complete-addresses' and
-`mu4e-compose-complete-only-after'), pick only the highest-ranked n.
+`mu4e-compose-complete-only-after'), pick only the highest-ranked
+<n>.
 
-This reduce start-up time and memory usage. Set to nil for no
+This reduces start-up time and memory usage. Set to nil for no
 limits."
   :type 'string
   :group 'mu4e-compose)