More mutt tinkering.