diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index 55778d506..791f1904d 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -457,8 +457,20 @@ html:not(.rl-mobile):not(.rl-side-preview-pane) {
 }
 
 /* Thunderbird labels */
+/*
 .flag-\$label5 .checkboxMessage { background-color: #808; }
 .flag-\$label4 .checkboxMessage { background-color: #00F; }
 .flag-\$label3 .checkboxMessage { background-color: #080; }
 .flag-\$label2 .checkboxMessage { background-color: #FA0; }
 .flag-\$label1 .checkboxMessage { background-color: #F00; }
+*/
+.messageListItem.flag-\$label5.focused { background-color: rgba(255,   0, 255, 0.30); }
+.messageListItem.flag-\$label4.focused { background-color: rgba( 64,  64, 255, 0.30); }
+.messageListItem.flag-\$label3.focused { background-color: rgba(  0, 255,   0, 0.30); }
+.messageListItem.flag-\$label2.focused { background-color: rgba(255, 170,   0, 0.30); }
+.messageListItem.flag-\$label1.focused { background-color: rgba(255,   0,   0, 0.30); }
+.messageListItem.flag-\$label5:not(.focused) { color: #939; }
+.messageListItem.flag-\$label4:not(.focused) { color: #33F; }
+.messageListItem.flag-\$label3:not(.focused) { color: #090; }
+.messageListItem.flag-\$label2:not(.focused) { color: #F90; }
+.messageListItem.flag-\$label1:not(.focused) { color: #F00; }