Email Sending fixes