Changed mail templates variables format