diff --git a/internal_packages/thread-list/lib/thread-list-columns.cjsx b/internal_packages/thread-list/lib/thread-list-columns.cjsx
index b9c8ec2c7..85547e16a 100644
--- a/internal_packages/thread-list/lib/thread-list-columns.cjsx
+++ b/internal_packages/thread-list/lib/thread-list-columns.cjsx
@@ -26,6 +26,15 @@ TimestampComponentForPerspective = (thread) ->
 subject = (subj) ->
   if (subj ? "").trim().length is 0
     return <span className="no-subject">(No Subject)</span>
+  else if subj.split(/([\uD800-\uDBFF][\uDC00-\uDFFF])/g).length > 1
+    subjComponents = []
+    subjParts = subj.split /([\uD800-\uDBFF][\uDC00-\uDFFF])/g
+    for part in subjParts
+      if part.match /([\uD800-\uDBFF][\uDC00-\uDFFF])/g
+        subjComponents.push <span className="emoji">{part}</span>
+      else
+        subjComponents.push <span>{part}</span>
+    return subjComponents
   else
     return subj
 
diff --git a/internal_packages/thread-list/stylesheets/thread-list.less b/internal_packages/thread-list/stylesheets/thread-list.less
index cca6ecd17..305858576 100644
--- a/internal_packages/thread-list/stylesheets/thread-list.less
+++ b/internal_packages/thread-list/stylesheets/thread-list.less
@@ -227,6 +227,9 @@
     // is noticeable.
     .subject {
       font-weight: @font-weight-semi-bold;
+      .emoji {
+        font-weight: @font-weight-normal;
+      }
     }
     .participants {
       .unread-true {