DEVIDM-126: Make sure the mail is added to mailLocalAddress.
Merge pull request #65 from iceglow/DEVIDM-126

DEVIDM-126: Make sure the mail is added to mailLocalAddress.
Merge pull request #66 from stockholmuniversity/1.2.x

Merge bugfix to master