diff --git a/app/ui/legacy/src/main/res/layout/message_compose_attachment.xml b/app/ui/legacy/src/main/res/layout/message_compose_attachment.xml
index c33b686db..adae3522e 100644
--- a/app/ui/legacy/src/main/res/layout/message_compose_attachment.xml
+++ b/app/ui/legacy/src/main/res/layout/message_compose_attachment.xml
@@ -8,7 +8,6 @@
     android:layout_marginEnd="12dp"
     android:layout_marginBottom="12dp"
     android:orientation="vertical"
-    app:cardBackgroundColor="?attr/attachmentCardBackground"
     app:cardElevation="1dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/ui/legacy/src/main/res/layout/message_view_attachment.xml b/app/ui/legacy/src/main/res/layout/message_view_attachment.xml
index 270a2232a..52d09b52a 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_attachment.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_attachment.xml
@@ -17,7 +17,6 @@
         android:orientation="vertical"
         android:focusable="true"
         android:clickable="true"
-        app:cardBackgroundColor="?attr/attachmentCardBackground"
         app:cardElevation="1dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml b/app/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml
index 5605d7b56..0ba92be54 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml
@@ -15,7 +15,6 @@
         android:layout_marginEnd="12dp"
         android:layout_marginBottom="12dp"
         android:orientation="vertical"
-        app:cardBackgroundColor="?attr/attachmentCardBackground"
         app:cardElevation="1dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/ui/legacy/src/main/res/values/attrs.xml b/app/ui/legacy/src/main/res/values/attrs.xml
index 3b9a0c98f..6e3abc0e2 100644
--- a/app/ui/legacy/src/main/res/values/attrs.xml
+++ b/app/ui/legacy/src/main/res/values/attrs.xml
@@ -104,7 +104,6 @@
         <attr name="messageStarColor" format="color"/>
         <attr name="messageDetailsAddContactIcon" format="reference"/>
         <attr name="messageDetailsDividerColor" format="reference|color"/>
-        <attr name="attachmentCardBackground" format="reference|color"/>
         <attr name="composerBackgroundColor" format="color"/>
         <attr name="contactPictureFallbackDefaultBackgroundColor" format="reference|color"/>
         <attr name="contactPictureFallbackBackgroundColors" format="reference"/>
diff --git a/app/ui/legacy/src/main/res/values/themes.xml b/app/ui/legacy/src/main/res/values/themes.xml
index 054a1892e..bc1f65ab4 100644
--- a/app/ui/legacy/src/main/res/values/themes.xml
+++ b/app/ui/legacy/src/main/res/values/themes.xml
@@ -58,7 +58,8 @@
         <item name="colorErrorContainer">@color/k9_error_090</item>
         <item name="colorOnErrorContainer">@color/k9_error_010</item>
 
-        // Legacy styles
+        <!-- Legacy styles -->
+
         <item name="windowActionModeOverlay">true</item>
 
         <item name="messageHeaderBackground">@color/material_gray_200</item>
@@ -123,8 +124,10 @@
         <item name="iconSettingsExport">@drawable/ic_export</item>
         <item name="iconSettingsImport">@drawable/ic_import</item>
         <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
+
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
+
         <item name="messageListSelectedCheckMarkColor">?attr/colorSecondary</item>
         <item name="messageListSelectedBackgroundColor">?attr/colorSecondaryVariant</item>
         <item name="messageListSelectedBackgroundAlphaFraction">33%</item>
@@ -168,7 +171,6 @@
         <item name="messageStarColor">#fbbc04</item>
         <item name="messageDetailsAddContactIcon">@drawable/ic_person_add</item>
         <item name="messageDetailsDividerColor">#ffcccccc</item>
-        <item name="attachmentCardBackground">#e8e8e8</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
         <item name="contactPictureFallbackBackgroundColors">@array/contact_picture_fallback_background_colors_light</item>
         <item name="contactTokenBackgroundColor">#ccc</item>
@@ -259,8 +261,8 @@
         <item name="colorErrorContainer">@color/k9_error_030</item>
         <item name="colorOnErrorContainer">@color/k9_error_090</item>
 
+        <!-- Legacy styles -->
 
-        // Legacy styles
         <item name="windowActionModeOverlay">true</item>
 
         <item name="messageHeaderBackground">@color/material_gray_900</item>
@@ -326,6 +328,7 @@
         <item name="iconSettingsExport">@drawable/ic_export</item>
         <item name="iconSettingsImport">@drawable/ic_import</item>
         <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
+
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_dark</item>
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_dark</item>
         <item name="messageListSelectedCheckMarkColor">?attr/colorSecondary</item>
@@ -371,7 +374,6 @@
         <item name="messageStarColor">#fdd663</item>
         <item name="messageDetailsAddContactIcon">@drawable/ic_person_add</item>
         <item name="messageDetailsDividerColor">#ff555555</item>
-        <item name="attachmentCardBackground">#313131</item>
         <item name="contactTokenBackgroundColor">#313131</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ff606060</item>
         <item name="contactPictureFallbackBackgroundColors">@array/contact_picture_fallback_background_colors_dark</item>