more fixes:
- fields of SMTP2