SMTP -> SMTP Relay

For clarity's sake
Merge pull request #581 from mbernier/patch-12

SMTP -> SMTP Relay