Simplify the way that client data is sent in the SMTP class, remove some duplicate code, improve debug output