Merge pull request #24208 from BKPepe/msmtp