Tweaks to the MailMate application