backport changes from emailjs.org