Probably fixes bugs with sending email on most computers

There was an issue where emails failed to send on some computers. These changes allowed emails to send on those computers.

Authors: nfbrown, dcwethern