Backport a fix for qmail from PHPMailer upstream.

props bpetty.
fixes #25014.


git-svn-id: https://develop.svn.wordpress.org/trunk@25682 602fd350-edb4-49c9-b593-d223f7449a82