[upstream] patch mutt