Client cleanup code added. Email newline solution added.