Add messages mailer for feedback, clean up a bit