Fixed mailing for production