Merge "Revert "Fix SMTP configuration""