Merge "Fix PHPCS warnings in /includes/mail/"