SIO-1322 Hostname exceptions when trying to send an e-mail with default STMP configuration

Change-Id: I698c7af2fbd62ce024d9a13a99a1a0152c49ad67
Merge "SIO-1322 Hostname exceptions when trying to send an e-mail with default STMP configuration"