Several enhancements. See: websharks/comment-mail#26