diff --git a/web/chat/message-preview.react.js b/web/chat/message-preview.react.js
index eab9c22ab..e04728c72 100644
--- a/web/chat/message-preview.react.js
+++ b/web/chat/message-preview.react.js
@@ -1,77 +1,71 @@
 // @flow
 
 import classNames from 'classnames';
 import * as React from 'react';
 
 import { getMessageTitle } from 'lib/shared/message-utils';
 import { threadIsGroupChat } from 'lib/shared/thread-utils';
 import { stringForUser } from 'lib/shared/user-utils';
 import {
   type MessageInfo,
   messageTypes,
   type ComposableMessageInfo,
   type RobotextMessageInfo,
 } from 'lib/types/message-types';
 import { type ThreadInfo } from 'lib/types/thread-types';
 
 import { getDefaultTextMessageRules } from '../markdown/rules.react';
 import css from './chat-thread-list.css';
 
 type Props = {
   +messageInfo: ?MessageInfo,
   +threadInfo: ThreadInfo,
 };
 function MessagePreview(props: Props): React.Node {
   const {
     messageInfo: originalMessageInfo,
     threadInfo,
     threadInfo: {
       currentUser: { unread },
     },
   } = props;
 
   const colorStyle = unread ? css.unread : css.read;
   if (!originalMessageInfo) {
     return (
       <div className={classNames(css.lastMessage, css.dark, css.italic)}>
         No messages
       </div>
     );
   }
   const messageInfo: ComposableMessageInfo | RobotextMessageInfo =
     originalMessageInfo.type === messageTypes.SIDEBAR_SOURCE
       ? originalMessageInfo.sourceMessage
       : originalMessageInfo;
 
   const messageTitle = getMessageTitle(
     messageInfo,
     threadInfo,
     getDefaultTextMessageRules().simpleMarkdownRules,
   );
-  if (messageInfo.type === messageTypes.TEXT) {
-    let usernameText = null;
-    if (
-      threadIsGroupChat(threadInfo) ||
+
+  let usernameText = null;
+  if (
+    messageInfo.type === messageTypes.TEXT &&
+    (threadIsGroupChat(threadInfo) ||
       threadInfo.name !== '' ||
-      messageInfo.creator.isViewer
-    ) {
-      const userString = stringForUser(messageInfo.creator);
-      const username = `${userString}: `;
-      usernameText = <span className={colorStyle}>{username}</span>;
-    }
-    return (
-      <div className={classNames(css.lastMessage, colorStyle)}>
-        {usernameText}
-        {messageTitle}
-      </div>
-    );
-  } else {
-    return (
-      <div className={classNames(css.lastMessage, colorStyle)}>
-        {messageTitle}
-      </div>
-    );
+      messageInfo.creator.isViewer)
+  ) {
+    const userString = stringForUser(messageInfo.creator);
+    usernameText = <span className={colorStyle}>{`${userString}: `}</span>;
   }
+
+  return (
+    <div className={classNames(css.lastMessage, colorStyle)}>
+      {usernameText}
+      {messageTitle}
+    </div>
+  );
 }
 
 export default MessagePreview;