Manage emails and templates related changes