Attempt to fix client side mailing.