I fixed up the structure of the code, but made no major functionality changes. The email connection did not seem to work due to security reasons, so I removed it.