[RCD] Changes to SMTP handling