1 files changed, 10 insertions, 1 deletions
diff --git a/webapp/components/at_mention/at_mention.jsx b/webapp/components/at_mention/at_mention.jsx
index 3e2c7bdbc..9bb2d2aad 100644
--- a/webapp/components/at_mention/at_mention.jsx
+++ b/webapp/components/at_mention/at_mention.jsx
@@ -11,9 +11,16 @@ import {OverlayTrigger} from 'react-bootstrap';
 export default class AtMention extends React.PureComponent {
     static propTypes = {
         mentionName: PropTypes.string.isRequired,
-        usersByUsername: PropTypes.object.isRequired
+        usersByUsername: PropTypes.object.isRequired,
+        isRHS: PropTypes.bool,
+        hasMention: PropTypes.bool
     };
 
+    static defaultProps = {
+        isRHS: false,
+        hasMention: false
+    }
+
     constructor(props) {
         super(props);
 
@@ -76,6 +83,8 @@ export default class AtMention extends React.PureComponent {
                             user={user}
                             src={Client4.getProfilePictureUrl(user.id, user.last_picture_update)}
                             hide={this.hideProfilePopover}
+                            isRHS={this.props.isRHS}
+                            hasMention={this.props.hasMention}
                         />
                     }
                 >