# vim:ft=diff

 * 2009-01-15 myon: refreshed for mutt-1.5.19; drop our list of ignored headers
   in favor of upstream's new unignore list

--- a/doc/Muttrc.head
+++ b/doc/Muttrc.head
@@ -12,6 +12,32 @@ unignore from: subject to cc date x-mail
 # Display the fields in this order
 hdr_order date from to cc subject
 
+# emacs-like bindings
+bind editor    "\e<delete>"    kill-word
+bind editor    "\e<backspace>" kill-word
+
+# map delete-char to a sane value
+bind editor     <delete>  delete-char
+
+# some people actually like these settings
+#set pager_stop
+#bind pager <up> previous-line
+#bind pager <down> next-line
+
+# Specifies how to sort messages in the index menu.
+set sort=threads
+
+# Uncomment if your MTA does not strip Bcc: headers.
+# (postfix strips them, exim4 does not.)
+#unset write_bcc
+# Postfix and qmail use Delivered-To for detecting loops
+unset bounce_delivered
+
+set mixmaster="mixmaster-filter"
+
+# System-wide CA file managed by the ca-certificates package
+set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
+
 # imitate the old search-body function
 macro index \eb "<search>~b " "search in message bodies"
 
@@ -23,7 +49,7 @@ macro index,pager,attach,compose \cb "\
 "call urlview to extract URLs out of a message"
 
 # Show documentation when pressing F1
-macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+macro generic,pager <F1> "<shell-escape> zcat @docdir@/mutt/manual.txt.gz | sensible-pager<enter>" "show Mutt documentation"
 
 # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
 macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
@@ -35,7 +61,7 @@ bind browser y exit
 # append-hook \\.gz$ "gzip -c %t >> %f"
 
 # If Mutt is unable to determine your site's domain name correctly, you can
-# set the default here.
+# set the default here. (better: fix /etc/mailname)
 #
 # set hostname=cs.hmc.edu
 
@@ -101,6 +127,9 @@ attachments   +I text/plain
 attachments   -A message/external-body
 attachments   -I message/external-body
 
+# enable mime lookup by extension
+mime_lookup application/octet-stream
+
 ##
 ## More settings
 ##