In Progress

email module fixes