diff --git a/mutt/.config/mutt/muttrc b/mutt/.config/mutt/muttrc
index 39aa412..938b888 100644
--- a/mutt/.config/mutt/muttrc
+++ b/mutt/.config/mutt/muttrc
@@ -8,9 +8,18 @@ set sort_aux=last-date-received
 ## accounts
 source $EMAIL_ACCOUNT
 
-macro index <f2> '<sync-mailbox><refresh><enter-command>source ~/.config/mutt/waarp<enter><change-folder>!<enter>'
-macro index <f3> '<sync-mailbox><refresh><enter-command>source ~/.config/mutt/perso<enter><change-folder>!<enter>'
+# Misc options
+set edit_headers=yes
+set envelope_from                    # which from?
+set sig_dashes                       # dashes before sig
+set reply_to                         # reply to Reply to: field
+set reverse_name                     # reply as whomever it was to
+set include                          # include message in replies
+set forward_quote                    # include message in forwards 
+set uncollapse_jump                  # don't collapse on an unread message
 
+set pager_stop             # don't go to next message automatically
+set menu_scroll            # scroll in menus
 
 ## other
 source mutt-color-solarized.muttrc
@@ -39,19 +48,17 @@ auto_view text/html
 alternative_order text/plain text/html
 
 # Key bindings
-bind pager <Up> previous-line 
-bind pager <Down> next-line
-bind index,pager \CS sidebar-toggle-visible
-#bind index,pager \CN sidebar-next-new
-#bind index,pager \CP sidebar-prev-new
-bind index,pager \CN sidebar-next
-bind index,pager \CP sidebar-prev
-bind index <F73> previous-entry
-bind index <F72> next-entry
+bind pager       <Up>    previous-line 
+bind pager       <Down>  next-line
+bind index,pager \CS     sidebar-toggle-visible
+bind index,pager \CN     sidebar-next
+bind index,pager \CP     sidebar-prev
+bind index       <F73>   previous-entry
+bind index       <F72>   next-entry
+bind index       <space> collapse-thread
+bind index,pager R       group-reply
 
 macro attach S "<save-entry><bol>~/Téléchargements/<eol>" "Save to downloads"
-#macro index,pager T ":set confirmappend=no delete=yes\n<tag-prefix><save-message>=[Gmail]/Corbeille<enter><sync-mailbox>:set confirmappend=yes delete=yes\n"
-
 macro index,pager T "<save-message>=[Gmail]/Corbeille<enter><enter>" "Trash"