diff --git a/roles/neomutt/templates/neomuttrc.j2 b/roles/neomutt/templates/neomuttrc.j2
index da781ab..37740a6 100644
--- a/roles/neomutt/templates/neomuttrc.j2
+++ b/roles/neomutt/templates/neomuttrc.j2
@@ -1,7 +1,7 @@
 set mailcap_path = $HOME/.config/neomutt/mailcap:$mailcap_path
 set mime_type_query_command = "file --mime-type -b %s"
-set date_format="%y/%m/%d %I:%M%p"
-set index_format="%2C %Z %?X?A& ? %D %-15.15F %s (%-4.4c)"
+set date_format="%Y/%m/%d %H:%M"
+set index_format="%4C %Z %D %-20.20F %s (%-4.4c)"
 set sort = 'reverse-date'
 #set smtp_authenticators = 'gssapi:login'
 #set query_command = "abook --mutt-query '%s'"