Additional changes for SMTP relay to work