Add new spam settings
Merge branch 'master' of https://github.com/E-F-A/v3