Some more mutt changes