Email template change

filter from name and email