Updated mailcomment and mailhandler, though I don't think we're really using them.