diff --git a/web/chat/chat-thread-list.css b/web/chat/chat-thread-list.css
index c645a7e6e..84c7c321c 100644
--- a/web/chat/chat-thread-list.css
+++ b/web/chat/chat-thread-list.css
@@ -1,310 +1,314 @@
 div.thread {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
   padding-top: 4px;
   padding-bottom: 4px;
   padding-right: 10px;
 }
 div.threadListSidebar {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
   padding-bottom: 4px;
   padding-left: 16px;
   padding-right: 10px;
   position: relative;
 }
 div.threadListSidebar > svg {
   position: absolute;
   top: -13px;
   left: 30px;
 }
 div.thread:first-child {
   padding-top: 6px;
 }
 div.activeThread,
 div.threadListSidebar:hover {
   background: var(--thread-active-bg);
 }
 
 div.activeThread :is(div.dark, .lastMessage span.light, .title) {
   color: var(--fg);
 }
 
+div.activeThread .lastMessage.light {
+  color: var(--fg);
+}
+
 div.activeThread.thread:hover {
   background: var(--thread-active-bg);
 }
 div.thread:hover {
   background: var(--thread-hover-bg);
 }
 div.title {
   flex: 1;
   font-size: var(--m-font-16);
   font-weight: var(--semi-bold);
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   color: var(--thread-color-read);
   line-height: var(--line-height-text);
 }
 a.threadButton {
   flex: 1;
   cursor: pointer;
   overflow: hidden;
   padding-left: 8px;
 }
 .threadButtonSidebar {
   flex: 1;
   cursor: pointer;
   overflow: hidden;
   padding-left: 8px;
 }
 p.breadCrumbs {
   display: flex;
   font-size: var(--xs-font-12);
   font-weight: var(--normal);
   color: var(--breadcrumb-color);
 }
 p.breadCrumbs.unread {
   color: var(--breadcrumb-color-unread);
 }
 span.breadCrumb {
   display: flex;
   align-items: center;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
 
 div.colorContainer {
   display: flex;
 }
 
 div.spacer,
 div.colorSplotch {
   height: 42px;
   width: 42px;
   border-radius: 1.68px;
 }
 div.lastActivity {
   font-size: var(--xxs-font-10);
   color: var(--fg);
   line-height: 1.5;
   font-weight: var(--semi-bold);
   white-space: nowrap;
 }
 
 div.lastMessage {
   font-size: 16px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   flex: 1;
 }
 div.threadRow > .lastMessage {
   color: var(--thread-last-message-color-read);
   font-size: var(--s-font-14);
 }
 div.unread {
   color: var(--fg);
   font-weight: var(--semi-bold);
 }
-div.lastMessage.black {
+div.lastMessage.white {
   color: var(--fg);
 }
 div.dark {
   color: var(--thread-color-read);
 }
 .light {
   color: var(--thread-from-color-read);
 }
 div.dotContainer {
   display: flex;
   align-items: center;
   justify-content: center;
   width: 16px;
 }
 div.unreadDot {
   height: 4px;
   width: 4px;
   background: var(--fg);
   border-radius: 15px;
   align-self: center;
 }
 div.italic {
   font-style: italic;
 }
 div.sidebarTitle {
   flex: 1;
   font-size: 15px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   color: var(--thread-color-read);
   align-self: flex-start;
 }
 div.sidebarTitle.unread {
   color: var(--fg);
 }
 div.sidebarLastActivity {
   white-space: nowrap;
   font-size: var(--xxs-font-10);
   line-height: var(--line-height-text);
   font-weight: var(--semi-bold);
 }
 svg.sidebarIcon {
   color: var(--thread-color-read);
   padding: 0 6px;
   font-size: 20px;
 }
 div.sidebar .menu > button svg {
   font-size: 16px;
   color: var(--thread-color-read);
 }
 div.sidebar .menu {
   opacity: 0;
 }
 div.sidebar:hover .menu {
   display: flex;
   align-self: flex-end;
   opacity: 1;
 }
 .menu {
   position: relative;
   display: flex;
   justify-content: flex-end;
 }
 .menu > button {
   background-color: transparent;
   color: var(--thread-color-read);
   border: none;
   cursor: pointer;
   display: flex;
   align-items: center;
 }
 
 .menu > button:focus {
   outline: none;
 }
 
 .menuContent {
   display: none;
   position: absolute;
   top: calc(100% + 1px);
   right: 0;
   z-index: 1;
   width: max-content;
   overflow: hidden;
   background-color: #eeeeee;
   border-radius: 5px;
   box-shadow: 1px 1px 5px 2px #00000022;
 }
 .menuContentVisible {
   display: block;
 }
 
 button.menuContent {
   border: none;
   cursor: pointer;
   padding: 10px;
   font-size: 16px;
 }
 button.menuContent:hover {
   background-color: #dddddd;
 }
 
 ul.list {
   margin: 5px 3px 10px 0px;
   overflow: auto;
 }
 
 div.search {
   display: flex;
   background-color: #dddddd;
   border-radius: 5px;
   padding: 3px 5px;
   align-items: center;
 }
 svg.searchVector {
   fill: #aaaaaa;
   height: 22px;
   width: 22px;
   padding: 0 3px;
   margin-left: 8px;
 }
 div.search > input {
   color: black;
   padding: 0;
   border: none;
   background-color: #dddddd;
   font-weight: 600;
   font-size: 15px;
   flex-grow: 1;
   margin-left: 3px;
 }
 div.search > input:focus {
   outline: none;
 }
 svg.clearQuery {
   font-size: 15px;
   padding-bottom: 1px;
   padding-right: 2px;
   color: #aaaaaa;
 }
 svg.clearQuery:hover {
   font-size: 15px;
   padding-bottom: 1px;
   padding-right: 2px;
   color: white;
 }
 
 div.spacer {
   height: 6px;
 }
 
 div.emptyItem {
   padding: 10px;
   font-size: 16px;
   text-align: center;
   white-space: pre-wrap;
   color: var(--fg);
 }
 
 div.threadListContainer {
   display: flex;
   flex-direction: column;
 }
 
 div.searchContainer {
   background-color: var(--text-input-bg);
   display: flex;
   align-items: center;
   margin: 1rem;
 }
 
 input.searchInput {
   background-color: var(--text-input-bg);
   font-size: var(--s-font-14);
   padding: 1rem;
   flex: 1;
   border: none;
   color: var(--text-input-color);
   outline: none;
 }
 
 input.searchInput::placeholder {
   color: var(--text-input-placeholder);
 }
 
 button.clearSearch {
   color: var(--text-input-color);
   transition: ease-in-out 0.15s;
   border: none;
   padding: 0 1rem;
   font-size: var(--m-font-16);
   background: none;
 }
 
 button.clearSearchDisabled {
   opacity: 0;
 }
diff --git a/web/chat/message-preview.react.js b/web/chat/message-preview.react.js
index bae4d76a4..5b732d25a 100644
--- a/web/chat/message-preview.react.js
+++ b/web/chat/message-preview.react.js
@@ -1,71 +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 {
   if (!props.messageInfo) {
     return (
       <div className={classNames(css.lastMessage, css.dark, css.italic)}>
         No messages
       </div>
     );
   }
   const messageInfo: ComposableMessageInfo | RobotextMessageInfo =
     props.messageInfo.type === messageTypes.SIDEBAR_SOURCE
       ? props.messageInfo.sourceMessage
       : props.messageInfo;
   const unread = props.threadInfo.currentUser.unread;
   const messageTitle = getMessageTitle(
     messageInfo,
     props.threadInfo,
     getDefaultTextMessageRules().simpleMarkdownRules,
   );
   if (messageInfo.type === messageTypes.TEXT) {
     let usernameText = null;
     if (
       threadIsGroupChat(props.threadInfo) ||
       props.threadInfo.name !== '' ||
       messageInfo.creator.isViewer
     ) {
       const userString = stringForUser(messageInfo.creator);
       const username = `${userString}: `;
-      const usernameStyle = unread ? css.black : css.light;
+      const usernameStyle = unread ? css.white : css.light;
       usernameText = <span className={usernameStyle}>{username}</span>;
     }
-    const colorStyle = unread ? css.black : css.dark;
+    const colorStyle = unread ? css.white : css.light;
     return (
       <div className={classNames(css.lastMessage, colorStyle)}>
         {usernameText}
         {messageTitle}
       </div>
     );
   } else {
-    const colorStyle = unread ? css.black : css.light;
+    const colorStyle = unread ? css.white : css.light;
     return (
       <div className={classNames([css.lastMessage, colorStyle])}>
         {messageTitle}
       </div>
     );
   }
 }
 
 export default MessagePreview;