Added more tags for mail