diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
index 8557259efb4351f92d0636ad7cc5eaec7a4b1da2..c56149f6c50a2462446148936fd1c87fd391fcab 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
@@ -124,9 +124,9 @@ class MessageListAdapter internal constructor(
         appearance.fontSizes.setViewTextSize(holder.preview, appearance.fontSizes.messageListPreview)
         appearance.fontSizes.setViewTextSize(holder.threadCount, appearance.fontSizes.messageListSubject) // thread count is next to subject
 
-        holder.flagged.isVisible = appearance.stars
+        holder.flagged.isVisible = false
         holder.flagged.tag = holder
-        holder.flagged.setOnClickListener(flagClickListener)
+        holder.flagged.setOnClickListener(null)
 
         view.tag = holder
 
@@ -167,7 +167,9 @@ class MessageListAdapter internal constructor(
             }
 
             if (appearance.stars) {
-                holder.flagged.isChecked = isStarred
+                holder.flagged.isVisible = isStarred
+            } else {
+                holder.flagged.isVisible = false
             }
             holder.position = position
             if (appearance.showContactPicture && holder.contactPicture.isVisible) {
diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/app/ui/legacy/src/main/res/layout/message_list_item.xml
index 76435e58c652a535737b7dabc3545b08ad536e9c..fabbacbb8db29246a422a057f95f09c13a203850 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_item.xml
@@ -147,14 +147,15 @@
 
             <CheckBox
                 android:id="@+id/star"
-                style="@style/MessageStarStyle"
-                android:buttonTint="@color/star_color"
+                android:button="@drawable/ic_star"
+                android:buttonTint="@lineageos.platform:color/color_default_orange1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
                 android:layout_marginEnd="8dp"
                 android:focusable="false"
+                android:enabled="false"
                 android:visibility="visible"
                 android:gravity="center_vertical"
                 tools:text="&#x200B;"/>