Mutt improvements

 * Use aliases instead of lbdb
 * Add user-agent to shown headers
 * Fix send to junk macro

diff --git a/.hgignore b/.hgignore
index 6741a75a84238a6385a0c0f21c61d36533ca9790..0b796a8b22da15a2310a5882ba1f6788706b3277 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,4 @@
+.mutt/aliases
 .mutt/header_cache
 .vim/abbrsout.vim
 .vim/local.vim

diff --git a/.mutt/display b/.mutt/display
index 11b3675895d5a24ce396f3a0f4babecb775a4de5..2c9d51f5a8ff9172a2e49e435e75965f1e61b949 100644 (file)
--- a/.mutt/display
+++ b/.mutt/display
@@ -2,8 +2,8 @@
 
 # Headers to show
 ignore *
-unignore date return-path from to cc bcc reply-to subject x-mailer x-spam-score
-hdr_order date return-path from to cc bcc reply-to subject x-mailer x-spam-score
+unignore date return-path from to cc bcc reply-to subject user-agent x-mailer x-spam-score
+hdr_order date return-path from to cc bcc reply-to subject user-agent x-mailer x-spam-score
 
 # Sort by threads then date received
 set sort=threads
@@ -35,6 +35,9 @@ set folder_format="%2C %t %f %> %8s %d "
 set charset=utf8
 set noallow_8bit
 
+# Use the alias list to look up real names for people
+set reverse_alias=yes
+
 # Autoview HTML emails
 auto_view text/enriched text/html
 

diff --git a/.mutt/macros b/.mutt/macros
index f73667dde68603bb27d6c6bdb915368c3389d0d6..7635a66f3d4cd4fd513ed8c2461d599759dd034e 100644 (file)
--- a/.mutt/macros
+++ b/.mutt/macros
@@ -1,11 +1,8 @@
 # vim:ft=muttrc
 
-# Query the address book
-set query_command="lbdbq '%s'"
-
 # Put messages into the junk folder
-macro index S "<clear-flag>N<clear-flag>O<save-message>=Junk<enter>" "move message to the Junk folder"
-macro pager S "<save-message>=Junk<enter>" "move message to the junk folder"
+macro index <Esc>j "<select-entry><save-message>=Junk<enter>" "move message to the Junk folder"
+macro pager <Esc>j "<save-message>=Junk<enter>" "move message to the junk folder"
 
 # Make N search backwards
 macro index N "<search-opposite>" "search for next match in opposite direction"
@@ -14,7 +11,7 @@ macro pager N "<search-opposite>" "search for next match in opposite direction"
 # Go back to the inbox
 macro index I "<change-folder>=Inbox<enter>" "go back to the inbox"
 macro pager I "<change-folder>=Inbox<enter>" "go back to the inbox"
-# Go to the received mail folter
+# Go to the received mail folder
 macro index R "<change-folder>=Received<enter>" "go to the received mail folder"
 macro pager R "<change-folder>=Received<enter>" "go to the received mail folder"
 

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 01cecd750e8d47fb085632ed5b35eb461a55f3e7..f17157a50fc3c40bcdbda9dae8de57e075886fe2 100644 (file)
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -8,6 +8,7 @@ source "$HOME/.mutt/macros"
 source "$HOME/.mutt/composing"
 source "$HOME/.mutt/display"
 source "$HOME/.mutt/general"
+source "$HOME/.mutt/aliases"
 
 # Get mutt to display its version on startup.
 push <show-version>