Email and Document Tweak

Changed the email and documnet modules in preparation for server
deployment.