diff --git a/pkg/interface/src/views/apps/links/components/comment-item.js b/pkg/interface/src/views/apps/links/components/comment-item.js
index 1f37e045ba..56a48acf7d 100644
--- a/pkg/interface/src/views/apps/links/components/comment-item.js
+++ b/pkg/interface/src/views/apps/links/components/comment-item.js
@@ -4,9 +4,10 @@ import { cite } from '~/logic/lib/util';
 import moment from 'moment';
 import { Box, Text, Row } from '@tlon/indigo-react';
 import RichText from '~/views/components/RichText';
+import { MentionText } from "~/views/components/MentionText";
 
 export const CommentItem = (props) => {
-  const content = props.post.contents[0].text;
+  const content = props.post.contents;
   const timeSent = 
     moment.unix(props.post['time-sent'] / 1000).format('hh:mm a');
 
@@ -33,10 +34,12 @@ export const CommentItem = (props) => {
         </Row>
       </Row>
       <Row>
-        <Text display="block" py={3} fontSize={1}>
-          <RichText remoteContentPolicy={props.remoteContentPolicy}>
-            {content}
-          </RichText>
+        <Text py={3} fontSize={1}>
+          <MentionText
+            remoteContentPolicy={props.remoteContentPolicy}
+            contacts={props.contacts}
+            content={content} 
+          />
         </Text>
       </Row>
     </Box>
diff --git a/pkg/interface/src/views/apps/links/components/comment-submit.js b/pkg/interface/src/views/apps/links/components/comment-submit.js
index baff2d4a8c..65e26ea387 100644
--- a/pkg/interface/src/views/apps/links/components/comment-submit.js
+++ b/pkg/interface/src/views/apps/links/components/comment-submit.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { Spinner } from '~/views/components/Spinner';
 import { createPost } from '~/logic/api/graph';
 import { deSig } from "~/logic/lib/util";
+import { scanForMentions } from "~/logic/lib/graph";
 
 
 export class CommentSubmit extends Component {
@@ -17,9 +18,8 @@ export class CommentSubmit extends Component {
 
   onClickPost() {
     const parentIndex = this.props.parentIndex || '';
-    let post = createPost([
-      { text: this.state.comment },
-    ], parentIndex);
+    const content = scanForMentions(this.state.comment);
+    let post = createPost(content, parentIndex);
 
     this.setState({ disabled: true }, () => {
       this.props.api.graph.addPost(
diff --git a/pkg/interface/src/views/apps/links/components/comments.js b/pkg/interface/src/views/apps/links/components/comments.js
index ab1858a70c..c8c56aeabe 100644
--- a/pkg/interface/src/views/apps/links/components/comments.js
+++ b/pkg/interface/src/views/apps/links/components/comments.js
@@ -23,6 +23,7 @@ export const Comments = (props) => {
           return (
             <CommentItem
               key={comment.post.index}
+              contacts={contacts}
               post={comment.post}
               nickname={nickname}
               hasNickname={Boolean(nickname)}