MailSo Fixes (remove xlist)