diff --git a/plugins/talk-plugin-rte/client/components/CommentContent.js b/plugins/talk-plugin-rte/client/components/CommentContent.js
new file mode 100644
index 000000000..28a7d67fe
--- /dev/null
+++ b/plugins/talk-plugin-rte/client/components/CommentContent.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import { name } from '../../package.json';
+
+const CommentContent = ({ comment }) => {
+  return comment.htmlBody ? (
+    <div
+      className={`${name}-text`}
+      dangerouslySetInnerHTML={{ __html: comment.htmlBody }}
+    />
+  ) : (
+    <div className={`${name}-text`}>{comment.body}</div>
+  );
+};
+
+export default CommentContent;
diff --git a/plugins/talk-plugin-rte/client/containers/CommentContent.js b/plugins/talk-plugin-rte/client/containers/CommentContent.js
new file mode 100644
index 000000000..495195dc1
--- /dev/null
+++ b/plugins/talk-plugin-rte/client/containers/CommentContent.js
@@ -0,0 +1,11 @@
+import { gql } from 'react-apollo';
+import { withFragments } from 'plugin-api/beta/client/hocs';
+import CommentContent from '../components/CommentContent';
+
+export default withFragments({
+  comment: gql`
+    fragment TalkPluginRTECommentContent_comment on Comment {
+      htmlBody
+    }
+  `,
+})(CommentContent);
diff --git a/plugins/talk-plugin-rte/client/index.js b/plugins/talk-plugin-rte/client/index.js
index dc7f35803..2ff483d4c 100644
--- a/plugins/talk-plugin-rte/client/index.js
+++ b/plugins/talk-plugin-rte/client/index.js
@@ -1,7 +1,9 @@
 import Editor from './components/Editor';
+import CommentContent from './containers/CommentContent';
 
 export default {
   slots: {
     textArea: [Editor],
+    commentContent: [CommentContent],
   },
 };