[FIXED JENKINS-19345] isolate Mailer-dependent code