Work on SMTP class #44