diff --git a/web/styles/message_row.css b/web/styles/message_row.css
index cc2fdfe37c..65436d46aa 100644
--- a/web/styles/message_row.css
+++ b/web/styles/message_row.css
@@ -279,12 +279,12 @@ $time_column_max_width: 150px;
     }
 
     /* Locally echoed messages. */
-    &.local .message_time {
+    &.locally-echoed .message_time {
         opacity: 0;
     }
 
     /* Show the spinner only for messages that are still locally echoed. */
-    &.local .slow-send-spinner {
+    &.locally-echoed .slow-send-spinner {
         display: unset !important;
     }
 }
diff --git a/web/templates/single_message.hbs b/web/templates/single_message.hbs
index ef4f1af18e..6b8ae63f69 100644
--- a/web/templates/single_message.hbs
+++ b/web/templates/single_message.hbs
@@ -1,5 +1,5 @@
 <div zid="{{msg/id}}" id="{{table_name}}{{msg/id}}"
-  class="message_row{{#unless msg/is_stream}} private-message{{/unless}}{{#include_sender}} include-sender{{/include_sender}}{{#if mention_classname}} {{mention_classname}}{{/if}}{{#msg.unread}} unread{{/msg.unread}} {{#if msg.locally_echoed}}local{{/if}} selectable_row"
+  class="message_row{{#unless msg/is_stream}} private-message{{/unless}}{{#include_sender}} include-sender{{/include_sender}}{{#if mention_classname}} {{mention_classname}}{{/if}}{{#msg.unread}} unread{{/msg.unread}} {{#if msg.locally_echoed}}locally-echoed{{/if}} selectable_row"
   role="listitem">
     <div class="unread_marker"><div class="unread-marker-fill"></div></div>
     {{#if want_date_divider}}