Reorganize the SMTP client