Fixed and Added Email Capabilities