o Reintegrate SMTP relay module. Closes #3375