Backport a fix for qmail from PHPMailer upstream.

props bpetty.
fixes #25014.

Built from https://develop.svn.wordpress.org/trunk@25682


git-svn-id: http://core.svn.wordpress.org/trunk@25598 1a063a9b-81f0-0310-95a4-ce76da25c4cd