More email Module Updates