diff --git a/client/coral-embed-stream/src/components/CommentContent.js b/client/coral-embed-stream/src/components/CommentContent.js
new file mode 100644
index 000000000..4d56ec0d5
--- /dev/null
+++ b/client/coral-embed-stream/src/components/CommentContent.js
@@ -0,0 +1,19 @@
+import React from 'react';
+
+const CommentContent = ({comment}) => {
+  const textbreaks = comment.body.split('\n');
+  return <div className={`${name}-text`}>
+    {
+      textbreaks.map((line, i) => {
+        return (
+          <span key={i} className={`${name}-line`}>
+            {line}
+            <br className={`${name}-linebreak`}/>
+          </span>
+        );
+      })
+    }
+  </div>;
+};
+
+export default CommentContent;
diff --git a/client/coral-plugin-history/Comment.js b/client/coral-plugin-history/Comment.js
index d85b7fb1c..888989737 100644
--- a/client/coral-plugin-history/Comment.js
+++ b/client/coral-plugin-history/Comment.js
@@ -3,6 +3,7 @@ import {Icon} from '../coral-ui';
 import styles from './Comment.css';
 import Slot from 'coral-framework/components/Slot';
 import PubDate from '../coral-plugin-pubdate/PubDate';
+import CommentContent from '../coral-embed-stream/src/components/CommentContent';
 
 import t from 'coral-framework/services/i18n';
 
@@ -12,6 +13,7 @@ const Comment = (props) => {
       <div>
         <Slot
           fill="commentContent"
+          defaultComponent={CommentContent}
           className={`${styles.commentBody} myCommentBody`}
           comment={props.comment}
         />
diff --git a/plugin-api/beta/client/components/ui/index.js b/plugin-api/beta/client/components/ui/index.js
new file mode 100644
index 000000000..06ba38393
--- /dev/null
+++ b/plugin-api/beta/client/components/ui/index.js
@@ -0,0 +1 @@
+export * from 'coral-ui';
diff --git a/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js b/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
index 4fdf2a7f3..2dc70e57a 100644
--- a/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
+++ b/plugins/coral-plugin-auth/client/components/CreateUsernameDialog.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import styles from './styles.css';
-import {Dialog, Alert, TextField} from 'coral-ui';
+import {Dialog, Alert, TextField} from 'plugin-api/beta/client/components/ui';
 import {FakeComment} from './FakeComment';
-import Button from 'coral-ui/components/Button';
+import {Button} from 'plugin-api/beta/client/components/ui';
 import t from 'coral-framework/services/i18n';
 
 const CreateUsernameDialog = ({
diff --git a/plugins/coral-plugin-auth/client/components/ForgotContent.js b/plugins/coral-plugin-auth/client/components/ForgotContent.js
index c0e4205a9..2e31d87e2 100644
--- a/plugins/coral-plugin-auth/client/components/ForgotContent.js
+++ b/plugins/coral-plugin-auth/client/components/ForgotContent.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import styles from './styles.css';
-import Button from 'coral-ui/components/Button';
+import {Button} from 'plugin-api/beta/client/components/ui';
 import t from 'coral-framework/services/i18n';
 
 class ForgotContent extends React.Component {
diff --git a/plugins/coral-plugin-auth/client/components/SignDialog.js b/plugins/coral-plugin-auth/client/components/SignDialog.js
index 7f05889a0..542f53f98 100644
--- a/plugins/coral-plugin-auth/client/components/SignDialog.js
+++ b/plugins/coral-plugin-auth/client/components/SignDialog.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Dialog} from 'coral-ui';
+import {Dialog} from 'plugin-api/beta/client/components/ui';
 import styles from './styles.css';
 
 import SignInContent from './SignInContent';
diff --git a/plugins/coral-plugin-auth/client/components/SignInButton.js b/plugins/coral-plugin-auth/client/components/SignInButton.js
index 1789a6496..944796e88 100644
--- a/plugins/coral-plugin-auth/client/components/SignInButton.js
+++ b/plugins/coral-plugin-auth/client/components/SignInButton.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {Button} from 'coral-ui';
+import {Button} from 'plugin-api/beta/client/components/ui';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {showSignInDialog} from 'coral-framework/actions/auth';
diff --git a/plugins/coral-plugin-auth/client/components/SignInContent.js b/plugins/coral-plugin-auth/client/components/SignInContent.js
index dd130d8db..c92000232 100644
--- a/plugins/coral-plugin-auth/client/components/SignInContent.js
+++ b/plugins/coral-plugin-auth/client/components/SignInContent.js
@@ -1,5 +1,5 @@
 import React, {PropTypes} from 'react';
-import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
+import {Button, TextField, Spinner, Success, Alert} from 'plugin-api/beta/client/components/ui';
 import styles from './styles.css';
 import t from 'coral-framework/services/i18n';
 
diff --git a/plugins/coral-plugin-auth/client/components/SignUpContent.js b/plugins/coral-plugin-auth/client/components/SignUpContent.js
index 314e97ec7..ff90a7fd8 100644
--- a/plugins/coral-plugin-auth/client/components/SignUpContent.js
+++ b/plugins/coral-plugin-auth/client/components/SignUpContent.js
@@ -1,6 +1,6 @@
 import styles from './styles.css';
 import React from 'react';
-import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
+import {Button, TextField, Spinner, Success, Alert} from 'plugin-api/beta/client/components/ui';
 import t from 'coral-framework/services/i18n';
 
 class SignUpContent extends React.Component {
diff --git a/plugins/coral-plugin-mod/client/components/Container.js b/plugins/coral-plugin-mod/client/components/Container.js
index 25ce77a36..9ba88bdde 100644
--- a/plugins/coral-plugin-mod/client/components/Container.js
+++ b/plugins/coral-plugin-mod/client/components/Container.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Box from './Box';
-import {Button} from 'coral-ui';
+import {Button} from 'plugin-api/beta/client/components/ui';
 import styles from './styles.css';
 
 export default class Footer extends React.Component {