Continuing work on CM UI. See: websharks/comment-mail#25