Finalize mass mailing safety features
Merge branch 'mailing-list-safety-features' into staging2