diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js
index 4cc18aa0a..0c63445c8 100644
--- a/client/coral-admin/src/components/Comment.js
+++ b/client/coral-admin/src/components/Comment.js
@@ -7,35 +7,45 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../translations.json';
 import Linkify from 'react-linkify';
 
+const linkify = new Linkify()
+
 // Render a single comment for the list
-export default props => (
-  <li tabindex={props.index} className={`${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
-    <div className={styles.itemHeader}>
-      <div className={styles.author}>
-        <i className={`material-icons ${styles.avatar}`}>person</i>
-        <span>{props.comment.get('name') || lang.t('comment.anon')}</span>
-        <span className={styles.created}>{timeago().format(props.comment.get('createdAt') || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}</span>
-        {props.comment.get('flagged') ? <p className={styles.flagged}>{lang.t('comment.flagged')}</p> : null}
-      </div>
-      <div className={styles.actions}>
-        {props.actions.map(action => canShowAction(action, props.comment) ? (
-          <Button className={styles.actionButton}
-            onClick={() => props.onClickAction(props.actionsMap[action].status, props.comment.get('id'))}
-            fab colored>
-            <Icon name={props.actionsMap[action].icon} />
-          </Button>
-        ) : null)}
-      </div>
-    </div>
-    <div className={styles.itemBody}>
-      <span className={styles.body}>
-        <Linkify component='span' properties={{style: linkStyles}}>
-          {props.comment.get('body')}
-        </Linkify>
-      </span>
-    </div>
-  </li>
-);
+export default props => {
+  const links = linkify.getMatches(props.comment.get('body'))
+
+    return (
+      <li tabindex={props.index} className={`${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
+        <div className={styles.itemHeader}>
+          <div className={styles.author}>
+            <i className={`material-icons ${styles.avatar}`}>person</i>
+            <span>{props.comment.get('name') || lang.t('comment.anon')}</span>
+            <span className={styles.created}>{timeago().format(props.comment.get('createdAt') || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))}</span>
+            {props.comment.get('flagged') ? <p className={styles.flagged}>{lang.t('comment.flagged')}</p> : null}
+          </div>
+          <div>
+            {links ?
+            <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
+            <div className={styles.actions}>
+              {props.actions.map(action => canShowAction(action, props.comment) ? (
+                <Button className={styles.actionButton}
+                  onClick={() => props.onClickAction(props.actionsMap[action].status, props.comment.get('id'))}
+                  fab colored>
+                  <Icon name={props.actionsMap[action].icon} />
+                </Button>
+              ) : null)}
+            </div>
+          </div>
+        </div>
+        <div className={styles.itemBody}>
+          <span className={styles.body}>
+            <Linkify  component='span' properties={{style: linkStyles}}>
+              {props.comment.get('body')}
+            </Linkify>
+          </span>
+        </div>
+      </li>
+    )
+};
 
 // Check if an action can be performed over a comment
 const canShowAction = (action, comment) => {
diff --git a/client/coral-admin/src/components/CommentList.css b/client/coral-admin/src/components/CommentList.css
index f683ca36b..2c58c81cf 100644
--- a/client/coral-admin/src/components/CommentList.css
+++ b/client/coral-admin/src/components/CommentList.css
@@ -121,3 +121,15 @@
   }
 
 }
+
+
+.hasLinks {
+  color: #f00;
+  text-align: right;
+  display: flex;
+  align-items: center;
+
+  i {
+    margin-right: 5px;
+  }
+}