diff --git a/components/post_view/message_attachments/message_attachment/__snapshots__/message_attachment.test.jsx.snap b/components/post_view/message_attachments/message_attachment/__snapshots__/message_attachment.test.jsx.snap
index a37ba79961da..46b104e52e8d 100644
--- a/components/post_view/message_attachments/message_attachment/__snapshots__/message_attachment.test.jsx.snap
+++ b/components/post_view/message_attachments/message_attachment/__snapshots__/message_attachment.test.jsx.snap
@@ -3,6 +3,7 @@
 exports[`components/post_view/MessageAttachment should call actions.doPostActionWithCookie on handleAction 1`] = `
 <div
   className="attachment attachment--pretext"
+  onClick={[Function]}
 >
   <div
     className="attachment__thumb-pretext"
@@ -55,7 +56,6 @@ exports[`components/post_view/MessageAttachment should call actions.doPostAction
       <div>
         <div
           className="attachment__body"
-          onClick={[Function]}
         >
           <Connect(ShowMore)
             checkOverflow={0}
@@ -147,6 +147,7 @@ exports[`components/post_view/MessageAttachment should call actions.doPostAction
 exports[`components/post_view/MessageAttachment should match snapshot 1`] = `
 <div
   className="attachment attachment--pretext"
+  onClick={[Function]}
 >
   <div
     className="attachment__thumb-pretext"
@@ -199,7 +200,6 @@ exports[`components/post_view/MessageAttachment should match snapshot 1`] = `
       <div>
         <div
           className="attachment__body"
-          onClick={[Function]}
         >
           <Connect(ShowMore)
             checkOverflow={0}
@@ -274,6 +274,7 @@ exports[`components/post_view/MessageAttachment should match snapshot 1`] = `
 exports[`components/post_view/MessageAttachment should match snapshot when no footer is provided (even if footer_icon is provided) 1`] = `
 <div
   className="attachment attachment--pretext"
+  onClick={[Function]}
 >
   <div
     className="attachment__thumb-pretext"
@@ -326,7 +327,6 @@ exports[`components/post_view/MessageAttachment should match snapshot when no fo
       <div>
         <div
           className="attachment__body"
-          onClick={[Function]}
         >
           <Connect(ShowMore)
             checkOverflow={0}
@@ -389,6 +389,7 @@ exports[`components/post_view/MessageAttachment should match snapshot when no fo
 exports[`components/post_view/MessageAttachment should match snapshot when the attachment has a link in the title 1`] = `
 <div
   className="attachment "
+  onClick={[Function]}
 >
   <div
     className="attachment__content"
@@ -415,7 +416,6 @@ exports[`components/post_view/MessageAttachment should match snapshot when the a
       <div>
         <div
           className="attachment__body attachment__body--no_thumb"
-          onClick={[Function]}
         />
         <div
           style={
@@ -433,6 +433,7 @@ exports[`components/post_view/MessageAttachment should match snapshot when the a
 exports[`components/post_view/MessageAttachment should match snapshot when the attachment has an emoji in the title 1`] = `
 <div
   className="attachment "
+  onClick={[Function]}
 >
   <div
     className="attachment__content"
@@ -459,7 +460,6 @@ exports[`components/post_view/MessageAttachment should match snapshot when the a
       <div>
         <div
           className="attachment__body attachment__body--no_thumb"
-          onClick={[Function]}
         />
         <div
           style={
@@ -477,6 +477,7 @@ exports[`components/post_view/MessageAttachment should match snapshot when the a
 exports[`components/post_view/MessageAttachment should match snapshot when the attachment hasn't any emojis in the title 1`] = `
 <div
   className="attachment "
+  onClick={[Function]}
 >
   <div
     className="attachment__content"
@@ -503,7 +504,6 @@ exports[`components/post_view/MessageAttachment should match snapshot when the a
       <div>
         <div
           className="attachment__body attachment__body--no_thumb"
-          onClick={[Function]}
         />
         <div
           style={
@@ -521,6 +521,7 @@ exports[`components/post_view/MessageAttachment should match snapshot when the a
 exports[`components/post_view/MessageAttachment should match snapshot when the footer is truncated 1`] = `
 <div
   className="attachment "
+  onClick={[Function]}
 >
   <div
     className="attachment__content"
@@ -547,7 +548,6 @@ exports[`components/post_view/MessageAttachment should match snapshot when the f
       <div>
         <div
           className="attachment__body attachment__body--no_thumb"
-          onClick={[Function]}
         >
           <div
             className="attachment__footer-container"
diff --git a/components/post_view/message_attachments/message_attachment/index.js b/components/post_view/message_attachments/message_attachment/index.js
index 04faa664bf52..95ed17dd5a15 100644
--- a/components/post_view/message_attachments/message_attachment/index.js
+++ b/components/post_view/message_attachments/message_attachment/index.js
@@ -11,7 +11,7 @@ import MessageAttachment from './message_attachment';
 
 function mapStateToProps(state) {
     return {
-        getCurrentRelativeTeamUrl: getCurrentRelativeTeamUrl(state),
+        currentRelativeTeamUrl: getCurrentRelativeTeamUrl(state),
     };
 }
 
diff --git a/components/post_view/message_attachments/message_attachment/message_attachment.jsx b/components/post_view/message_attachments/message_attachment/message_attachment.jsx
index 318404759659..2d0700ef5ccf 100644
--- a/components/post_view/message_attachments/message_attachment/message_attachment.jsx
+++ b/components/post_view/message_attachments/message_attachment/message_attachment.jsx
@@ -478,6 +478,7 @@ export default class MessageAttachment extends React.PureComponent {
             <div
                 className={'attachment ' + preTextClass}
                 ref='attachment'
+                onClick={this.handleFormattedTextClick}
             >
                 {preText}
                 <div className='attachment__content'>
@@ -490,7 +491,6 @@ export default class MessageAttachment extends React.PureComponent {
                         <div>
                             <div
                                 className={thumb ? 'attachment__body' : 'attachment__body attachment__body--no_thumb'}
-                                onClick={this.handleFormattedTextClick}
                             >
                                 {attachmentText}
                                 {image}