Fixed Mailing settings overriding VCS settings