Adding extra email fanctionality