diff --git a/dotfiles/mail.org b/dotfiles/mail.org
index a85729a..044c8e6 100644
--- a/dotfiles/mail.org
+++ b/dotfiles/mail.org
@@ -599,6 +599,9 @@ Documentation:
 
   bind index,pager P print-message
 
+  # Compose a new email (not a reply) to the sender
+  bind index,pager @ compose-to-sender
+
   # Marl All message as read
   macro index \Cr \
       "<tag-pattern>~N<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" \
@@ -723,9 +726,6 @@ Open another instance of neomutt in readonly mode while composing
 
   macro browser h "<top-page><select-entry>"
   bind browser q exit
-
-  bind index G bottom-page
-  bind index gg top-page
 #+end_src
 
 *** Generic
@@ -746,7 +746,7 @@ Enter Command
   bind index,pager \Cj sidebar-next
   bind index,pager \Cl sidebar-open
 
-  bind index,pager B sidebar-toggle-visible
+  bind index,pager \Ch sidebar-toggle-visible
 #+END_SRC
 
 *** Reload Configuration
@@ -829,6 +829,14 @@ Use =urlview= to extract urls from the mail.
   color index brightcolor000 color001 "~v~(~D)"     # thread with deleted (doesn't differentiate between all or partial)
 #+end_src
 
+*** Sidebar
+#+begin_src conf
+ color sidebar_indicator color000       color021  # Mailbox is open
+ color sidebar_highlight color000       color003  # Mailbox is highlighted
+ color sidebar_new       brightcolor006 color000  # Mailbox contains new mail
+ color sidebar_ordinary  color021       color000  # Mailbox contains new mail
+#+end_src
+
 *** Message headers
 #+BEGIN_SRC conf
   color hdrdefault color006       color000
@@ -836,6 +844,28 @@ Use =urlview= to extract urls from the mail.
   color header     brightcolor004 color000 "^(Subject)"
 #+END_SRC
 
+*** Attachments
+#+begin_src conf
+  # Color if the attachment is autoviewed
+  color   attach_headers     brightgreen     default    "Autoview"
+  # Color only the brackets around the headers
+  color   attach_headers     brightyellow    default    "^\\[--"
+  color   attach_headers     brightyellow    default    "--]$"
+  # Color the mime type and the size
+  color   attach_headers     green           default    "Type: [a-z]+/[a-z0-9\-]+"
+  color   attach_headers     green           default    "Size: [0-9\.]+[KM]"
+  # Color GPGME signature checks
+  color   attach_headers     brightgreen     default    "Good signature from.*"
+  color   attach_headers     brightred       default    "Bad signature from.*"
+  color   attach_headers     brightred       default    "BAD signature from.*"
+  color   attach_headers     brightred       default    "Note: This key has expired!"
+  color   attach_headers     brightmagenta   default    "Problem signature from.*"
+  color   attach_headers     brightmagenta   default    "WARNING: This key is not certified with a trusted signature!"
+  color   attach_headers     brightmagenta   default    "         There is no indication that the signature belongs to the owner."
+  color   attach_headers     brightmagenta   default    "can't handle these multiple signatures"
+  color   attach_headers     brightmagenta   default    "signature verification suppressed"
+  color   attach_headers     brightmagenta   default    "invalid node with packet of type"
+#+end_src
 *** Body
 #+BEGIN_SRC conf
   color quoted        color002       color000
@@ -1031,9 +1061,7 @@ This empty code block is used to add a new line after signatude
 *** Index View Options
 #+BEGIN_SRC conf
   set date_format = "%d/%m/%y %H:%M"
-  set index_format = "[%Z] %D  %-20.20F %s"
-  # set index_format = " %Z %<[y?%<[m?%<[d?%[     %H:%M]&%[    %a %d]>&%[    %b %d]>&%[%d/%m/%Y]> %-30.30F %<M?(%2M)&    > %?GS?%GS& ?%?GE?%GE& ?%?GA?%GA& ? %g %s"
-  # set index_format='%4C %S %[%y.%m.%d] %-18.18n %?GU?%GU& ? %?GR?%GR& ? %?GI?%GI& ? %s'
+  set index_format = "[%Z] %D %-20.20F %s"
 
   set sort = threads                         # like gmail
   set sort_aux = reverse-last-date-received  # like gmail
@@ -1134,7 +1162,7 @@ This empty code block is used to add a new line after signatude
   set mail_check_stats
 
   # Display the Sidebar mailboxes using this format string.
-  set sidebar_format = '%B%?F? [%F]?%* %?N?%N/?%S'
+  set sidebar_format = '%B %?N?(%N)?%* %S'
 
   # Sort the mailboxes in the Sidebar using this method:
   #       count    - total number of messages