Request to merge email branch

Why is this all commented out?