#725 | +Anshul| Adding flag to enable/disable mailing