diff --git a/.config/mutt/gmail.muttrc b/.config/mutt/gmail.muttrc
index b2288a5..d4bf566 100644
--- a/.config/mutt/gmail.muttrc
+++ b/.config/mutt/gmail.muttrc
@@ -16,9 +16,6 @@ mailboxes =INBOX \
   -label Spam "=[Gmail]/Spam" \
   -label Archive "=[Gmail]/All Mail" \
 
-# Headers to show
-ignore *
-unignore date from to cc subject x-mailer resent-from reply-to
 bind pager,index d noop
 bind pager,index e noop
 
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index 00b9a4e..5335e95 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -13,6 +13,12 @@ set mailcap_path = "$XDG_CONFIG_HOME/mutt/mailcap"
 set date_format = "%d.%m.%y %H:%M"
 set index_format = "%3C %Z %d  %-30.30F  %s  (%-2.4c)"
 
+# Headers to show by default
+ignore *
+unignore resent-from reply-to date from to cc subject
+unhdr_order *
+hdr_order resent-from reply-to date from to cc subject
+
 # Mandatory setting to be able to sync via offlineimap!
 # The default is mbox which is basically a file and will not be synced back to
 # the imap-server via offlineimap.