Merge "mail: Refactor checks looking for PEAR libraries to be clearer"