diff --git a/client/res/templates/email/fields/subject/list-link.tpl b/client/res/templates/email/fields/subject/list-link.tpl
index a4a1da126e..df2c573b3d 100644
--- a/client/res/templates/email/fields/subject/list-link.tpl
+++ b/client/res/templates/email/fields/subject/list-link.tpl
@@ -3,7 +3,10 @@
     <span class="fas fa-paperclip small text-muted" title="{{translate 'hasAttachment' category='fields' scope='Email'}}"></span>
 </span>
 {{/if}}
-{{#unless isRead}}<strong>{{/unless}}
-<a href="#{{scope}}/view/{{model.id}}" class="link{{#if isImportant}} text-warning{{/if}}{{#if inTrash}} text-muted{{/if}}" data-id="{{model.id}}" title="{{value}}">{{value}}</a>
-{{#unless isRead}}</strong>{{/unless}}
+<a
+    href="#{{scope}}/view/{{model.id}}"
+    class="link{{#if isImportant}} text-warning{{/if}}{{#if inTrash}} text-muted{{/if}}{{#unless isRead}} text-bold{{/unless}}"
+    data-id="{{model.id}}"
+    title="{{value}}"
+>{{value}}</a>
 
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index be33517ec9..120ce6166e 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -2607,13 +2607,17 @@ table.table td.cell .html-container {
     padding: 2px 0;
 }
 
-.list-group-side li.selected a.side-link,
-.list-group-side li.selected a:hover.side-link,
-.list-group-side li.selected a:active.side-link,
-.list-group-side li.selected a:visited.side-link,
-.list-group-side li.selected a:focus.side-link {
-    color: @brand-danger;
-    font-weight: 600;
+.list-group-side li.selected {
+    a {
+        &.side-link,
+        &:hover.side-link,
+        &:active.side-link,
+        &:visited.side-link,
+        &:focus.side-link {
+            color: var(--brand-danger);
+            font-weight: 600;
+        }
+    }
 }
 
 .email-address-create-dropdown .btn {
diff --git a/frontend/less/glass/custom.less b/frontend/less/glass/custom.less
index b6d5cfcbe1..97c95d1c40 100644
--- a/frontend/less/glass/custom.less
+++ b/frontend/less/glass/custom.less
@@ -261,3 +261,22 @@ select.form-control > option {
         background-color: transparent;
     }
 }
+
+.list-group-side li.selected {
+    a {
+        &.side-link,
+        &:hover.side-link,
+        &:active.side-link,
+        &:visited.side-link,
+        &:focus.side-link {
+            color: var(--state-danger-text);
+            font-weight: 600;
+        }
+    }
+}
+
+.table {
+    .text-bold {
+        font-weight: 700;
+    }
+}