Adjusted to explicitly set mail to and from