Feature/17b

See: websharks/comment-mail#17