mailing fixed
Merge branch 'mailing' into ci_server