Merge in changes from Google code 5.2.4 release
Code cleanup in SMTP class