diff --git a/ts/components/conversation/AddNewLines.md b/ts/components/conversation/AddNewLines.md
deleted file mode 100644
index 14d2b35ec..000000000
--- a/ts/components/conversation/AddNewLines.md
+++ /dev/null
@@ -1,35 +0,0 @@
-### All newlines
-
-```jsx
-<AddNewLines text="\n\n\n" />
-```
-
-### Starting and ending with newlines
-
-```jsx
-<AddNewLines text="\nin between\n" />
-```
-
-### With newlines in the middle
-
-```jsx
-<AddNewLines text="Before \n\n after" />
-```
-
-### No newlines
-
-```jsx
-<AddNewLines text="This is the text" />
-```
-
-### Providing custom non-newline render function
-
-```jsx
-const renderNonNewLine = ({ text, key }) => (
-  <span key={key}>This is my custom content!</span>
-);
-<AddNewLines
-  text="\n first \n second \n"
-  renderNonNewLine={renderNonNewLine}
-/>;
-```
diff --git a/ts/components/conversation/AddNewLines.stories.tsx b/ts/components/conversation/AddNewLines.stories.tsx
new file mode 100644
index 000000000..94d050ee1
--- /dev/null
+++ b/ts/components/conversation/AddNewLines.stories.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react';
+
+import { text } from '@storybook/addon-knobs';
+import { storiesOf } from '@storybook/react';
+
+import { AddNewLines, Props } from './AddNewLines';
+
+const story = storiesOf('Components/Conversation/AddNewLines', module);
+const createProps = (overrideProps: Partial<Props> = {}): Props => ({
+  renderNonNewLine: overrideProps.renderNonNewLine,
+  text: text('text', overrideProps.text || ''),
+});
+
+story.add('All newlines', () => {
+  const props = createProps({
+    text: '\n\n\n',
+  });
+
+  return <AddNewLines {...props} />;
+});
+
+story.add('Starting/Ending with Newlines', () => {
+  const props = createProps({
+    text: '\nSome text\n',
+  });
+
+  return <AddNewLines {...props} />;
+});
+
+story.add('Newlines in the Middle', () => {
+  const props = createProps({
+    text: 'Some\ntext',
+  });
+
+  return <AddNewLines {...props} />;
+});
+
+story.add('No Newlines', () => {
+  const props = createProps({
+    text: 'Some text',
+  });
+
+  return <AddNewLines {...props} />;
+});
+
+story.add('Custom Render Function', () => {
+  const props = createProps({
+    text: 'Some text',
+    renderNonNewLine: ({ text: theText, key }) => (
+      <div key={key} style={{ color: 'aquamarine' }}>
+        {theText}
+      </div>
+    ),
+  });
+
+  return <AddNewLines {...props} />;
+});
diff --git a/ts/components/conversation/AddNewLines.tsx b/ts/components/conversation/AddNewLines.tsx
index 986a9a5b7..ca745b8fb 100644
--- a/ts/components/conversation/AddNewLines.tsx
+++ b/ts/components/conversation/AddNewLines.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { RenderTextCallbackType } from '../../types/Util';
 
-interface Props {
+export interface Props {
   text: string;
   /** Allows you to customize now non-newlines are rendered. Simplest is just a <span>. */
   renderNonNewLine?: RenderTextCallbackType;