minor refactoring in SMTP