Moved MessageComparator into PmMessage