Several fixes/tweaks for mutt