more mutt modifications