Completed

email module fixes