Fix for mail sending