Add changes for mail templates