Added flag to turn off mail notification