diff --git a/res/layout/attachment_chooser_activity.xml b/res/layout/attachment_chooser_activity.xml
index 850716e..49f8b0d 100644
--- a/res/layout/attachment_chooser_activity.xml
+++ b/res/layout/attachment_chooser_activity.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2015 The Android Open Source Project
+    Copyright (C) 2025 The LineageOS Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,9 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<fragment
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.messaging.ui.attachmentchooser.AttachmentChooserFragment"
+    android:name="com.android.messaging.ui.attachmentchooser.AttachmentChooserFragment"
     android:id="@+id/attachment_chooser_fragment"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
+    android:layout_height="match_parent" />
diff --git a/res/layout/blocked_participants_activity.xml b/res/layout/blocked_participants_activity.xml
index e39d92a..770078e 100644
--- a/res/layout/blocked_participants_activity.xml
+++ b/res/layout/blocked_participants_activity.xml
@@ -15,10 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<fragment
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.messaging.ui.BlockedParticipantsFragment"
+    android:name="com.android.messaging.ui.BlockedParticipantsFragment"
     android:id="@+id/blocked_participants_fragment"
     android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
     android:layout_width="fill_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
+    android:layout_height="match_parent" />
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index 0b47e71..4c494e2 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -15,10 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<fragment
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.messaging.ui.conversationlist.ConversationListFragment"
+    android:name="com.android.messaging.ui.conversationlist.ConversationListFragment"
     android:id="@+id/conversation_list_fragment"
     android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
+    android:layout_height="match_parent" />
diff --git a/res/layout/people_and_options_activity.xml b/res/layout/people_and_options_activity.xml
index 0296b86..e17df23 100644
--- a/res/layout/people_and_options_activity.xml
+++ b/res/layout/people_and_options_activity.xml
@@ -15,10 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<fragment
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.messaging.ui.conversationsettings.PeopleAndOptionsFragment"
+    android:name="com.android.messaging.ui.conversationsettings.PeopleAndOptionsFragment"
     android:id="@+id/people_and_options_fragment"
     android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
+    android:layout_height="match_parent" />
diff --git a/res/layout/vcard_detail_activity.xml b/res/layout/vcard_detail_activity.xml
index de45a9d..2bcfde0 100644
--- a/res/layout/vcard_detail_activity.xml
+++ b/res/layout/vcard_detail_activity.xml
@@ -15,10 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<fragment
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.messaging.ui.VCardDetailFragment"
+    android:name="com.android.messaging.ui.VCardDetailFragment"
     android:id="@+id/vcard_detail_fragment"
     android:theme="@style/Theme.MaterialComponents.Light.DarkActionBar"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
+    android:layout_height="match_parent" />