diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index 646fbe4b..e78b2881 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -631,8 +631,6 @@ after the end of the search results."
       (define-key map "V" 'mu4e-headers-toggle-skip-duplicates)
 
       (define-key map "q" 'mu4e~headers-quit-buffer)
-      (define-key map "z" 'mu4e~headers-quit-buffer)
-
       (define-key map "g" 'mu4e-headers-rerun-search) ;; for compatibility
 
       (define-key map "%" 'mu4e-headers-mark-pattern)
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index a2e63c04..1b092641 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -892,7 +892,7 @@ a            execute some custom action on a header
 C-+,C--      increase / decrease the number of headers shown
 H            get help
 C-S-u        update mail & reindex
-q,z          leave the headers buffer
+q            leave the headers buffer
 @end verbatim
 
 
@@ -1199,7 +1199,7 @@ v            show details about the cryptographic signature
 C-+,C--      increase / decrease the number of headers shown
 H            get help
 C-S-u        update mail & reindex
-q,z          leave the message view
+q            leave the message view
 @end verbatim
 
 For the marking commands, please refer to @ref{Marking messages}.