stmp configuration clean up and email template modified