diff --git a/js/models/conversations.js b/js/models/conversations.js
index 096806d37..d340ce79f 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -2524,7 +2524,7 @@
     getAvatar() {
       const url = this.getAvatarPath();
 
-      return url ? { url } :  { url: null };
+      return url ? { url } : { url: null };
     },
 
     getNotificationIcon() {
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 510910539..73143a2b0 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -1109,22 +1109,6 @@ export class Message extends React.PureComponent<Props, State> {
               `module-message--${direction}`,
               expiring ? 'module-message--expired' : null
             )}
-            role="button"
-            onClick={event => {
-              const selection = window.getSelection();
-              // Text is being selected
-              if (selection && selection.type === 'Range') {
-                return;
-              }
-
-              // User clicked on message body
-              const target = event.target as HTMLDivElement;
-              if (target.className === 'text-selectable') {
-                return;
-              }
-
-              this.props.onSelectMessage();
-            }}
           >
             {this.renderError(isIncoming)}
             {isRss || isKickedFromGroup
@@ -1138,6 +1122,22 @@ export class Message extends React.PureComponent<Props, State> {
               style={{
                 width: isShowingImage ? width : undefined,
               }}
+              role="button"
+              onClick={event => {
+                const selection = window.getSelection();
+                // Text is being selected
+                if (selection && selection.type === 'Range') {
+                  return;
+                }
+
+                // User clicked on message body
+                const target = event.target as HTMLDivElement;
+                if (target.className === 'text-selectable') {
+                  return;
+                }
+
+                this.props.onSelectMessage();
+              }}
             >
               {this.renderAuthor()}
               {this.renderQuote()}