Added email functionality
Fixed merge conflicts