diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.java
index 61fd87fb671..eaf791f6d18 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.java
@@ -1,5 +1,6 @@
 package com.fsck.k9.activity;
 
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -11,14 +12,14 @@
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
-import android.widget.TextView;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.BaseAccount;
 import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
-import com.fsck.k9.ui.R;
 import com.fsck.k9.search.SearchAccount;
+import com.fsck.k9.ui.R;
+import com.google.android.material.textview.MaterialTextView;
 
 
 /**
@@ -138,8 +139,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
         }
 
         class AccountViewHolder {
-            public TextView description;
-            public TextView email;
+            public MaterialTextView description;
+            public MaterialTextView email;
             public View chip;
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java
index 46c4bf04046..23f36904eea 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/AlternateRecipientAdapter.java
@@ -8,8 +8,6 @@
 import android.graphics.PorterDuff.Mode;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.AttrRes;
-import androidx.annotation.DrawableRes;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,14 +15,16 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
-import android.widget.TextView;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.appcompat.widget.TooltipCompat;
 import com.fsck.k9.activity.compose.RecipientAdapter;
 import com.fsck.k9.ui.ContactBadge;
 import com.fsck.k9.ui.R;
 import com.fsck.k9.view.RecipientSelectView.Recipient;
 import com.fsck.k9.view.ThemeUtils;
+import com.google.android.material.textview.MaterialTextView;
 
 
 public class AlternateRecipientAdapter extends BaseAdapter {
@@ -124,10 +124,10 @@ public void bindHeaderView(View view, Recipient recipient) {
 
         holder.headerName.setText(recipient.getNameOrUnknown(context));
         if (!TextUtils.isEmpty(recipient.addressLabel)) {
-            holder.headerAddressLabel.setText(recipient.addressLabel);
-            holder.headerAddressLabel.setVisibility(View.VISIBLE);
+            holder.headerLabel.setText(recipient.addressLabel);
+            holder.headerLabel.setVisibility(View.VISIBLE);
         } else {
-            holder.headerAddressLabel.setVisibility(View.GONE);
+            holder.headerLabel.setVisibility(View.GONE);
         }
 
         RecipientAdapter.setContactPhotoOrPlaceholder(context, holder.headerPhoto, recipient);
@@ -236,13 +236,13 @@ public void setShowAdvancedInfo(boolean showAdvancedInfo) {
 
     private static class RecipientTokenHolder {
         public final View layoutHeader, layoutItem;
-        public final TextView headerName;
-        public final TextView headerAddressLabel;
+        public final MaterialTextView headerName;
+        public final MaterialTextView headerLabel;
         public final ContactBadge headerPhoto;
         public final View headerRemove;
         public final View copyEmailAddress;
-        public final TextView itemAddress;
-        public final TextView itemAddressLabel;
+        public final MaterialTextView itemAddress;
+        public final MaterialTextView itemAddressLabel;
         public final View itemCryptoStatus;
         public final ImageView itemCryptoStatusIcon;
         public final ImageView itemCryptoStatusSimple;
@@ -253,7 +253,7 @@ public RecipientTokenHolder(View view) {
             layoutItem = view.findViewById(R.id.alternate_container_item);
 
             headerName = view.findViewById(R.id.alternate_header_name);
-            headerAddressLabel = view.findViewById(R.id.alternate_header_label);
+            headerLabel = view.findViewById(R.id.alternate_header_label);
             headerPhoto = view.findViewById(R.id.alternate_contact_photo);
             headerRemove = view.findViewById(R.id.alternate_remove);
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt
index 3e42973c5fe..7e97fafda33 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt
@@ -4,8 +4,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.CheckBox
-import android.widget.TextView
+import android.widget.EditText
 import androidx.core.content.IntentCompat
 import androidx.core.os.BundleCompat
 import androidx.core.view.isVisible
@@ -16,6 +15,7 @@ import com.fsck.k9.Identity
 import com.fsck.k9.Preferences
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.base.K9Activity
+import com.google.android.material.checkbox.MaterialCheckBox
 import org.koin.android.ext.android.inject
 
 class EditIdentity : K9Activity() {
@@ -24,12 +24,12 @@ class EditIdentity : K9Activity() {
     private lateinit var account: Account
     private lateinit var identity: Identity
 
-    private lateinit var description: TextView
-    private lateinit var name: TextView
-    private lateinit var email: TextView
-    private lateinit var replyTo: TextView
-    private lateinit var signatureUse: CheckBox
-    private lateinit var signature: TextView
+    private lateinit var description: EditText
+    private lateinit var name: EditText
+    private lateinit var email: EditText
+    private lateinit var replyTo: EditText
+    private lateinit var signatureUse: MaterialCheckBox
+    private lateinit var signature: EditText
     private lateinit var signatureLayout: View
 
     private var identityIndex: Int = 0
@@ -67,23 +67,23 @@ class EditIdentity : K9Activity() {
         signature = findViewById(R.id.signature)
         signatureLayout = findViewById(R.id.signature_layout)
 
-        description.text = identity.description
-        name.text = identity.name
-        email.text = identity.email
-        replyTo.text = identity.replyTo
+        description.setText(identity.description)
+        name.setText(identity.name)
+        email.setText(identity.email)
+        replyTo.setText(identity.replyTo)
 
         signatureUse.isChecked = identity.signatureUse
         signatureUse.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 signatureLayout.isVisible = true
-                signature.text = identity.signature
+                signature.setText(identity.signature)
             } else {
                 signatureLayout.isVisible = false
             }
         }
 
         if (signatureUse.isChecked) {
-            signature.text = identity.signature
+            signature.setText(identity.signature)
         } else {
             signatureLayout.isVisible = false
         }
@@ -104,11 +104,11 @@ class EditIdentity : K9Activity() {
         invalidateOptionsMenu()
     }
 
-    private fun isValidEmailAddress(textView: TextView): Boolean {
+    private fun isValidEmailAddress(textView: EditText): Boolean {
         return emailAddressValidator.isValidAddressOnly(textView.text.trim())
     }
 
-    private fun isValidEmailAddressOrEmpty(textView: TextView): Boolean {
+    private fun isValidEmailAddressOrEmpty(textView: EditText): Boolean {
         return textView.text.isBlank() || isValidEmailAddress(textView)
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
index 634eb4a5cf2..fdf17848fb4 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
@@ -38,7 +38,6 @@
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -117,6 +116,7 @@
 import com.fsck.k9.ui.helper.SizeFormatter;
 import com.fsck.k9.ui.messagelist.DefaultFolderProvider;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textview.MaterialTextView;
 import org.openintents.openpgp.OpenPgpApiManager;
 import org.openintents.openpgp.util.OpenPgpApi;
 import org.openintents.openpgp.util.OpenPgpIntentStarter;
@@ -224,7 +224,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
     private boolean requestReadReceipt = false;
 
-    private TextView chooseIdentityButton;
+    private MaterialTextView chooseIdentityView;
     private EditText subjectView;
     private EditText signatureView;
     private EditText messageContentView;
@@ -298,8 +298,8 @@ public void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        chooseIdentityButton = findViewById(R.id.identity);
-        chooseIdentityButton.setOnClickListener(this);
+        chooseIdentityView = findViewById(R.id.identity);
+        chooseIdentityView.setOnClickListener(this);
 
         ReplyToView replyToView = new ReplyToView(this);
         replyToPresenter = new ReplyToPresenter(replyToView);
@@ -937,7 +937,7 @@ private void switchToIdentity(Identity identity) {
     }
 
     private void updateFrom() {
-        chooseIdentityButton.setText(identity.getEmail());
+        chooseIdentityView.setText(identity.getEmail());
     }
 
     private void updateSignature() {
@@ -1828,7 +1828,7 @@ public void updateAttachmentView(Attachment attachment) {
                 throw new IllegalArgumentException();
             }
 
-            TextView nameView = view.findViewById(R.id.attachment_name);
+            MaterialTextView nameView = view.findViewById(R.id.attachment_name);
             boolean hasMetadata = (attachment.state != Attachment.LoadingState.URI_ONLY);
             if (hasMetadata) {
                 nameView.setText(attachment.name);
@@ -1837,7 +1837,7 @@ public void updateAttachmentView(Attachment attachment) {
             }
 
             if (attachment.size != null && attachment.size >= 0) {
-                TextView sizeView = view.findViewById(R.id.attachment_size);
+                MaterialTextView sizeView = view.findViewById(R.id.attachment_size);
                 sizeView.setText(sizeFormatter.formatSize(attachment.size));
             }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index 2c302eaf3bb..5adcad19d1e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -12,7 +12,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.animation.AnimationUtils
 import android.widget.ProgressBar
-import android.widget.TextView
 import androidx.appcompat.app.ActionBar
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
@@ -61,6 +60,7 @@ import com.fsck.k9.ui.messageview.MessageViewFragment.MessageViewFragmentListene
 import com.fsck.k9.ui.messageview.PlaceholderFragment
 import com.fsck.k9.view.ViewSwitcher
 import com.fsck.k9.view.ViewSwitcher.OnSwitchCompleteListener
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.materialdrawer.util.getOptimalDrawerWidth
 import org.koin.android.ext.android.inject
 import org.koin.core.component.KoinComponent
@@ -934,8 +934,8 @@ open class MessageList :
     }
 
     private fun setActionBarTitle(title: String, subtitle: String? = null) {
-        findViewById<TextView>(R.id.toolbarTitle).text = title
-        findViewById<TextView>(R.id.toolbarSubtitle).apply {
+        findViewById<MaterialTextView>(R.id.toolbarTitle).text = title
+        findViewById<MaterialTextView>(R.id.toolbarSubtitle).apply {
             if (subtitle != null) {
                 text = subtitle
                 isGone = false
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java
index a3b1e083e6a..d9491ce861d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java
@@ -8,7 +8,6 @@
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.widget.TextView;
 
 import androidx.core.content.IntentCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -20,6 +19,7 @@
 import com.fsck.k9.service.DatabaseUpgradeService;
 import com.fsck.k9.ui.R;
 import com.fsck.k9.ui.base.K9Activity;
+import com.google.android.material.textview.MaterialTextView;
 
 
 /**
@@ -96,7 +96,7 @@ public static boolean actionUpgradeDatabases(Context context, Intent startIntent
 
     private Intent mStartIntent;
 
-    private TextView mUpgradeText;
+    private MaterialTextView mUpgradeText;
 
     private LocalBroadcastManager mLocalBroadcastManager;
     private UpgradeDatabaseBroadcastReceiver mBroadcastReceiver;
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java
index 702d9d1d6f8..3c79f0487e9 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java
@@ -1,11 +1,15 @@
 package com.fsck.k9.activity.compose;
 
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.TextView;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.DI;
@@ -13,10 +17,7 @@
 import com.fsck.k9.Preferences;
 import com.fsck.k9.ui.R;
 import com.fsck.k9.ui.identity.IdentityFormatter;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import com.google.android.material.textview.MaterialTextView;
 
 /**
  * Adapter for the <em>Choose identity</em> list view.
@@ -140,12 +141,12 @@ public static class IdentityContainer {
     }
 
     static class AccountHolder {
-        public TextView name;
+        public MaterialTextView name;
         public View chip;
     }
 
     static class IdentityHolder {
-        public TextView name;
-        public TextView description;
+        public MaterialTextView name;
+        public MaterialTextView description;
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java
index f033c9d8166..e82e980a681 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientAdapter.java
@@ -7,8 +7,6 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
 import android.text.Spannable;
 import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
@@ -18,13 +16,15 @@
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
-import android.widget.TextView;
 
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import com.fsck.k9.activity.misc.ContactPicture;
 import com.fsck.k9.ui.R;
 import com.fsck.k9.view.RecipientSelectView.Recipient;
 import com.fsck.k9.view.RecipientSelectView.RecipientCryptoStatus;
 import com.fsck.k9.view.ThemeUtils;
+import com.google.android.material.textview.MaterialTextView;
 
 
 public class RecipientAdapter extends BaseAdapter implements Filterable {
@@ -185,8 +185,8 @@ public void setShowAdvancedInfo(boolean showAdvancedInfo) {
 
 
     private static class RecipientTokenHolder {
-        public final TextView name;
-        public final TextView email;
+        public final MaterialTextView name;
+        public final MaterialTextView email;
         final ImageView photo;
         final View cryptoStatus;
         final ImageView cryptoStatusIcon;
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java
index cdbbefde10e..038fefb8a7d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java
@@ -6,16 +6,17 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CompoundButton;
-import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.RadioButton;
 
 import androidx.annotation.NonNull;
 import com.fsck.k9.Account;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.ui.R;
 import com.fsck.k9.ui.base.K9Activity;
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.radiobutton.MaterialRadioButton;
+
 
 public class AccountSetupComposition extends K9Activity {
 
@@ -27,9 +28,9 @@ public class AccountSetupComposition extends K9Activity {
     private EditText mAccountEmail;
     private EditText mAccountAlwaysBcc;
     private EditText mAccountName;
-    private CheckBox mAccountSignatureUse;
-    private RadioButton mAccountSignatureBeforeLocation;
-    private RadioButton mAccountSignatureAfterLocation;
+    private MaterialCheckBox mAccountSignatureUse;
+    private MaterialRadioButton mAccountSignatureBeforeLocation;
+    private MaterialRadioButton mAccountSignatureAfterLocation;
     private LinearLayout mAccountSignatureLayout;
 
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt
index a757e449662..4e872fdcef6 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt
@@ -4,14 +4,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.CheckBox
-import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import app.k9mail.core.android.common.compat.BundleCompat
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.base.loader.observeLoading
+import com.google.android.material.checkbox.MaterialCheckBox
+import com.google.android.material.textview.MaterialTextView
 import de.cketti.changelog.ReleaseItem
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -47,7 +47,7 @@ class ChangelogFragment : Fragment() {
     }
 
     private fun setUpShowRecentChangesCheckbox(view: View) {
-        val showRecentChangesCheckBox = view.findViewById<CheckBox>(R.id.show_recent_changes_checkbox)
+        val showRecentChangesCheckBox = view.findViewById<MaterialCheckBox>(R.id.show_recent_changes_checkbox)
         var isInitialValue = true
         viewModel.showRecentChangesState.observe(viewLifecycleOwner) { showRecentChanges ->
             showRecentChangesCheckBox.isChecked = showRecentChanges
@@ -108,10 +108,10 @@ class ChangelogAdapter(releaseItems: List<ReleaseItem>) : RecyclerView.Adapter<V
 }
 
 class ReleaseItemViewHolder(view: View) : ViewHolder(view) {
-    val versionName: TextView = view.findViewById(R.id.version_name)
-    val versionDate: TextView = view.findViewById(R.id.version_date)
+    val versionName: MaterialTextView = view.findViewById(R.id.version_name)
+    val versionDate: MaterialTextView = view.findViewById(R.id.version_date)
 }
 
 class ChangeItemViewHolder(view: View) : ViewHolder(view) {
-    val changeText: TextView = view.findViewById(R.id.change_text)
+    val changeText: MaterialTextView = view.findViewById(R.id.change_text)
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt
index 4d08f2d9e24..def71b19b87 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt
@@ -2,9 +2,9 @@ package com.fsck.k9.ui.choosefolder
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.items.AbstractItem
 
 class FolderListItem(
@@ -28,5 +28,5 @@ class FolderListItem(
 
 class FolderListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     val icon: ImageView = itemView.findViewById(R.id.folder_icon)
-    val name: TextView = itemView.findViewById(R.id.folder_name)
+    val name: MaterialTextView = itemView.findViewById(R.id.folder_name)
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java
index adcc5687dd4..55e0f3daa4a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/QuotedMessageMvpView.java
@@ -6,29 +6,28 @@
 import android.view.View.OnClickListener;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageButton;
 
 import com.fsck.k9.DI;
 import com.fsck.k9.FontSizes;
-import com.fsck.k9.helper.CrLfConverter;
-import com.fsck.k9.message.html.DisplayHtml;
-import com.fsck.k9.ui.R;
 import com.fsck.k9.activity.MessageCompose;
+import com.fsck.k9.helper.CrLfConverter;
 import com.fsck.k9.mailstore.AttachmentResolver;
 import com.fsck.k9.message.QuotedTextMode;
 import com.fsck.k9.message.SimpleMessageFormat;
+import com.fsck.k9.message.html.DisplayHtml;
+import com.fsck.k9.ui.R;
 import com.fsck.k9.ui.helper.DisplayHtmlUiFactory;
 import com.fsck.k9.view.MessageWebView;
 import com.fsck.k9.view.WebViewConfigProvider;
+import com.google.android.material.button.MaterialButton;
 
 
 public class QuotedMessageMvpView {
     private final DisplayHtml displayHtml = DI.get(DisplayHtmlUiFactory.class).createForMessageCompose();
     private final WebViewConfigProvider webViewConfigProvider = DI.get(WebViewConfigProvider.class);
 
-    private final Button mQuotedTextShow;
+    private final MaterialButton mQuotedTextShow;
     private final View mQuotedTextBar;
     private final View mQuotedTextEdit;
     private final EditText mQuotedText;
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt
index 0124e9c1d91..8d6810e49e7 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferActivity.kt
@@ -9,13 +9,13 @@ import android.transition.TransitionInflater
 import android.transition.TransitionManager
 import android.view.MenuItem
 import android.view.View
-import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.base.K9Activity
 import com.fsck.k9.view.StatusIndicator
+import com.google.android.material.textview.MaterialTextView
 import kotlinx.coroutines.delay
 import org.koin.android.ext.android.inject
 import org.koin.core.parameter.parametersOf
@@ -27,8 +27,8 @@ class AutocryptKeyTransferActivity : K9Activity() {
 
     private lateinit var transferSendButton: View
     private lateinit var transferButtonShowCode: View
-    private lateinit var transferAddress1: TextView
-    private lateinit var transferAddress2: TextView
+    private lateinit var transferAddress1: MaterialTextView
+    private lateinit var transferAddress2: MaterialTextView
     private lateinit var transferMsgInfo: View
     private lateinit var transferLayoutGenerating: View
     private lateinit var transferLayoutSending: View
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt
index b6a08c0994a..58ee2fe5dfd 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt
@@ -2,9 +2,9 @@ package com.fsck.k9.ui.managefolders
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.items.AbstractItem
 
 class FolderListItem(
@@ -27,5 +27,5 @@ class FolderListItem(
 
 class FolderListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     val icon: ImageView = itemView.findViewById(R.id.folder_icon)
-    val name: TextView = itemView.findViewById(R.id.folder_name)
+    val name: MaterialTextView = itemView.findViewById(R.id.folder_name)
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/CryptoStatusItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/CryptoStatusItem.kt
index 073e23c1f42..09c602713c3 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/CryptoStatusItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/CryptoStatusItem.kt
@@ -3,9 +3,9 @@ package com.fsck.k9.ui.messagedetails
 import android.content.res.ColorStateList
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.resolveColorAttribute
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 
@@ -16,8 +16,8 @@ internal class CryptoStatusItem(val cryptoDetails: CryptoDetails) : AbstractItem
     override fun getViewHolder(v: View) = ViewHolder(v)
 
     class ViewHolder(view: View) : FastAdapter.ViewHolder<CryptoStatusItem>(view) {
-        private val titleTextView = view.findViewById<TextView>(R.id.crypto_status_title)
-        private val descriptionTextView = view.findViewById<TextView>(R.id.crypto_status_description)
+        private val titleTextView = view.findViewById<MaterialTextView>(R.id.crypto_status_title)
+        private val descriptionTextView = view.findViewById<MaterialTextView>(R.id.crypto_status_description)
         private val imageView = view.findViewById<ImageView>(R.id.crypto_status_icon)
         private val originalBackground = view.background
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt
index deb3b30bfb8..a79fdd65ec8 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt
@@ -2,9 +2,9 @@ package com.fsck.k9.ui.messagedetails
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.annotation.DrawableRes
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 
@@ -19,7 +19,7 @@ internal class FolderNameItem(
 
     class ViewHolder(view: View) : FastAdapter.ViewHolder<FolderNameItem>(view) {
         private val folderIcon: ImageView = view.findViewById(R.id.folder_icon)
-        private val folderName = view.findViewById<TextView>(R.id.folder_name)
+        private val folderName = view.findViewById<MaterialTextView>(R.id.folder_name)
 
         override fun bindView(item: FolderNameItem, payloads: List<Any>) {
             folderName.text = item.displayName
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDateItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDateItem.kt
index 0c5a52d7f35..16f54a250fb 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDateItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDateItem.kt
@@ -1,8 +1,8 @@
 package com.fsck.k9.ui.messagedetails
 
 import android.view.View
-import android.widget.TextView
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 
@@ -13,7 +13,7 @@ internal class MessageDateItem(private val date: String) : AbstractItem<MessageD
     override fun getViewHolder(v: View) = ViewHolder(v)
 
     class ViewHolder(view: View) : FastAdapter.ViewHolder<MessageDateItem>(view) {
-        private val textView = view.findViewById<TextView>(R.id.date)
+        private val textView = view.findViewById<MaterialTextView>(R.id.date)
 
         override fun bindView(item: MessageDateItem, payloads: List<Any>) {
             textView.text = item.date
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt
index efe066d200c..3e16c7c01df 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt
@@ -2,11 +2,11 @@ package com.fsck.k9.ui.messagedetails
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.appcompat.widget.TooltipCompat
 import androidx.core.view.isVisible
 import com.fsck.k9.contacts.ContactPictureLoader
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 
@@ -26,8 +26,8 @@ internal class ParticipantItem(
         val menuOverflow: View = view.findViewById(R.id.menu_overflow)
 
         private val contactPicture: ImageView = view.findViewById(R.id.contact_picture)
-        private val name = view.findViewById<TextView>(R.id.name)
-        private val email = view.findViewById<TextView>(R.id.email)
+        private val name = view.findViewById<MaterialTextView>(R.id.name)
+        private val email = view.findViewById<MaterialTextView>(R.id.email)
         private val originalBackground = view.background
 
         init {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt
index 0e2e7846ef9..639bfc994b8 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt
@@ -1,8 +1,8 @@
 package com.fsck.k9.ui.messagedetails
 
 import android.view.View
-import android.widget.TextView
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 
@@ -16,8 +16,8 @@ internal class SectionHeaderItem(
     override fun getViewHolder(v: View) = ViewHolder(v)
 
     class ViewHolder(view: View) : FastAdapter.ViewHolder<SectionHeaderItem>(view) {
-        private val textView = view.findViewById<TextView>(R.id.title)
-        private val extraTextView = view.findViewById<TextView>(R.id.extra)
+        private val textView = view.findViewById<MaterialTextView>(R.id.title)
+        private val extraTextView = view.findViewById<MaterialTextView>(R.id.extra)
 
         override fun bindView(item: SectionHeaderItem, payloads: List<Any>) {
             textView.text = item.title
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
index 1943b2e1d4e..bb697e6904d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
@@ -33,6 +33,7 @@ import com.fsck.k9.mail.Address
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.helper.RelativeDateTimeFormatter
 import com.fsck.k9.ui.resolveColorAttribute
+import com.google.android.material.textview.MaterialTextView
 import kotlin.math.max
 
 private const val FOOTER_ID = 1L
@@ -437,7 +438,7 @@ class MessageListAdapter internal constructor(
         holder.text.text = footerText
     }
 
-    private fun formatPreviewText(preview: TextView, beforePreviewText: CharSequence, messageRead: Boolean) {
+    private fun formatPreviewText(preview: MaterialTextView, beforePreviewText: CharSequence, messageRead: Boolean) {
         val previewText = preview.text as Spannable
 
         val beforePreviewLength = beforePreviewText.length
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
index d2c287c0155..483ae9cad5f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
@@ -11,7 +11,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.view.ActionMode
@@ -57,6 +56,7 @@ import com.fsck.k9.ui.messagelist.MessageListFragment.MessageListFragmentListene
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.BaseTransientBottomBar.BaseCallback
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.textview.MaterialTextView
 import java.util.concurrent.Future
 import kotlinx.datetime.Clock
 import net.jcip.annotations.GuardedBy
@@ -268,7 +268,7 @@ class MessageListFragment :
     }
 
     private fun initializeErrorLayout(view: View) {
-        val errorMessageView = view.findViewById<TextView>(R.id.message_list_error_message)
+        val errorMessageView = view.findViewById<MaterialTextView>(R.id.message_list_error_message)
         errorMessageView.text = getString(error!!.errorText)
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt
index c4b846a15d5..a64a6cf049f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt
@@ -9,7 +9,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.View.MeasureSpec
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.graphics.withTranslation
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
@@ -17,6 +16,7 @@ import app.k9mail.ui.utils.itemtouchhelper.ItemTouchHelper
 import com.fsck.k9.SwipeAction
 import com.fsck.k9.ui.R
 import com.google.android.material.color.ColorRoles
+import com.google.android.material.textview.MaterialTextView
 import kotlin.math.abs
 
 @SuppressLint("InflateParams")
@@ -35,10 +35,10 @@ class MessageListSwipeCallback(
 
     private val swipeRightLayout: View
     private val swipeRightIcon: ImageView
-    private val swipeRightText: TextView
+    private val swipeRightText: MaterialTextView
     private val swipeLeftLayout: View
     private val swipeLeftIcon: ImageView
-    private val swipeLeftText: TextView
+    private val swipeLeftText: MaterialTextView
     private val swipeRightConfig: SwipeActionConfig
     private val swipeLeftConfig: SwipeActionConfig
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt
index 95247ae6aef..114fc0cfb51 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt
@@ -2,9 +2,9 @@ package com.fsck.k9.ui.messagelist
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 
 sealed class MessageListViewHolder(view: View) : ViewHolder(view)
 
@@ -13,11 +13,11 @@ class MessageViewHolder(view: View) : MessageListViewHolder(view) {
 
     val selected: View = view.findViewById(R.id.selected)
     val contactPicture: ImageView = view.findViewById(R.id.contact_picture)
-    val subject: TextView = view.findViewById(R.id.subject)
-    val preview: TextView = view.findViewById(R.id.preview)
-    val date: TextView = view.findViewById(R.id.date)
+    val subject: MaterialTextView = view.findViewById(R.id.subject)
+    val preview: MaterialTextView = view.findViewById(R.id.preview)
+    val date: MaterialTextView = view.findViewById(R.id.date)
     val chip: ImageView = view.findViewById(R.id.account_color_chip)
-    val threadCount: TextView = view.findViewById(R.id.thread_count)
+    val threadCount: MaterialTextView = view.findViewById(R.id.thread_count)
     val star: ImageView = view.findViewById(R.id.star)
     val starClickArea: View = view.findViewById(R.id.star_click_area)
     val attachment: ImageView = view.findViewById(R.id.attachment)
@@ -25,5 +25,5 @@ class MessageViewHolder(view: View) : MessageListViewHolder(view) {
 }
 
 class FooterViewHolder(view: View) : MessageListViewHolder(view) {
-    val text: TextView = view.findViewById(R.id.main_text)
+    val text: MaterialTextView = view.findViewById(R.id.main_text)
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt
index b66020578e6..74f6e6eaae2 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt
@@ -8,7 +8,6 @@ import android.text.style.StyleSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.fsck.k9.controller.MessageReference
 import com.fsck.k9.mail.Header
@@ -16,6 +15,7 @@ import com.fsck.k9.mail.internet.MimeUtility
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.base.loader.observeLoading
 import com.fsck.k9.ui.withArguments
+import com.google.android.material.textview.MaterialTextView
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class MessageHeadersFragment : Fragment() {
@@ -33,7 +33,7 @@ class MessageHeadersFragment : Fragment() {
         val messageReference = MessageReference.parse(messageReferenceString)
             ?: error("Invalid message reference: $messageReferenceString")
 
-        val messageHeaderView = view.findViewById<TextView>(R.id.message_source)
+        val messageHeaderView = view.findViewById<MaterialTextView>(R.id.message_source)
 
         messageHeadersViewModel.loadHeaders(messageReference).observeLoading(
             owner = this,
@@ -45,7 +45,7 @@ class MessageHeadersFragment : Fragment() {
         }
     }
 
-    private fun populateHeadersList(messageHeaderView: TextView, headers: List<Header>) {
+    private fun populateHeadersList(messageHeaderView: MaterialTextView, headers: List<Header>) {
         val sb = SpannableStringBuilder()
         var first = true
         for ((name, value) in headers) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java
index 1d56b97a03f..2c6ec3a0c3a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentView.java
@@ -8,7 +8,6 @@
 import android.view.View.OnClickListener;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons;
 import com.bumptech.glide.Glide;
@@ -18,6 +17,7 @@
 import com.fsck.k9.ui.R;
 import com.fsck.k9.ui.helper.ContextHelper;
 import com.fsck.k9.ui.helper.SizeFormatter;
+import com.google.android.material.textview.MaterialTextView;
 
 
 public class AttachmentView extends FrameLayout implements OnClickListener {
@@ -78,7 +78,7 @@ private void displayAttachmentInformation() {
         cardView.setOnClickListener(this);
         saveButton.setOnClickListener(this);
 
-        TextView attachmentName = findViewById(R.id.attachment_name);
+        MaterialTextView attachmentName = findViewById(R.id.attachment_name);
         attachmentName.setText(attachment.displayName);
 
         setAttachmentSize(attachment.size);
@@ -94,7 +94,7 @@ private void displayAttachmentInformation() {
     }
 
     private void setAttachmentSize(long size) {
-        TextView attachmentSize = findViewById(R.id.attachment_size);
+        MaterialTextView attachmentSize = findViewById(R.id.attachment_size);
         if (size == AttachmentViewInfo.UNKNOWN_SIZE) {
             attachmentSize.setText("");
         } else {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt
index 0fe80c2757c..c1c377027f7 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt
@@ -21,7 +21,6 @@ import android.view.ViewGroup
 import android.webkit.WebView
 import android.webkit.WebView.HitTestResult
 import android.widget.LinearLayout
-import android.widget.TextView
 import android.widget.Toast
 import androidx.core.app.ShareCompat.IntentBuilder
 import androidx.core.view.isGone
@@ -38,6 +37,7 @@ import com.fsck.k9.ui.R
 import com.fsck.k9.view.MessageWebView
 import com.fsck.k9.view.MessageWebView.OnPageFinishedListener
 import com.fsck.k9.view.WebViewConfigProvider
+import com.google.android.material.textview.MaterialTextView
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.koin.core.qualifier.named
@@ -58,7 +58,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
     private lateinit var attachmentsContainer: ViewGroup
     private lateinit var unsignedTextContainer: View
     private lateinit var unsignedTextDivider: View
-    private lateinit var unsignedText: TextView
+    private lateinit var unsignedText: MaterialTextView
 
     private var isShowingPictures = false
     private var currentHtmlText: String? = null
@@ -101,15 +101,19 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
             HitTestResult.SRC_ANCHOR_TYPE -> {
                 createLinkMenu(menu, webView, linkUrl = hitTestResult.extra)
             }
+
             HitTestResult.IMAGE_TYPE -> {
                 createImageMenu(menu, imageUrl = hitTestResult.extra)
             }
+
             HitTestResult.SRC_IMAGE_ANCHOR_TYPE -> {
                 createImageLinkMenu(menu, webView, imageUrl = hitTestResult.extra)
             }
+
             HitTestResult.PHONE_TYPE -> {
                 createPhoneNumberMenu(menu, phoneNumber = hitTestResult.extra)
             }
+
             HitTestResult.EMAIL_TYPE -> {
                 createEmailMenu(menu, email = hitTestResult.extra)
             }
@@ -130,16 +134,19 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
                     val intent = Intent(Intent.ACTION_VIEW, Uri.parse(linkUrl))
                     startActivityIfAvailable(context, intent)
                 }
+
                 MENU_ITEM_LINK_SHARE -> {
                     IntentBuilder(context)
                         .setType("text/plain")
                         .setText(linkUrl)
                         .startChooser()
                 }
+
                 MENU_ITEM_LINK_COPY -> {
                     val label = context.getString(R.string.webview_contextmenu_link_clipboard_label)
                     clipboardManager.setText(label, linkUrl)
                 }
+
                 MENU_ITEM_LINK_TEXT_COPY -> {
                     val message = linkTextHandler.obtainMessage()
                     webView.requestFocusNodeHref(message)
@@ -202,6 +209,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
                         startActivityIfAvailable(context, intent)
                     }
                 }
+
                 MENU_ITEM_IMAGE_SAVE -> {
                     if (inlineImage) {
                         attachmentCallback.onSaveAttachment(attachmentViewInfo)
@@ -209,6 +217,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
                         downloadImage(imageUri)
                     }
                 }
+
                 MENU_ITEM_IMAGE_COPY -> {
                     val label = context.getString(R.string.webview_contextmenu_image_clipboard_label)
                     clipboardManager.setText(label, imageUri.toString())
@@ -270,10 +279,12 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
                     val intent = Intent(Intent.ACTION_VIEW, uri)
                     startActivityIfAvailable(context, intent)
                 }
+
                 MENU_ITEM_PHONE_SAVE -> {
                     val intent = ContactIntentHelper.getAddPhoneContactIntent(phoneNumber)
                     startActivityIfAvailable(context, intent)
                 }
+
                 MENU_ITEM_PHONE_COPY -> {
                     val label = context.getString(R.string.webview_contextmenu_phone_clipboard_label)
                     clipboardManager.setText(label, phoneNumber)
@@ -316,10 +327,12 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
                     val intent = Intent(Intent.ACTION_VIEW, uri)
                     startActivityIfAvailable(context, intent)
                 }
+
                 MENU_ITEM_EMAIL_SAVE -> {
                     val intent = ContactIntentHelper.getAddEmailContactIntent(Address(email))
                     startActivityIfAvailable(context, intent)
                 }
+
                 MENU_ITEM_EMAIL_COPY -> {
                     val label = context.getString(R.string.webview_contextmenu_email_clipboard_label)
                     clipboardManager.setText(label, email)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt
index c55613365a2..957ee803cb6 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt
@@ -12,11 +12,9 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ProgressBar
-import android.widget.TextView
 import app.k9mail.core.android.common.contact.ContactRepository
 import app.k9mail.core.common.mail.EmailAddress
 import app.k9mail.core.common.mail.toEmailAddressOrNull
@@ -30,6 +28,8 @@ import com.fsck.k9.ui.messageview.MessageContainerView.OnRenderingFinishedListen
 import com.fsck.k9.view.MessageHeader
 import com.fsck.k9.view.ThemeUtils
 import com.fsck.k9.view.ToolableViewAnimator
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.textview.MaterialTextView
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -44,15 +44,15 @@ class MessageTopView(
 
     private lateinit var viewAnimator: ToolableViewAnimator
     private lateinit var progressBar: ProgressBar
-    private lateinit var progressText: TextView
+    private lateinit var progressText: MaterialTextView
 
     lateinit var messageHeaderView: MessageHeader
 
     private lateinit var containerView: ViewGroup
-    private lateinit var downloadRemainderButton: Button
+    private lateinit var downloadRemainderButton: MaterialButton
     private lateinit var attachmentCallback: AttachmentViewCallback
     private lateinit var extraHeaderContainer: View
-    private lateinit var showPicturesButton: Button
+    private lateinit var showPicturesButton: MaterialButton
 
     private var isShowingProgress = false
     private var showPicturesButtonClicked = false
@@ -152,7 +152,7 @@ class MessageTopView(
         resetAndPrepareMessageView(messageViewInfo)
         val view = layoutInflater.inflate(R.layout.message_content_crypto_error, containerView, false)
         setCryptoProviderIcon(providerIcon, view)
-        val cryptoErrorText = view.findViewById<TextView>(R.id.crypto_error_text)
+        val cryptoErrorText = view.findViewById<MaterialTextView>(R.id.crypto_error_text)
         val openPgpError = messageViewInfo.cryptoResultAnnotation.openPgpError
         if (openPgpError != null) {
             val errorText = openPgpError.message
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt
index a5b4226c3ce..b62233ce459 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt
@@ -5,9 +5,9 @@ import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.core.view.isGone
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 
 private const val MAX_NUMBER_OF_RECIPIENT_NAMES = 5
 
@@ -30,8 +30,8 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con
 
     private val recipientLayoutCreator: RecipientLayoutCreator
 
-    private val recipientNameTextView: TextView
-    private val recipientCountTextView: TextView
+    private val recipientNameTextView: MaterialTextView
+    private val recipientCountTextView: MaterialTextView
     private val additionRecipientSpacing: Int
 
     init {
@@ -53,7 +53,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con
             return measureWidth(recipientCountTextView, text)
         }
 
-        private fun measureWidth(textView: TextView, text: CharSequence): Int {
+        private fun measureWidth(textView: MaterialTextView, text: CharSequence): Int {
             textView.text = text
 
             val widthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt
index 247f9ca740b..819878195a5 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt
@@ -9,8 +9,6 @@ import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.core.view.isVisible
@@ -18,6 +16,8 @@ import androidx.fragment.app.Fragment
 import com.fsck.k9.controller.push.PushController
 import com.fsck.k9.notification.NotificationChannelManager
 import com.fsck.k9.ui.R
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.textview.MaterialTextView
 import org.koin.android.ext.android.inject
 
 private const val LEARN_MORE_URL = "https://k9mail.app/go/push-info"
@@ -36,14 +36,14 @@ class PushInfoFragment : Fragment() {
     }
 
     private fun initializeNotificationSection(view: View) {
-        val notificationTextView = view.findViewById<TextView>(R.id.notificationText)
+        val notificationTextView = view.findViewById<MaterialTextView>(R.id.notificationText)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val configureNotificationText = getString(R.string.push_info_configure_notification_text)
             notificationTextView.text = getString(
                 R.string.push_info_notification_explanation_text,
                 configureNotificationText,
             )
-            val configureNotificationButton = view.findViewById<Button>(R.id.configureNotificationButton)
+            val configureNotificationButton = view.findViewById<MaterialButton>(R.id.configureNotificationButton)
             configureNotificationButton.isVisible = true
             configureNotificationButton.setOnClickListener {
                 launchNotificationSettings()
@@ -52,13 +52,13 @@ class PushInfoFragment : Fragment() {
             notificationTextView.text = getString(R.string.push_info_notification_explanation_text, "")
         }
 
-        view.findViewById<Button>(R.id.learnMoreButton).setOnClickListener {
+        view.findViewById<MaterialButton>(R.id.learnMoreButton).setOnClickListener {
             launchLearnMoreAction()
         }
     }
 
     private fun initializeDisablePushSection(view: View) {
-        val disablePushButton = view.findViewById<Button>(R.id.disablePushButton)
+        val disablePushButton = view.findViewById<MaterialButton>(R.id.disablePushButton)
         disablePushButton.setOnClickListener(::disablePush)
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt
index 7b1b6e3c76f..98e78ab2115 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt
@@ -9,13 +9,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import timber.log.Timber
 
 class AboutFragment : Fragment() {
@@ -26,7 +26,7 @@ class AboutFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val versionTextView = view.findViewById<TextView>(R.id.version)
+        val versionTextView = view.findViewById<MaterialTextView>(R.id.version)
         versionTextView.text = getVersionNumber()
 
         val versionLayout = view.findViewById<View>(R.id.versionLayout)
@@ -192,8 +192,8 @@ private class LibrariesAdapter(private val dataset: Array<Library>) :
     RecyclerView.Adapter<LibrariesAdapter.ViewHolder>() {
 
     class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val name: TextView = view.findViewById(R.id.name)
-        val license: TextView = view.findViewById(R.id.license)
+        val name: MaterialTextView = view.findViewById(R.id.name)
+        val license: MaterialTextView = view.findViewById(R.id.license)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt
index b119822dcd1..62c70279c8e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt
@@ -3,12 +3,12 @@ package com.fsck.k9.ui.settings
 import android.view.MotionEvent
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.fsck.k9.Account
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.drag.IDraggable
 import com.mikepenz.fastadapter.items.AbstractItem
@@ -27,8 +27,8 @@ internal class AccountItem(
     override fun getViewHolder(v: View) = ViewHolder(v)
 
     class ViewHolder(view: View) : FastAdapter.ViewHolder<AccountItem>(view) {
-        val name: TextView = view.findViewById(R.id.name)
-        val email: TextView = view.findViewById(R.id.email)
+        val name: MaterialTextView = view.findViewById(R.id.name)
+        val email: MaterialTextView = view.findViewById(R.id.email)
         val dragHandle: ImageView = view.findViewById(R.id.drag_handle)
 
         override fun bindView(item: AccountItem, payloads: List<Any>) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt
index 32b3bd986b2..0a31d9fa506 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt
@@ -2,10 +2,10 @@ package com.fsck.k9.ui.settings
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.annotation.DrawableRes
 import androidx.annotation.IdRes
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 
@@ -22,7 +22,7 @@ internal class SettingsActionItem(
     override fun getViewHolder(v: View) = ViewHolder(v)
 
     class ViewHolder(view: View) : FastAdapter.ViewHolder<SettingsActionItem>(view) {
-        val text: TextView = view.findViewById(R.id.text)
+        val text: MaterialTextView = view.findViewById(R.id.text)
         val icon: ImageView = view.findViewById(R.id.icon)
 
         override fun bindView(item: SettingsActionItem, payloads: List<Any>) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt
index 4fad2b75f29..178716c6cd9 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt
@@ -1,8 +1,8 @@
 package com.fsck.k9.ui.settings
 
 import android.view.View
-import android.widget.TextView
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 
@@ -17,7 +17,7 @@ internal class SettingsDividerItem(
     override fun getViewHolder(v: View) = ViewHolder(v)
 
     class ViewHolder(view: View) : FastAdapter.ViewHolder<SettingsDividerItem>(view) {
-        val text: TextView = view.findViewById(R.id.text)
+        val text: MaterialTextView = view.findViewById(R.id.text)
 
         override fun bindView(item: SettingsDividerItem, payloads: List<Any>) {
             text.text = item.text
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt
index 28ffb0ca574..db13c5a6144 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt
@@ -2,9 +2,9 @@ package com.fsck.k9.ui.settings
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.annotation.DrawableRes
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 
@@ -21,7 +21,7 @@ internal class UrlActionItem(
     override fun getViewHolder(v: View) = ViewHolder(v)
 
     class ViewHolder(view: View) : FastAdapter.ViewHolder<UrlActionItem>(view) {
-        val text: TextView = view.findViewById(R.id.text)
+        val text: MaterialTextView = view.findViewById(R.id.text)
         val icon: ImageView = view.findViewById(R.id.icon)
 
         override fun bindView(item: UrlActionItem, payloads: List<Any>) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSelectionSpinner.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSelectionSpinner.kt
index 83b4eeecf60..cf42c999c4f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSelectionSpinner.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSelectionSpinner.kt
@@ -7,11 +7,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import android.widget.TextView
 import androidx.appcompat.widget.AppCompatSpinner
 import androidx.core.view.isVisible
 import com.fsck.k9.Account
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 
 class AccountSelectionSpinner : AppCompatSpinner {
     var selection: Account
@@ -60,8 +60,8 @@ class AccountSelectionSpinner : AppCompatSpinner {
 
             val view = convertView ?: LayoutInflater.from(context).inflate(R.layout.account_spinner_item, parent, false)
 
-            val name: TextView = view.findViewById(R.id.name)
-            val email: TextView = view.findViewById(R.id.email)
+            val name: MaterialTextView = view.findViewById(R.id.name)
+            val email: MaterialTextView = view.findViewById(R.id.email)
 
             return view.apply {
                 name.text = title
@@ -75,8 +75,8 @@ class AccountSelectionSpinner : AppCompatSpinner {
             val view = convertView
                 ?: LayoutInflater.from(context).inflate(R.layout.account_spinner_dropdown_item, parent, false)
 
-            val name: TextView = view.findViewById(R.id.name)
-            val email: TextView = view.findViewById(R.id.email)
+            val name: MaterialTextView = view.findViewById(R.id.name)
+            val email: MaterialTextView = view.findViewById(R.id.email)
 
             return view.apply {
                 val accountName = account.name
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptDialogFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptDialogFragment.kt
index 70cee179f2b..a1cc9b15a99 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptDialogFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptDialogFragment.kt
@@ -4,25 +4,25 @@ import android.app.Dialog
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.View
-import android.widget.CheckBox
-import android.widget.TextView
 import androidx.preference.PreferenceDialogFragmentCompat
 import com.fsck.k9.ui.R
+import com.google.android.material.checkbox.MaterialCheckBox
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textview.MaterialTextView
 import com.fsck.k9.ui.base.R as BaseR
 
 class AutocryptPreferEncryptDialogFragment : PreferenceDialogFragmentCompat() {
     private val preferEncryptPreference: AutocryptPreferEncryptPreference
         get() = preference as AutocryptPreferEncryptPreference
 
-    private lateinit var preferEncryptCheckbox: CheckBox
+    private lateinit var preferEncryptCheckbox: MaterialCheckBox
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val view = layoutInflater.inflate(R.layout.dialog_autocrypt_prefer_encrypt, null)
 
-        view.findViewById<TextView>(R.id.prefer_encrypt_learn_more).makeLinksClickable()
+        view.findViewById<MaterialTextView>(R.id.prefer_encrypt_learn_more).makeLinksClickable()
 
-        preferEncryptCheckbox = view.findViewById<CheckBox>(R.id.prefer_encrypt_check).apply {
+        preferEncryptCheckbox = view.findViewById<MaterialCheckBox>(R.id.prefer_encrypt_check).apply {
             isChecked = preferEncryptPreference.isPreferEncryptEnabled
         }
 
@@ -43,7 +43,7 @@ class AutocryptPreferEncryptDialogFragment : PreferenceDialogFragmentCompat() {
         }
     }
 
-    private fun TextView.makeLinksClickable() {
+    private fun MaterialTextView.makeLinksClickable() {
         this.movementMethod = LinkMovementMethod.getInstance()
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java
index 434d1b151bf..a40f1008c0f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java
@@ -14,7 +14,6 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -234,7 +233,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity());
 
             builder.setTitle(R.string.dialog_openkeychain_info_title);
-            builder.setView(LayoutInflater.from(getActivity()).inflate(
+            builder.setView(getLayoutInflater().inflate(
                     R.layout.dialog_openkeychain_info, null, false));
 
             builder.setNegativeButton(com.fsck.k9.ui.base.R.string.cancel_action, new OnClickListener() {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt
index cfd733d9c74..784abaea607 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt
@@ -9,7 +9,6 @@ import android.widget.BaseAdapter
 import android.widget.CheckedTextView
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
-import android.widget.TextView
 import androidx.appcompat.widget.SwitchCompat
 import androidx.preference.PreferenceDialogFragmentCompat
 import com.fsck.k9.NotificationVibration
@@ -18,6 +17,7 @@ import com.fsck.k9.ui.R
 import com.fsck.k9.ui.base.bundle.getEnum
 import com.fsck.k9.ui.base.bundle.putEnum
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textview.MaterialTextView
 import org.koin.android.ext.android.inject
 import com.fsck.k9.ui.base.R as BaseR
 
@@ -167,7 +167,7 @@ class VibrationDialogFragment : PreferenceDialogFragmentCompat() {
 
         private fun getVibrationTimesView(convertView: View?, parent: ViewGroup?): View {
             return convertView.orInflate<View>(R.layout.preference_vibration_times_item, parent).apply {
-                val vibrationTimesValue = findViewById<TextView>(R.id.vibrationTimesValue)
+                val vibrationTimesValue = findViewById<MaterialTextView>(R.id.vibrationTimesValue)
                 vibrationTimesValue.text = vibrationTimes.toString()
 
                 val vibrationTimesSeekBar = findViewById<SeekBar>(R.id.vibrationTimesSeekBar).apply {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/CheckBoxItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/CheckBoxItem.kt
index 6c48e97c780..c6abfadb8fc 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/CheckBoxItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/CheckBoxItem.kt
@@ -1,9 +1,9 @@
 package com.fsck.k9.ui.settings.export
 
 import android.view.View
-import android.widget.CheckBox
 import androidx.recyclerview.widget.RecyclerView
 import com.fsck.k9.ui.R
+import com.google.android.material.checkbox.MaterialCheckBox
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 import com.mikepenz.fastadapter.listeners.ClickEventHook
@@ -18,7 +18,7 @@ abstract class CheckBoxItem<VH : CheckBoxViewHolder>(override var identifier: Lo
 }
 
 open class CheckBoxViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    val checkBox: CheckBox = itemView.findViewById(R.id.checkBox)
+    val checkBox: MaterialCheckBox = itemView.findViewById(R.id.checkBox)
 }
 
 class CheckBoxClickEvent(val action: (position: Int, isSelected: Boolean) -> Unit) : ClickEventHook<CheckBoxItem<*>>() {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt
index 1a003479f5d..664d3eaa11e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt
@@ -7,12 +7,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.base.livedata.observeNotNull
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.adapters.ItemAdapter
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -66,10 +66,12 @@ class SettingsExportFragment : Fragment() {
                 exportButton.isVisible = true
                 exportButton.isEnabled = false
             }
+
             ButtonState.ENABLED -> {
                 exportButton.isVisible = true
                 exportButton.isEnabled = true
             }
+
             ButtonState.INVISIBLE -> exportButton.visibility = View.INVISIBLE
             ButtonState.GONE -> exportButton.visibility = View.GONE
         }
@@ -83,10 +85,12 @@ class SettingsExportFragment : Fragment() {
                 statusText.isVisible = true
                 statusText.text = getString(R.string.settings_export_success_generic)
             }
+
             StatusText.PROGRESS -> {
                 statusText.isVisible = true
                 statusText.text = getString(R.string.settings_export_progress_text)
             }
+
             StatusText.EXPORT_FAILURE -> {
                 statusText.isVisible = true
                 statusText.text = getString(R.string.settings_export_failure)
@@ -166,6 +170,6 @@ private class ViewHolder(view: View) {
     val exportButton: View = view.findViewById(R.id.exportButton)
     val shareButton: View = view.findViewById(R.id.shareButton)
     val progressBar: View = view.findViewById(R.id.progressBar)
-    val statusText: TextView = view.findViewById(R.id.statusText)
+    val statusText: MaterialTextView = view.findViewById(R.id.statusText)
     val settingsExportList: RecyclerView = view.findViewById(R.id.settingsExportList)
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportListItems.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportListItems.kt
index 1ca6f2133d0..147cfe407d0 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportListItems.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportListItems.kt
@@ -1,8 +1,8 @@
 package com.fsck.k9.ui.settings.export
 
 import android.view.View
-import android.widget.TextView
 import com.fsck.k9.ui.R
+import com.google.android.material.textview.MaterialTextView
 
 private const val GENERAL_SETTINGS_ID = 0L
 private const val ACCOUNT_ITEMS_ID_OFFSET = 1L
@@ -15,8 +15,8 @@ class GeneralSettingsItem : CheckBoxItem<CheckBoxViewHolder>(GENERAL_SETTINGS_ID
 }
 
 class AccountViewHolder(view: View) : CheckBoxViewHolder(view) {
-    val accountDisplayName: TextView = view.findViewById(R.id.accountDisplayName)
-    val accountEmail: TextView = view.findViewById(R.id.accountEmail)
+    val accountDisplayName: MaterialTextView = view.findViewById(R.id.accountDisplayName)
+    val accountEmail: MaterialTextView = view.findViewById(R.id.accountEmail)
 }
 
 class AccountItem(account: SettingsListItem.Account) :
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java
index aa9abf53ba4..466ccdc772f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java
@@ -11,7 +11,6 @@
 import android.view.View.OnLongClickListener;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.DrawableRes;
@@ -34,6 +33,7 @@
 import com.fsck.k9.message.ReplyActionStrategy;
 import com.fsck.k9.message.ReplyActions;
 import com.fsck.k9.ui.R;
+import com.fsck.k9.ui.helper.BottomBaselineTextView;
 import com.fsck.k9.ui.helper.RelativeDateTimeFormatter;
 import com.fsck.k9.ui.messageview.DisplayRecipients;
 import com.fsck.k9.ui.messageview.DisplayRecipientsExtractor;
@@ -41,6 +41,7 @@
 import com.fsck.k9.ui.messageview.MessageViewRecipientFormatter;
 import com.fsck.k9.ui.messageview.RecipientNamesView;
 import com.google.android.material.chip.Chip;
+import com.google.android.material.textview.MaterialTextView;
 
 
 public class MessageHeader extends LinearLayout implements OnClickListener, OnLongClickListener {
@@ -52,13 +53,13 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo
     private final FontSizes fontSizes = K9.getFontSizes();
 
     private Chip accountNameView;
-    private TextView subjectView;
+    private BottomBaselineTextView subjectView;
     private ImageView starView;
     private ImageView contactPictureView;
-    private TextView fromView;
+    private MaterialTextView fromView;
     private ImageView cryptoStatusIcon;
     private RecipientNamesView recipientNamesView;
-    private TextView dateView;
+    private MaterialTextView dateView;
     private ImageView menuPrimaryActionView;
 
     private RelativeDateTimeFormatter relativeDateTimeFormatter;
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java b/app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java
index 2fad4e61dbc..fde5eab35dc 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java
@@ -16,11 +16,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.ContactsContract.Contacts;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
-import androidx.loader.content.Loader;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -31,22 +26,27 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ListPopupWindow;
 import android.widget.ListView;
-import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 import com.fsck.k9.DI;
 import com.fsck.k9.K9;
-import com.fsck.k9.ui.R;
-import com.fsck.k9.helper.ClipboardManager;
 import com.fsck.k9.activity.AlternateRecipientAdapter;
 import com.fsck.k9.activity.AlternateRecipientAdapter.AlternateRecipientListener;
 import com.fsck.k9.activity.compose.RecipientAdapter;
 import com.fsck.k9.activity.compose.RecipientLoader;
+import com.fsck.k9.helper.ClipboardManager;
 import com.fsck.k9.mail.Address;
+import com.fsck.k9.ui.R;
 import com.fsck.k9.ui.compose.RecipientCircleImageView;
 import com.fsck.k9.view.RecipientSelectView.Recipient;
+import com.google.android.material.textview.MaterialTextView;
 import com.tokenautocomplete.TokenCompleteTextView;
-import timber.log.Timber;
 import de.hdodenhof.circleimageview.CircleImageView;
+import timber.log.Timber;
 
 import static com.fsck.k9.FontSizes.FONT_DEFAULT;
 
@@ -627,7 +627,7 @@ private void relayoutView() {
     }
 
     private static class RecipientTokenViewHolder {
-        final TextView vName;
+        final MaterialTextView vName;
         final CircleImageView vContactPhoto;
         final View cryptoStatusRed;
         final View cryptoStatusOrange;
diff --git a/app/ui/legacy/src/main/res/layout/about_library.xml b/app/ui/legacy/src/main/res/layout/about_library.xml
index 4177de52c13..499e4c4ac70 100644
--- a/app/ui/legacy/src/main/res/layout/about_library.xml
+++ b/app/ui/legacy/src/main/res/layout/about_library.xml
@@ -12,7 +12,7 @@
     android:paddingRight="16dp"
     android:paddingBottom="12dp">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
             android:textColor="?android:attr/textColorPrimary"
             tools:text="Android Jetpack libraries" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/license"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/account_list_item.xml b/app/ui/legacy/src/main/res/layout/account_list_item.xml
index 70756aebf55..520f3accef1 100644
--- a/app/ui/legacy/src/main/res/layout/account_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/account_list_item.xml
@@ -34,7 +34,7 @@
             android:paddingStart="24dp"
             android:paddingEnd="16dp">
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
                 android:textAppearance="?android:attr/textAppearanceListItem"
                 tools:text="Personal" />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/email"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/account_setup_composition.xml b/app/ui/legacy/src/main/res/layout/account_setup_composition.xml
index 58340ecb1d4..466c81c6434 100644
--- a/app/ui/legacy/src/main/res/layout/account_setup_composition.xml
+++ b/app/ui/legacy/src/main/res/layout/account_setup_composition.xml
@@ -21,7 +21,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                     android:text="@string/account_settings_name_label"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"
@@ -37,7 +37,7 @@
                     android:contentDescription="@string/account_settings_name_label"
                     />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                     android:text="@string/account_settings_email_label"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"
@@ -54,7 +54,7 @@
                     android:contentDescription="@string/account_settings_email_label"
                     />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                     android:text="@string/account_settings_always_bcc_label"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"
@@ -69,7 +69,7 @@
                     android:layout_width="fill_parent"
                     android:contentDescription="@string/account_settings_always_bcc_label"/>
 
-            <CheckBox
+            <com.google.android.material.checkbox.MaterialCheckBox
                     android:id="@+id/account_signature_use"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -81,7 +81,7 @@
                     android:layout_height="fill_parent"
                     android:orientation="vertical">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                         android:text="@string/account_settings_signature_label"
                         android:layout_height="wrap_content"
                         android:layout_width="fill_parent"
@@ -95,7 +95,7 @@
                         android:layout_width="fill_parent"
                         android:contentDescription="@string/account_settings_signature_label"/>
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                         android:text="@string/account_settings_signature__location_label"
                         android:layout_height="wrap_content"
                         android:layout_width="fill_parent"
@@ -108,14 +108,14 @@
                         android:layout_width="wrap_content"
                         android:orientation="vertical">
 
-                    <RadioButton
+                    <com.google.android.material.radiobutton.MaterialRadioButton
                             android:id="@+id/account_signature_location_before_quoted_text"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/account_settings_signature__location_before_quoted_text"
                             android:contentDescription="@string/account_settings_signature__location_label"/>
 
-                    <RadioButton
+                    <com.google.android.material.radiobutton.MaterialRadioButton
                             android:id="@+id/account_signature_location_after_quoted_text"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/account_spinner_dropdown_item.xml b/app/ui/legacy/src/main/res/layout/account_spinner_dropdown_item.xml
index f7be80a3f4c..b56708d442a 100644
--- a/app/ui/legacy/src/main/res/layout/account_spinner_dropdown_item.xml
+++ b/app/ui/legacy/src/main/res/layout/account_spinner_dropdown_item.xml
@@ -11,7 +11,7 @@
     android:paddingLeft="16dp"
     android:paddingRight="16dp">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
         android:textAppearance="?android:attr/textAppearanceListItem"
         tools:text="Personal" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/email"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/account_spinner_item.xml b/app/ui/legacy/src/main/res/layout/account_spinner_item.xml
index 0f40688bf07..e6c81dfbf95 100644
--- a/app/ui/legacy/src/main/res/layout/account_spinner_item.xml
+++ b/app/ui/legacy/src/main/res/layout/account_spinner_item.xml
@@ -8,7 +8,7 @@
     android:paddingStart="0dp"
     android:paddingEnd="16dp">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
         android:textAppearance="?android:attr/textAppearanceListItem"
         tools:text="Personal" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/email"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/accounts_item.xml b/app/ui/legacy/src/main/res/layout/accounts_item.xml
index 521d029ccd9..2ad9d54d61a 100644
--- a/app/ui/legacy/src/main/res/layout/accounts_item.xml
+++ b/app/ui/legacy/src/main/res/layout/accounts_item.xml
@@ -28,7 +28,7 @@
             android:paddingStart="1dp"
             android:paddingEnd="0dp">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
                 android:textSize="@dimen/appTextSizeMedium"
                 tools:text="@sample/accounts.json/data/name"/>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/email"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/changelog_list_change_item.xml b/app/ui/legacy/src/main/res/layout/changelog_list_change_item.xml
index 55aac9df557..aa74a820eb8 100644
--- a/app/ui/legacy/src/main/res/layout/changelog_list_change_item.xml
+++ b/app/ui/legacy/src/main/res/layout/changelog_list_change_item.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
@@ -16,7 +16,7 @@
         android:textAppearance="?attr/textAppearanceBody2"
         tools:ignore="HardcodedText" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/change_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/changelog_list_release_item.xml b/app/ui/legacy/src/main/res/layout/changelog_list_release_item.xml
index 11df3b67b53..f81d5e0def8 100644
--- a/app/ui/legacy/src/main/res/layout/changelog_list_release_item.xml
+++ b/app/ui/legacy/src/main/res/layout/changelog_list_release_item.xml
@@ -6,7 +6,7 @@
     android:gravity="bottom"
     android:orientation="horizontal">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/version_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -18,7 +18,7 @@
         android:textAppearance="?attr/textAppearanceHeadline6"
         tools:text="Version 1.0.0" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/version_date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/choose_account_item.xml b/app/ui/legacy/src/main/res/layout/choose_account_item.xml
index 5ed88524dc5..29d53f75ae5 100644
--- a/app/ui/legacy/src/main/res/layout/choose_account_item.xml
+++ b/app/ui/legacy/src/main/res/layout/choose_account_item.xml
@@ -13,7 +13,7 @@
         android:layout_width="6dp"
         tools:background="@sample/accounts.json/data/color"/>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/name"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/choose_identity_item.xml b/app/ui/legacy/src/main/res/layout/choose_identity_item.xml
index aef383d880c..3331e16af74 100644
--- a/app/ui/legacy/src/main/res/layout/choose_identity_item.xml
+++ b/app/ui/legacy/src/main/res/layout/choose_identity_item.xml
@@ -10,7 +10,7 @@
     android:paddingStart="12dp"
     android:paddingEnd="4dp">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/name"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         tools:text="Initial identity" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/description"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/crypto_key_transfer.xml b/app/ui/legacy/src/main/res/layout/crypto_key_transfer.xml
index 23a49a3f6d6..6f22f417c48 100644
--- a/app/ui/legacy/src/main/res/layout/crypto_key_transfer.xml
+++ b/app/ui/legacy/src/main/res/layout/crypto_key_transfer.xml
@@ -19,14 +19,14 @@
         android:paddingLeft="12dp"
         android:paddingRight="12dp">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             style="?android:textAppearanceMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:text="@string/ac_transfer_intro" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/transferSendButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -42,14 +42,14 @@
             android:layout_marginTop="24dp"
             android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 style="?android:textAppearanceMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/ac_transfer_will_be_sent"
                 />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/transferAddress1"
                 style="?android:textAppearanceMedium"
                 android:layout_width="wrap_content"
@@ -77,7 +77,7 @@
                 android:layout_margin="8dp"
                 />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 style="?android:textAppearanceMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -107,14 +107,14 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     style="?android:textAppearanceMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/ac_transfer_sending_to"
                     />
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/transferAddress2"
                     style="?android:textAppearanceMedium"
                     android:layout_width="wrap_content"
@@ -142,7 +142,7 @@
                 android:layout_margin="8dp"
                 />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 style="?android:textAppearanceMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -152,7 +152,7 @@
 
         </LinearLayout>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/transferErrorSend"
             style="?android:textAppearanceMedium"
             android:layout_width="wrap_content"
@@ -161,7 +161,7 @@
             tools:visibility="gone"
             />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/transferButtonShowCode"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/dialog_autocrypt_prefer_encrypt.xml b/app/ui/legacy/src/main/res/layout/dialog_autocrypt_prefer_encrypt.xml
index 691a730282c..9c46c71eba7 100644
--- a/app/ui/legacy/src/main/res/layout/dialog_autocrypt_prefer_encrypt.xml
+++ b/app/ui/legacy/src/main/res/layout/dialog_autocrypt_prefer_encrypt.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="24dp"
@@ -20,7 +20,7 @@
             android:text="@string/dialog_autocrypt_mutual_title"
             style="?android:textAppearanceLarge" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="24dp"
@@ -38,13 +38,13 @@
             android:background="?android:selectableItemBackground"
             android:id="@+id/prefer_encrypt">
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@string/dialog_autocrypt_mutual_description_2" />
 
-            <CheckBox
+            <com.google.android.material.checkbox.MaterialCheckBox
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/prefer_encrypt_check"
@@ -53,7 +53,7 @@
 
         </LinearLayout>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="24dp"
diff --git a/app/ui/legacy/src/main/res/layout/dialog_openkeychain_info.xml b/app/ui/legacy/src/main/res/layout/dialog_openkeychain_info.xml
index 564ab89b8ff..170945b2dd1 100644
--- a/app/ui/legacy/src/main/res/layout/dialog_openkeychain_info.xml
+++ b/app/ui/legacy/src/main/res/layout/dialog_openkeychain_info.xml
@@ -7,7 +7,7 @@
     android:padding="24dp"
     tools:context=".settings.account.OpenPgpAppSelectDialog$OpenKeychainInfoFragment">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/dialog_openkeychain_info_text"
diff --git a/app/ui/legacy/src/main/res/layout/edit_identity.xml b/app/ui/legacy/src/main/res/layout/edit_identity.xml
index ca9aaec24f8..c8448fe9bc0 100644
--- a/app/ui/legacy/src/main/res/layout/edit_identity.xml
+++ b/app/ui/legacy/src/main/res/layout/edit_identity.xml
@@ -21,7 +21,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                     android:text="@string/edit_identity_description_label"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"
@@ -36,7 +36,7 @@
                     android:hint="@string/edit_identity_description_hint"
                     />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                     android:text="@string/edit_identity_name_label"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"
@@ -51,7 +51,7 @@
                     android:hint="@string/edit_identity_name_hint"
                     />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                     android:text="@string/edit_identity_email_label"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"
@@ -67,7 +67,7 @@
                     android:hint="@string/edit_identity_email_hint"
                     android:inputType="textEmailAddress"/>
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                     android:text="@string/edit_identity_reply_to_label"
                     android:layout_height="wrap_content"
                     android:layout_width="fill_parent"
@@ -83,8 +83,8 @@
                     android:hint="@string/edit_identity_reply_to_hint"
                     android:inputType="textEmailAddress"
                     />
-            <!-- 
-        <TextView
+            <!--
+        <com.google.android.material.textview.MaterialTextView
             android:text="@string/edit_identity_always_bcc_label"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
@@ -96,7 +96,7 @@
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" />
             -->
-            <CheckBox
+            <com.google.android.material.checkbox.MaterialCheckBox
                     android:id="@+id/signature_use"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -108,7 +108,7 @@
                     android:layout_height="fill_parent"
                     android:orientation="vertical">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                         android:text="@string/edit_identity_signature_label"
                         android:layout_height="wrap_content"
                         android:layout_width="fill_parent"
diff --git a/app/ui/legacy/src/main/res/layout/empty_message_view.xml b/app/ui/legacy/src/main/res/layout/empty_message_view.xml
index 7aa144bad06..70c0d0d5430 100644
--- a/app/ui/legacy/src/main/res/layout/empty_message_view.xml
+++ b/app/ui/legacy/src/main/res/layout/empty_message_view.xml
@@ -3,7 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
@@ -11,4 +11,4 @@
         android:text="@string/message_view_empty"
         android:textColor="?android:attr/textColorSecondary" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/ui/legacy/src/main/res/layout/folder_list_item.xml b/app/ui/legacy/src/main/res/layout/folder_list_item.xml
index 825bcef720d..4ebfe9b20f4 100644
--- a/app/ui/legacy/src/main/res/layout/folder_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/folder_list_item.xml
@@ -19,7 +19,7 @@
         android:layout_marginEnd="32dp"
         tools:srcCompat="@drawable/ic_inbox"/>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/folder_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/fragment_about.xml b/app/ui/legacy/src/main/res/layout/fragment_about.xml
index 2140102104f..37f7c4bcd09 100644
--- a/app/ui/legacy/src/main/res/layout/fragment_about.xml
+++ b/app/ui/legacy/src/main/res/layout/fragment_about.xml
@@ -19,7 +19,7 @@
             android:contentDescription="@null"
             app:srcCompat="@drawable/ic_app_logo" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingHorizontal="16dp"
@@ -56,13 +56,13 @@
                 android:paddingStart="30dp"
                 android:paddingEnd="0dp">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/version"
                     android:textColor="?android:attr/textColorPrimary" />
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/version"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -97,13 +97,13 @@
                 android:paddingStart="30dp"
                 android:paddingEnd="0dp">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/authors"
                     android:textColor="?android:attr/textColorPrimary" />
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/app_authors" />
@@ -137,13 +137,13 @@
                 android:paddingStart="30dp"
                 android:paddingEnd="0dp">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/source_code"
                     android:textColor="?android:attr/textColorPrimary" />
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/app_source_url" />
@@ -177,20 +177,20 @@
                 android:paddingStart="30dp"
                 android:paddingEnd="0dp">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/license"
                     android:textColor="?android:attr/textColorPrimary" />
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/app_license" />
             </LinearLayout>
         </LinearLayout>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingHorizontal="16dp"
@@ -227,13 +227,13 @@
                 android:paddingStart="30dp"
                 android:paddingEnd="0dp">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/about_website_title"
                     android:textColor="?android:attr/textColorPrimary" />
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/app_webpage_url" />
@@ -267,20 +267,20 @@
                 android:paddingStart="30dp"
                 android:paddingEnd="0dp">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/user_forum_title"
                     android:textColor="?android:attr/textColorPrimary" />
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/user_forum_url" />
             </LinearLayout>
         </LinearLayout>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
diff --git a/app/ui/legacy/src/main/res/layout/fragment_changelog.xml b/app/ui/legacy/src/main/res/layout/fragment_changelog.xml
index e21e02f5b2c..78c0b8f09aa 100644
--- a/app/ui/legacy/src/main/res/layout/fragment_changelog.xml
+++ b/app/ui/legacy/src/main/res/layout/fragment_changelog.xml
@@ -33,7 +33,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="gone" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/changelog_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/show_recent_changes_checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/fragment_push_info.xml b/app/ui/legacy/src/main/res/layout/fragment_push_info.xml
index 6d08c169ece..793c47b1192 100644
--- a/app/ui/legacy/src/main/res/layout/fragment_push_info.xml
+++ b/app/ui/legacy/src/main/res/layout/fragment_push_info.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/notificationText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:text="@string/push_info_notification_explanation_text" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/learnMoreButton"
             style="?attr/borderlessButtonStyle"
             android:layout_width="wrap_content"
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/notificationText" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/configureNotificationButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
             app:layout_constraintTop_toBottomOf="@+id/learnMoreButton"
             tools:visibility="visible" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/disablePushText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/configureNotificationButton" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/disablePushButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/fragment_settings_export.xml b/app/ui/legacy/src/main/res/layout/fragment_settings_export.xml
index fbd9553e80a..f99a3bd1579 100644
--- a/app/ui/legacy/src/main/res/layout/fragment_settings_export.xml
+++ b/app/ui/legacy/src/main/res/layout/fragment_settings_export.xml
@@ -26,7 +26,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         tools:ignore="UnusedAttribute">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/exportButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/shareButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
             app:layout_constraintStart_toStartOf="@+id/exportButton"
             app:layout_constraintTop_toTopOf="@+id/exportButton" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/statusText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message.xml b/app/ui/legacy/src/main/res/layout/message.xml
index a91afd8d785..4d6d3ba6d0c 100644
--- a/app/ui/legacy/src/main/res/layout/message.xml
+++ b/app/ui/legacy/src/main/res/layout/message.xml
@@ -37,7 +37,7 @@ the 'message view theme' setting).
                 android:visibility="gone"
                 tools:visibility="visible">
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/show_pictures"
                     style="?attr/materialButtonOutlinedStyle"
                     android:layout_width="wrap_content"
@@ -82,7 +82,7 @@ the 'message view theme' setting).
                         style="@android:style/Widget.Holo.ProgressBar.Horizontal"
                         />
 
-                    <TextView
+                    <com.google.android.material.textview.MaterialTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_below="@id/message_progress"
@@ -105,7 +105,8 @@ the 'message view theme' setting).
 
     </com.fsck.k9.view.NonLockingScrollView>
 
-    <Button android:id="@+id/download_remainder"
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/download_remainder"
         style="?attr/materialButtonOutlinedStyle"
         android:layout_marginHorizontal="16dp"
         android:text="@string/message_view_download_remainder"
diff --git a/app/ui/legacy/src/main/res/layout/message_bottom_sheet.xml b/app/ui/legacy/src/main/res/layout/message_bottom_sheet.xml
index b97430c3e02..edc08729f4a 100644
--- a/app/ui/legacy/src/main/res/layout/message_bottom_sheet.xml
+++ b/app/ui/legacy/src/main/res/layout/message_bottom_sheet.xml
@@ -14,7 +14,7 @@
         android:layout_marginVertical="32dp"
         tools:visibility="gone" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/message_details_error"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
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 90a24508add..672ef7e8137 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
@@ -40,7 +40,7 @@
             app:layout_constraintTop_toBottomOf="@+id/attachment_preview"
             app:tint="?attr/colorAccent" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/attachment_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="filename.ext" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/attachment_size"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_compose_content.xml b/app/ui/legacy/src/main/res/layout/message_compose_content.xml
index f0ab907f29b..3e823e25089 100644
--- a/app/ui/legacy/src/main/res/layout/message_compose_content.xml
+++ b/app/ui/legacy/src/main/res/layout/message_compose_content.xml
@@ -77,7 +77,7 @@ the 'composer theme' setting).
             android:imeOptions="flagNoExtractUi"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/quoted_text_show"
             android:text="@string/message_compose_show_quoted_text_action"
             android:textSize="16sp"
diff --git a/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml b/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
index 4dc8a777629..746379d7c2e 100644
--- a/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
+++ b/app/ui/legacy/src/main/res/layout/message_compose_recipients.xml
@@ -16,11 +16,10 @@
         android:minHeight="50dp"
         android:animateLayoutChanges="true">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:id="@+id/from_label"
             android:paddingTop="8dp"
             android:paddingStart="0dp"
             android:paddingEnd="8dp"
@@ -30,7 +29,7 @@
             style="@style/ComposeTextLabel"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -211,7 +210,7 @@
         android:minHeight="50dp">
 
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingTop="8dp"
@@ -252,7 +251,7 @@
         android:layout_marginRight="12dp"
         android:minHeight="50dp">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
@@ -327,7 +326,7 @@
         android:orientation="horizontal"
         android:minHeight="50dp">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingTop="8dp"
@@ -374,7 +373,7 @@
         android:orientation="horizontal"
         android:minHeight="50dp">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingTop="8dp"
diff --git a/app/ui/legacy/src/main/res/layout/message_container.xml b/app/ui/legacy/src/main/res/layout/message_container.xml
index 3898c4a3d30..cedc6036312 100644
--- a/app/ui/legacy/src/main/res/layout/message_container.xml
+++ b/app/ui/legacy/src/main/res/layout/message_container.xml
@@ -36,7 +36,7 @@
                 android:background="#d55"
                 />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_marginLeft="8dp"
@@ -55,7 +55,7 @@
 
         </LinearLayout>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/message_unsigned_text"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
diff --git a/app/ui/legacy/src/main/res/layout/message_content_crypto_cancelled.xml b/app/ui/legacy/src/main/res/layout/message_content_crypto_cancelled.xml
index 4ef01cdf087..b7ba9ccba4a 100644
--- a/app/ui/legacy/src/main/res/layout/message_content_crypto_cancelled.xml
+++ b/app/ui/legacy/src/main/res/layout/message_content_crypto_cancelled.xml
@@ -19,7 +19,7 @@
             tools:src="@drawable/status_lock_error"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
@@ -32,7 +32,7 @@
 
     </LinearLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -40,7 +40,7 @@
         android:text="@string/messageview_decrypt_cancelled"
         />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -48,4 +48,4 @@
         android:text="@string/messageview_decrypt_retry"
         />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/message_content_crypto_error.xml b/app/ui/legacy/src/main/res/layout/message_content_crypto_error.xml
index 74b6d7b7623..54613115ea7 100644
--- a/app/ui/legacy/src/main/res/layout/message_content_crypto_error.xml
+++ b/app/ui/legacy/src/main/res/layout/message_content_crypto_error.xml
@@ -19,7 +19,7 @@
             tools:src="@drawable/status_lock_error"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
@@ -32,7 +32,7 @@
 
     </LinearLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
@@ -40,4 +40,4 @@
         tools:text="OpenPGP Error Text"
         />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/message_content_crypto_incomplete.xml b/app/ui/legacy/src/main/res/layout/message_content_crypto_incomplete.xml
index 6c65fa9789f..8a67e51a1ba 100644
--- a/app/ui/legacy/src/main/res/layout/message_content_crypto_incomplete.xml
+++ b/app/ui/legacy/src/main/res/layout/message_content_crypto_incomplete.xml
@@ -19,7 +19,7 @@
             tools:src="@drawable/status_lock_error"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
@@ -32,7 +32,7 @@
 
     </LinearLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -40,4 +40,4 @@
         android:layout_marginTop="12dp"
         />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/message_content_crypto_no_provider.xml b/app/ui/legacy/src/main/res/layout/message_content_crypto_no_provider.xml
index caf1f91ba8b..51a10a397ba 100644
--- a/app/ui/legacy/src/main/res/layout/message_content_crypto_no_provider.xml
+++ b/app/ui/legacy/src/main/res/layout/message_content_crypto_no_provider.xml
@@ -6,7 +6,7 @@
     android:gravity="center_horizontal"
     android:padding="16dp">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
@@ -16,7 +16,7 @@
         android:text="@string/crypto_no_provider_title"
         />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -27,7 +27,7 @@
         android:text="@string/crypto_no_provider_message"
         />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -35,4 +35,4 @@
         android:text="@string/crypto_no_provider_button"
         />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/message_crypto_info_dialog.xml b/app/ui/legacy/src/main/res/layout/message_crypto_info_dialog.xml
deleted file mode 100644
index 31597fcb6c2..00000000000
--- a/app/ui/legacy/src/main/res/layout/message_crypto_info_dialog.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:orientation="horizontal"
-    android:layout_gravity="center_horizontal"
-    tools:layout_width="300dp">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:id="@+id/crypto_info_top_icon_1"
-        android:layout_marginEnd="12dp"
-        tools:src="@drawable/ic_check_circle"
-        tools:tint="?attr/openpgp_blue"
-        />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/crypto_info_title"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            tools:text="@string/crypto_msg_title_unencrypted_signed_e2e"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/crypto_info_text"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:text="@string/crypto_msg_encrypted_sign_verified"
-            />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/message_details_crypto_status_item.xml b/app/ui/legacy/src/main/res/layout/message_details_crypto_status_item.xml
index 7daae431575..40fc10f7177 100644
--- a/app/ui/legacy/src/main/res/layout/message_details_crypto_status_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_details_crypto_status_item.xml
@@ -27,7 +27,7 @@
         tools:srcCompat="@drawable/status_lock_dots_3"
         tools:tint="?attr/openpgp_green" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/crypto_status_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@string/crypto_msg_title_encrypted_signed_e2e" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/crypto_status_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_details_date_item.xml b/app/ui/legacy/src/main/res/layout/message_details_date_item.xml
index 2888a4294a7..75f57b5e7ab 100644
--- a/app/ui/legacy/src/main/res/layout/message_details_date_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_details_date_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.textview.MaterialTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/date"
     android:layout_width="match_parent"
diff --git a/app/ui/legacy/src/main/res/layout/message_details_folder_name_item.xml b/app/ui/legacy/src/main/res/layout/message_details_folder_name_item.xml
index 5026de554d9..bfb81f11911 100644
--- a/app/ui/legacy/src/main/res/layout/message_details_folder_name_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_details_folder_name_item.xml
@@ -27,7 +27,7 @@
         app:layout_constraintVertical_bias="0.0"
         tools:srcCompat="@drawable/ic_folder" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/folder_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_details_participant_item.xml b/app/ui/legacy/src/main/res/layout/message_details_participant_item.xml
index 4750ac9aca2..b5c1453dd8d 100644
--- a/app/ui/legacy/src/main/res/layout/message_details_participant_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_details_participant_item.xml
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/top_guideline" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
         app:layout_goneMarginBottom="12dp"
         tools:text="Alice" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/email"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_details_section_header_item.xml b/app/ui/legacy/src/main/res/layout/message_details_section_header_item.xml
index 9e3c855a8db..59558ca4d71 100644
--- a/app/ui/legacy/src/main/res/layout/message_details_section_header_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_details_section_header_item.xml
@@ -7,7 +7,7 @@
     android:focusable="false"
     android:orientation="horizontal">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -15,7 +15,7 @@
         android:textAppearance="?attr/textAppearanceOverline"
         tools:text="To" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/extra"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_list.xml b/app/ui/legacy/src/main/res/layout/message_list.xml
index 23f0c982ab0..f6ca4096ad6 100644
--- a/app/ui/legacy/src/main/res/layout/message_list.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list.xml
@@ -29,7 +29,7 @@
                 android:orientation="vertical"
                 android:layout_marginVertical="@dimen/toolbarTitleMarginVertical">
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/toolbarTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
                     android:textColor="?attr/colorOnSurface"
                     tools:text="Inbox" />
 
-                <TextView
+                <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/toolbarSubtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_list_error.xml b/app/ui/legacy/src/main/res/layout/message_list_error.xml
index 29e116d4134..463f11c4414 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_error.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_error.xml
@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/message_list_error_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
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 d5102008bfd..113078dce11 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
@@ -42,7 +42,7 @@
         app:layout_constraintVertical_bias="0.0"
         tools:src="@drawable/ic_person" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/preview"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -86,7 +86,7 @@
         app:srcCompat="@drawable/ic_reply"
         tools:ignore="RtlSymmetry" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/subject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -102,7 +102,7 @@
         app:layout_constraintTop_toTopOf="@+id/top_guideline"
         tools:text="Subject" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/thread_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -126,7 +126,7 @@
         app:layout_constraintTop_toTopOf="@+id/top_guideline"
         app:srcCompat="@drawable/ic_attachment" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_list_item_footer.xml b/app/ui/legacy/src/main/res/layout/message_list_item_footer.xml
index 365aebdb6d3..309a317e83b 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_item_footer.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_item_footer.xml
@@ -8,7 +8,8 @@
     android:foreground="?attr/selectableItemBackground"
     android:gravity="center"
     android:orientation="horizontal">
-    <TextView
+
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/main_text"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorPrimary"
@@ -17,4 +18,5 @@
         android:gravity="center"
         tools:text="Load up to 100 more"
         />
+
 </LinearLayout>
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 1d3b14e2a0b..6f1063dd9f3 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
@@ -49,7 +49,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/attachment_preview"
                 app:tint="?attr/colorAccent" />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/attachment_name"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
                 app:layout_constraintVertical_chainStyle="packed"
                 tools:text="filename.ext" />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/attachment_size"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
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 158f31f8073..3ff418fe032 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
@@ -35,7 +35,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:tint="?attr/openpgp_red" />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/locked_name"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_chainStyle="packed" />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/locked_info"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_view_header.xml b/app/ui/legacy/src/main/res/layout/message_view_header.xml
index 81be2b25c31..1df4f191c70 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_header.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_header.xml
@@ -86,7 +86,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@drawable/ic_account_circle" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/from"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:text="Sender name" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/message_view_headers.xml b/app/ui/legacy/src/main/res/layout/message_view_headers.xml
index 28a951fce5a..c64c2ac0e13 100644
--- a/app/ui/legacy/src/main/res/layout/message_view_headers.xml
+++ b/app/ui/legacy/src/main/res/layout/message_view_headers.xml
@@ -12,7 +12,7 @@
         android:visibility="gone"
         tools:visibility="visible">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/message_source"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
         android:visibility="gone"
         tools:visibility="gone" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/message_headers_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/openpgp_enabled_error_dialog.xml b/app/ui/legacy/src/main/res/layout/openpgp_enabled_error_dialog.xml
index 9b03f94b9db..1c4fdb8df54 100644
--- a/app/ui/legacy/src/main/res/layout/openpgp_enabled_error_dialog.xml
+++ b/app/ui/legacy/src/main/res/layout/openpgp_enabled_error_dialog.xml
@@ -10,7 +10,7 @@
     android:paddingBottom="24dp"
     tools:context="com.fsck.k9.activity.compose.PgpEnabledErrorDialog">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
@@ -18,7 +18,7 @@
         android:text="@string/openpgp_enabled_error_title"
         />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:textAppearanceSmall"
diff --git a/app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml b/app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml
index 2e1b602b64d..3a80e79d499 100644
--- a/app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml
+++ b/app/ui/legacy/src/main/res/layout/openpgp_encrypt_description_dialog.xml
@@ -27,7 +27,7 @@
             app:tint="@color/light_black"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -39,7 +39,7 @@
 
     </LinearLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:textAppearanceSmall"
@@ -78,7 +78,7 @@
 
     </LinearLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
@@ -87,7 +87,7 @@
         android:text="@string/openpgp_description_text2"
         />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:textAppearanceSmall"
diff --git a/app/ui/legacy/src/main/res/layout/openpgp_inline_dialog.xml b/app/ui/legacy/src/main/res/layout/openpgp_inline_dialog.xml
index d2abecc5b6c..cf1ef65cf19 100644
--- a/app/ui/legacy/src/main/res/layout/openpgp_inline_dialog.xml
+++ b/app/ui/legacy/src/main/res/layout/openpgp_inline_dialog.xml
@@ -25,7 +25,7 @@
             app:tint="@color/light_black"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -37,7 +37,7 @@
 
     </LinearLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:textAppearanceSmall"
@@ -57,7 +57,7 @@
             style="@style/PositiveBulletPoint"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -81,7 +81,7 @@
             style="@style/NegativeBulletPoint"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -106,7 +106,7 @@
             style="@style/NegativeBulletPoint"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/app/ui/legacy/src/main/res/layout/openpgp_sign_only_dialog.xml b/app/ui/legacy/src/main/res/layout/openpgp_sign_only_dialog.xml
index fa5e60736af..1879d31142e 100644
--- a/app/ui/legacy/src/main/res/layout/openpgp_sign_only_dialog.xml
+++ b/app/ui/legacy/src/main/res/layout/openpgp_sign_only_dialog.xml
@@ -26,7 +26,7 @@
             android:scaleType="fitCenter"
             app:tint="@color/light_black" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -38,7 +38,7 @@
 
     </LinearLayout>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:textAppearanceSmall"
@@ -59,7 +59,7 @@
             style="@style/PositiveBulletPoint"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -84,7 +84,7 @@
             style="@style/NegativeBulletPoint"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -109,7 +109,7 @@
             style="@style/NegativeBulletPoint"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -133,7 +133,7 @@
             style="@style/NeutralBulletPoint"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/app/ui/legacy/src/main/res/layout/preference_vibration_switch_item.xml b/app/ui/legacy/src/main/res/layout/preference_vibration_switch_item.xml
index 05ad5edad6e..a429390a079 100644
--- a/app/ui/legacy/src/main/res/layout/preference_vibration_switch_item.xml
+++ b/app/ui/legacy/src/main/res/layout/preference_vibration_switch_item.xml
@@ -41,7 +41,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/switchContainer" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/app/ui/legacy/src/main/res/layout/preference_vibration_times_item.xml b/app/ui/legacy/src/main/res/layout/preference_vibration_times_item.xml
index 4d03b6fa8bd..590510195fe 100644
--- a/app/ui/legacy/src/main/res/layout/preference_vibration_times_item.xml
+++ b/app/ui/legacy/src/main/res/layout/preference_vibration_times_item.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/vibrationTimesValue"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
         android:textColor="?attr/textColorAlertDialogListItem"
         tools:text="2" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/vibrationTimesTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
index 73d2032ce45..a411ea4440f 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml
@@ -32,7 +32,7 @@
             android:layout_weight="1"
             android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/alternate_header_name"
                 android:textColor="?attr/textColorPrimaryRecipientDropdown"
                 android:textAppearance="?android:attr/textAppearanceMedium"
@@ -44,7 +44,7 @@
                 tools:text="Mr. Firstname Lastname"
                 />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/alternate_header_label"
                 android:textColor="?attr/textColorPrimaryRecipientDropdown"
                 android:textAppearance="?android:attr/textAppearanceSmall"
@@ -80,7 +80,7 @@
         android:id="@+id/alternate_container_item"
         >
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/alternate_address_label"
             android:textColor="?attr/textColorSecondaryRecipientDropdown"
             android:textAppearance="?android:attr/textAppearanceSmall"
@@ -92,7 +92,7 @@
             tools:text="Home"
             />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/alternate_address"
             android:textColor="?attr/textColorSecondaryRecipientDropdown"
             android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml b/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml
index 43fd8e64549..6efc1831ff4 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_dropdown_item.xml
@@ -22,7 +22,8 @@
         android:layout_weight="1"
         android:orientation="vertical">
 
-        <TextView android:id="@+id/text1"
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/text1"
             android:textColor="?attr/textColorPrimaryRecipientDropdown"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="wrap_content"
@@ -34,7 +35,8 @@
             tools:text="Mr. Firstname Lastname"
             />
 
-        <TextView android:id="@+id/text2"
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/text2"
             android:textColor="?attr/textColorSecondaryRecipientDropdown"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:layout_width="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/recipient_names.xml b/app/ui/legacy/src/main/res/layout/recipient_names.xml
index 8bb2a8a1a50..568ba340d45 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_names.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_names.xml
@@ -4,7 +4,7 @@
     tools:parentTag="LinearLayout"
     tools:orientation="horizontal">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/recipient_names"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,7 +14,7 @@
         android:textColor="?android:attr/textColorSecondary"
         tools:text="to me" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/recipient_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/recipient_token_item.xml b/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
index 45a2e1f4882..e0ba3c27e9e 100644
--- a/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
+++ b/app/ui/legacy/src/main/res/layout/recipient_token_item.xml
@@ -37,7 +37,7 @@
         app:layout_constraintStart_toStartOf="@+id/contact_photo"
         app:layout_constraintTop_toTopOf="@+id/contact_photo" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@android:id/text1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/settings_export_account_list_item.xml b/app/ui/legacy/src/main/res/layout/settings_export_account_list_item.xml
index 12e0d03f8a2..b9d84b6dcfe 100644
--- a/app/ui/legacy/src/main/res/layout/settings_export_account_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/settings_export_account_list_item.xml
@@ -9,7 +9,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkBox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="&#x200B;" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/accountDisplayName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@sample/accounts.json/data/name" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/accountEmail"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/settings_export_general_list_item.xml b/app/ui/legacy/src/main/res/layout/settings_export_general_list_item.xml
index df2e31c5819..641000488b2 100644
--- a/app/ui/legacy/src/main/res/layout/settings_export_general_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/settings_export_general_list_item.xml
@@ -9,7 +9,7 @@
     android:focusable="true"
     android:minHeight="?android:attr/listPreferredItemHeightSmall">
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkBox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -19,7 +19,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/swipe_left_action.xml b/app/ui/legacy/src/main/res/layout/swipe_left_action.xml
index 7d819a6ec7f..e48c0b44ac8 100644
--- a/app/ui/legacy/src/main/res/layout/swipe_left_action.xml
+++ b/app/ui/legacy/src/main/res/layout/swipe_left_action.xml
@@ -23,7 +23,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_mark_email_unread" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/swipe_action_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/swipe_right_action.xml b/app/ui/legacy/src/main/res/layout/swipe_right_action.xml
index 1672c0961e2..bfa559c3026 100644
--- a/app/ui/legacy/src/main/res/layout/swipe_right_action.xml
+++ b/app/ui/legacy/src/main/res/layout/swipe_right_action.xml
@@ -23,7 +23,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_check" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/swipe_action_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/text_divider_list_item.xml b/app/ui/legacy/src/main/res/layout/text_divider_list_item.xml
index 63a29b9b8ee..d990d4ac8b3 100644
--- a/app/ui/legacy/src/main/res/layout/text_divider_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/text_divider_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.textview.MaterialTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/text"
     android:layout_width="match_parent"
diff --git a/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml b/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml
index a011a0a6640..de3bf1de24e 100644
--- a/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/text_icon_list_item.xml
@@ -26,7 +26,7 @@
             android:padding="8dp"
             app:srcCompat="@drawable/ic_settings" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text"
             android:layout_width="0dip"
             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/main/res/layout/upgrade_databases.xml b/app/ui/legacy/src/main/res/layout/upgrade_databases.xml
index 259a1980007..f623d4d07ab 100644
--- a/app/ui/legacy/src/main/res/layout/upgrade_databases.xml
+++ b/app/ui/legacy/src/main/res/layout/upgrade_databases.xml
@@ -21,7 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/databaseUpgradeText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ViewTestExtensions.kt b/app/ui/legacy/src/test/java/com/fsck/k9/ViewTestExtensions.kt
deleted file mode 100644
index 0f1a3b976d9..00000000000
--- a/app/ui/legacy/src/test/java/com/fsck/k9/ViewTestExtensions.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.fsck.k9
-
-import android.widget.TextView
-
-val TextView.textString: String
-    get() = text.toString()
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt
index 12c919470a2..32f2c710c9a 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt
@@ -7,7 +7,6 @@ import android.view.ContextThemeWrapper
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -25,9 +24,9 @@ import com.fsck.k9.FontSizes.Companion.LARGE
 import com.fsck.k9.UiDensity
 import com.fsck.k9.contacts.ContactPictureLoader
 import com.fsck.k9.mail.Address
-import com.fsck.k9.textString
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.helper.RelativeDateTimeFormatter
+import com.google.android.material.textview.MaterialTextView
 import org.junit.Test
 import org.mockito.kotlin.mock
 import org.robolectric.Robolectric
@@ -481,11 +480,11 @@ class MessageListAdapterTest : RobolectricTest() {
     val View.accountChipView: View get() = findViewById(R.id.account_color_chip)
     val View.starView: View get() = findViewById(R.id.star)
     val View.contactPictureContainerView: View get() = findViewById(R.id.contact_picture_click_area)
-    val View.threadCountView: TextView get() = findViewById(R.id.thread_count)
-    val View.firstLineView: TextView get() = findViewById(R.id.subject)
-    val View.secondLineView: TextView get() = findViewById(R.id.preview)
+    val View.threadCountView: MaterialTextView get() = findViewById(R.id.thread_count)
+    val View.firstLineView: MaterialTextView get() = findViewById(R.id.subject)
+    val View.secondLineView: MaterialTextView get() = findViewById(R.id.preview)
     val View.attachmentCountView: View get() = findViewById(R.id.attachment)
-    val View.dateView: TextView get() = findViewById(R.id.date)
+    val View.dateView: MaterialTextView get() = findViewById(R.id.date)
 
     private fun Assert<View>.isVisible() = given { actual ->
         if (!actual.isVisible) {
@@ -519,4 +518,7 @@ class MessageListAdapterTest : RobolectricTest() {
         val spans = (text as Spannable).getSpans(0, text.length, AbsoluteSizeSpan::class.java)
         spans.firstOrNull()?.size
     }
+
+    private val MaterialTextView.textString: String
+        get() = text.toString()
 }
diff --git a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/OAuthFlowActivity.kt b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/OAuthFlowActivity.kt
index 02c267776cd..038d90c8bfe 100644
--- a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/OAuthFlowActivity.kt
+++ b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/OAuthFlowActivity.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import android.widget.ProgressBar
-import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
@@ -14,6 +13,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import app.k9mail.feature.settings.importing.R
 import com.fsck.k9.preferences.AccountManager
 import com.fsck.k9.ui.base.K9Activity
+import com.google.android.material.textview.MaterialTextView
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.launch
@@ -25,7 +25,7 @@ class OAuthFlowActivity : K9Activity() {
     private val authViewModel: AuthViewModel by viewModel()
     private val accountManager: AccountManager by inject()
 
-    private lateinit var errorText: TextView
+    private lateinit var errorText: MaterialTextView
     private lateinit var signInButton: Button
     private lateinit var signInProgress: ProgressBar
 
diff --git a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/PasswordPromptDialogFragment.kt b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/PasswordPromptDialogFragment.kt
index 5a04bab6b3e..ebb0cc8e04f 100644
--- a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/PasswordPromptDialogFragment.kt
+++ b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/PasswordPromptDialogFragment.kt
@@ -6,15 +6,16 @@ import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.CheckBox
-import android.widget.TextView
 import androidx.constraintlayout.widget.Group
 import androidx.core.os.bundleOf
 import androidx.core.view.isGone
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
 import app.k9mail.feature.settings.importing.R
+import com.google.android.material.checkbox.MaterialCheckBox
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textview.MaterialTextView
 import com.fsck.k9.ui.base.R as BaseR
 
 class PasswordPromptDialogFragment : DialogFragment() {
@@ -64,10 +65,10 @@ class PasswordPromptDialogFragment : DialogFragment() {
         val layoutInflater = LayoutInflater.from(requireContext())
         val view = layoutInflater.inflate(R.layout.password_prompt_dialog, null)
 
-        val passwordPromptIntro: TextView = view.findViewById(R.id.passwordPromptIntro)
-        val incomingServerNameView: TextView = view.findViewById(R.id.incomingServerName)
-        val outgoingServerNameView: TextView = view.findViewById(R.id.outgoingServerName)
-        val useSamePasswordCheckbox: CheckBox = view.findViewById(R.id.useSamePasswordCheckbox)
+        val passwordPromptIntro: MaterialTextView = view.findViewById(R.id.passwordPromptIntro)
+        val incomingServerNameView: MaterialTextView = view.findViewById(R.id.incomingServerName)
+        val outgoingServerNameView: MaterialTextView = view.findViewById(R.id.outgoingServerName)
+        val useSamePasswordCheckbox: MaterialCheckBox = view.findViewById(R.id.useSamePasswordCheckbox)
         val incomingServerGroup: Group = view.findViewById(R.id.incomingServerGroup)
         val outgoingServerGroup: Group = view.findViewById(R.id.outgoingServerGroup)
 
@@ -98,9 +99,9 @@ class PasswordPromptDialogFragment : DialogFragment() {
     }
 
     private fun deliverPasswordPromptResult() {
-        val incomingServerPasswordView: TextView = dialogView.findViewById(R.id.incomingServerPassword)
-        val outgoingServerPasswordView: TextView = dialogView.findViewById(R.id.outgoingServerPassword)
-        val useSamePasswordCheckbox: CheckBox = dialogView.findViewById(R.id.useSamePasswordCheckbox)
+        val incomingServerPasswordView: TextInputEditText = dialogView.findViewById(R.id.incomingServerPassword)
+        val outgoingServerPasswordView: TextInputEditText = dialogView.findViewById(R.id.outgoingServerPassword)
+        val useSamePasswordCheckbox: MaterialCheckBox = dialogView.findViewById(R.id.useSamePasswordCheckbox)
 
         val incomingServerPassword = when {
             !inputIncomingServerPassword -> null
diff --git a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportFragment.kt b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportFragment.kt
index d0a39d0e412..2e8b231ba78 100644
--- a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportFragment.kt
+++ b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportFragment.kt
@@ -6,8 +6,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
 import androidx.core.os.bundleOf
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
@@ -18,6 +16,8 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import app.k9mail.feature.settings.importing.R
 import com.fsck.k9.ui.base.livedata.observeNotNull
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.adapters.ItemAdapter
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -73,10 +73,12 @@ class SettingsImportFragment : Fragment() {
                 importButton.isVisible = true
                 importButton.isEnabled = false
             }
+
             ButtonState.ENABLED -> {
                 importButton.isVisible = true
                 importButton.isEnabled = true
             }
+
             ButtonState.INVISIBLE -> importButton.isInvisible = true
             ButtonState.GONE -> importButton.isGone = true
         }
@@ -98,27 +100,35 @@ class SettingsImportFragment : Fragment() {
             StatusText.IMPORTING_PROGRESS -> {
                 statusText.text = getString(R.string.settings_importing)
             }
+
             StatusText.IMPORT_SUCCESS -> {
                 statusText.text = getString(R.string.settings_import_success_generic)
             }
+
             StatusText.IMPORT_SUCCESS_PASSWORD_REQUIRED -> {
                 statusText.text = getString(R.string.settings_import_password_required)
             }
+
             StatusText.IMPORT_SUCCESS_AUTHORIZATION_REQUIRED -> {
                 statusText.text = getString(R.string.settings_import_authorization_required)
             }
+
             StatusText.IMPORT_SUCCESS_PASSWORD_AND_AUTHORIZATION_REQUIRED -> {
                 statusText.text = getString(R.string.settings_import_authorization_and_password_required)
             }
+
             StatusText.IMPORT_READ_FAILURE -> {
                 statusText.text = getString(R.string.settings_import_read_failure)
             }
+
             StatusText.IMPORT_PARTIAL_FAILURE -> {
                 statusText.text = getString(R.string.settings_import_partial_failure)
             }
+
             StatusText.IMPORT_FAILURE -> {
                 statusText.text = getString(R.string.settings_import_failure)
             }
+
             StatusText.HIDDEN -> statusText.text = null
         }
 
@@ -253,9 +263,9 @@ class SettingsImportFragment : Fragment() {
 private class ViewHolder(view: View) {
     val pickDocumentButton: View = view.findViewById(R.id.pickDocumentButton)
     val importButton: View = view.findViewById(R.id.importButton)
-    val closeButton: Button = view.findViewById(R.id.closeButton)
+    val closeButton: MaterialButton = view.findViewById(R.id.closeButton)
     val loadingProgressBar: View = view.findViewById(R.id.loadingProgressBar)
     val importProgressBar: View = view.findViewById(R.id.importProgressBar)
-    val statusText: TextView = view.findViewById(R.id.statusText)
+    val statusText: MaterialTextView = view.findViewById(R.id.statusText)
     val settingsImportList: RecyclerView = view.findViewById(R.id.settingsImportList)
 }
diff --git a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportListItems.kt b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportListItems.kt
index 42e2b7a6564..617d737761c 100644
--- a/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportListItems.kt
+++ b/feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/SettingsImportListItems.kt
@@ -1,12 +1,12 @@
 package app.k9mail.feature.settings.import.ui
 
 import android.view.View
-import android.widget.CheckBox
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import app.k9mail.feature.settings.importing.R
+import com.google.android.material.checkbox.MaterialCheckBox
+import com.google.android.material.textview.MaterialTextView
 import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.items.AbstractItem
 import com.mikepenz.fastadapter.listeners.ClickEventHook
@@ -54,7 +54,7 @@ internal abstract class ImportListItem<VH : ImportCheckBoxViewHolder>(
 }
 
 internal open class ImportCheckBoxViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    val checkBox: CheckBox = itemView.findViewById(R.id.checkBox)
+    val checkBox: MaterialCheckBox = itemView.findViewById(R.id.checkBox)
     val statusIcon: ImageView = itemView.findViewById(R.id.statusIcon)
 }
 
@@ -84,7 +84,7 @@ internal class GeneralSettingsItem(importStatus: ImportStatus) :
 }
 
 internal class AccountViewHolder(view: View) : ImportCheckBoxViewHolder(view) {
-    val accountDisplayName: TextView = view.findViewById(R.id.accountDisplayName)
+    val accountDisplayName: MaterialTextView = view.findViewById(R.id.accountDisplayName)
 }
 
 internal class AccountItem(account: SettingsListItem.Account) :
diff --git a/feature/settings/import/src/main/res/layout/account_setup_oauth.xml b/feature/settings/import/src/main/res/layout/account_setup_oauth.xml
index e6ee436c9de..00f70072ce3 100644
--- a/feature/settings/import/src/main/res/layout/account_setup_oauth.xml
+++ b/feature/settings/import/src/main/res/layout/account_setup_oauth.xml
@@ -24,14 +24,14 @@
             android:gravity="center_horizontal"
             android:orientation="vertical">
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="24dp"
                 android:text="@string/settings_import_oauth_description"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/oauth_sign_in_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -56,7 +56,7 @@
                 android:layout_height="wrap_content"
                 android:visibility="gone" />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/error_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/feature/settings/import/src/main/res/layout/fragment_settings_import.xml b/feature/settings/import/src/main/res/layout/fragment_settings_import.xml
index c21d12dd26b..e88734043be 100644
--- a/feature/settings/import/src/main/res/layout/fragment_settings_import.xml
+++ b/feature/settings/import/src/main/res/layout/fragment_settings_import.xml
@@ -19,7 +19,7 @@
         tools:listitem="@layout/settings_import_account_list_item"
         tools:itemCount="3" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/pickDocumentButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -54,7 +54,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         tools:ignore="UnusedAttribute">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/importButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@id/buttonBarrier" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/closeButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
             app:layout_constraintStart_toStartOf="@+id/importButton"
             app:layout_constraintTop_toTopOf="@+id/importButton" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/statusText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/feature/settings/import/src/main/res/layout/password_prompt_dialog.xml b/feature/settings/import/src/main/res/layout/password_prompt_dialog.xml
index 64600c31a25..c5e35c3d28f 100644
--- a/feature/settings/import/src/main/res/layout/password_prompt_dialog.xml
+++ b/feature/settings/import/src/main/res/layout/password_prompt_dialog.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:padding="16dp">
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/passwordPromptIntro"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/incomingServerName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/incomingServerPasswordLayout" />
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/useSamePasswordCheckbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:id="@+id/outgoingServerName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/feature/settings/import/src/main/res/layout/settings_import_account_list_item.xml b/feature/settings/import/src/main/res/layout/settings_import_account_list_item.xml
index 6faed2b7411..56da108f62d 100644
--- a/feature/settings/import/src/main/res/layout/settings_import_account_list_item.xml
+++ b/feature/settings/import/src/main/res/layout/settings_import_account_list_item.xml
@@ -9,7 +9,7 @@
     android:focusable="true"
     android:minHeight="?android:attr/listPreferredItemHeightSmall">
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkBox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/accountDisplayName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/feature/settings/import/src/main/res/layout/settings_import_general_list_item.xml b/feature/settings/import/src/main/res/layout/settings_import_general_list_item.xml
index 2736a7b06cb..679751ba9ca 100644
--- a/feature/settings/import/src/main/res/layout/settings_import_general_list_item.xml
+++ b/feature/settings/import/src/main/res/layout/settings_import_general_list_item.xml
@@ -8,7 +8,7 @@
     android:focusable="true"
     android:minHeight="?android:attr/listPreferredItemHeightSmall">
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkBox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"