Make sure ActionMailer gets the SMTP settings right.
Merge pull request #439 from avalonmediasystem/bugfix/VOV-3245

Make sure ActionMailer gets the SMTP settings right.