Don't require mail.options to be set
Merge pull request #2137 from jgillich/patch-1

Don't require mail.options to be set