diff --git a/files/mutt/.config/mutt/mailbox.muttrc b/files/mutt/.config/mutt/mailbox.muttrc
index 8042112..13d3b04 100644
--- a/files/mutt/.config/mutt/mailbox.muttrc
+++ b/files/mutt/.config/mutt/mailbox.muttrc
@@ -15,7 +15,7 @@ set honor_followup_to = yes
 ## Reading
 set mark_old          = no
 set date_format       = "%y-%m-%d %T"
-set index_format      = "%4C %Z %D %-8.8n %-12.12L (%4l) %s"
+set index_format      = "%4C %Z %{%b %d} %-12.12L (%4l) %s"
 set sort              = "reverse-threads"
 set sort_aux          = "last-date-received"
 set content_type      = "text/plain"
@@ -25,9 +25,11 @@ set my_editor         = "vim -c 'setf mail' "
 set editor            = "$my_editor "
 
 ## Composing
-## Option 'use_envelope_from' does not work reliably, force Message-ID format.
-## To remove hostname message.
+## Option 'use_envelope_from' does not work reliably, force Message-ID
+## format to remove hostname from the header.
 set message_id_format = "<%z@%r%r>"
+set from              = "$my_user@$my_server"
+set use_from          = yes
 set fast_reply        = yes
 set edit_headers      = yes
 set copy              = yes
@@ -55,4 +57,7 @@ set history             = 1000
 set history_remove_dups = yes
 set save_history        = 1
 
+## Alias
+alias me $realname <$from>
+
 ## vim: ft=muttrc
diff --git a/files/mutt/.config/mutt/muttrc b/files/mutt/.config/mutt/muttrc
index 723e043..f31fd9f 100644
--- a/files/mutt/.config/mutt/muttrc
+++ b/files/mutt/.config/mutt/muttrc
@@ -5,11 +5,11 @@
 ## Source configuration
 cd ~/.config/mutt
 source ~/.muttrc-credentials.local
-source conf.d/server.muttrc
-source conf.d/mailbox.muttrc
-source conf.d/pgp.muttrc
-source conf.d/bindings.muttrc
-source conf.d/colors.muttrc
+source server.muttrc
+source mailbox.muttrc
+source pgp.muttrc
+source bindings.muttrc
+source colors.muttrc
 source ~/.muttrc-aliases.local
 source ~/.muttrc.local
 ## vim: ft=muttrc
diff --git a/files/mutt/.config/mutt/server.muttrc b/files/mutt/.config/mutt/server.muttrc
index df1cfe1..047edcf 100644
--- a/files/mutt/.config/mutt/server.muttrc
+++ b/files/mutt/.config/mutt/server.muttrc
@@ -25,12 +25,7 @@ set smtp_url          = "smtps://$my_user@smtp.$my_server"
 unset record
 set smtp_pass         = "$my_pass"
 set realname          = "$my_name"
-set from              = "$my_user@$my_server"
-set use_from          = yes
 set ssl_starttls      = yes
 set ssl_force_tls     = yes
 
-## Alias
-alias me $realname <$from>
-
 ## vim: ft=muttrc