Updated the matching function and mail handler servlet to have pretty emails and removed the <MATCH_DATE> at the bottom of emails