diff --git a/mail.org b/mail.org
index 0f4b979..bb650ba 100644
--- a/mail.org
+++ b/mail.org
@@ -696,11 +696,10 @@ macro index \Cr \
 #+END_SRC
 
 #+begin_src conf
-bind index za collapse-thread
-bind index zA collapse-all # Missing :folddisable/foldenable
+bind index z collapse-thread
+bind index Z collapse-all
 #+end_src
 
-
 Write/Reply/Forward mail
 #+BEGIN_SRC conf
 bind index,pager p recall-message
@@ -743,6 +742,13 @@ bind index,pager y edit-label
 bind index,pager Y modify-labels
 #+END_SRC
 
+Copy and move mails
+#+BEGIN_SRC conf
+macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
+macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
+#+END_SRC
+
+
 *** Limit
 #+begin_src conf
 bind index L limit
@@ -832,12 +838,6 @@ Enter Command
 bind generic,index,pager : enter-command
 #+end_src
 
-*** Copy and move mails
-#+BEGIN_SRC conf
-macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
-macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
-#+END_SRC
-
 *** Sidebar
 #+BEGIN_SRC conf
 bind index,pager \Cp sidebar-prev