Implement changes from [Gerald Villemure's patch](https://sourceforge.net/p/phpmailer/patches/97/)