diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 0641b099e6..dbd0fbadbe 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -367,7 +367,7 @@ public class FragmentFolder extends FragmentEx {
             protected void onExecuted(Bundle args, EntityFolder folder) {
                 if (savedInstanceState == null) {
                     etName.setText(folder == null ? null : folder.name);
-                    etDisplay.setText(folder == null ? null : (folder.display == null ? folder.name : folder.display));
+                    etDisplay.setText(folder == null ? null : folder.display);
                     etDisplay.setHint(folder == null ? null : folder.name);
                     cbHide.setChecked(folder == null ? false : folder.hide);
                     cbUnified.setChecked(folder == null ? false : folder.unified);
@@ -386,6 +386,7 @@ public class FragmentFolder extends FragmentEx {
                 pbWait.setVisibility(View.GONE);
                 Helper.setViewsEnabled(view, true);
                 etName.setEnabled(folder == null);
+                etDisplay.setEnabled(folder == null || !EntityFolder.INBOX.equals(folder.type));
                 cbPoll.setEnabled(cbSynchronize.isChecked());
                 cbDownload.setEnabled(cbSynchronize.isChecked());
                 btnSave.setEnabled(true);
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 4bed14ad15..a2d96eeda9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -774,11 +774,11 @@ public class FragmentSetup extends FragmentEx {
                         .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                EditText etPassword1 = dview.findViewById(R.id.etPassword1);
-                                EditText etPassword2 = dview.findViewById(R.id.etPassword2);
+                                TextInputLayout etPassword1 = dview.findViewById(R.id.tilPassword1);
+                                TextInputLayout etPassword2 = dview.findViewById(R.id.tilPassword2);
 
-                                String password1 = etPassword1.getText().toString();
-                                String password2 = etPassword2.getText().toString();
+                                String password1 = etPassword1.getEditText().getText().toString();
+                                String password2 = etPassword2.getEditText().getText().toString();
 
                                 if (TextUtils.isEmpty(password1))
                                     Snackbar.make(view, R.string.title_setup_password_missing, Snackbar.LENGTH_LONG).show();
diff --git a/app/src/main/res/layout/dialog_keyword.xml b/app/src/main/res/layout/dialog_keyword.xml
index 90e40e5fcc..6dceddd018 100644
--- a/app/src/main/res/layout/dialog_keyword.xml
+++ b/app/src/main/res/layout/dialog_keyword.xml
@@ -19,6 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Keyword"
+        android:inputType="text"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvKeyword" />
diff --git a/app/src/main/res/layout/dialog_link.xml b/app/src/main/res/layout/dialog_link.xml
index da0a63cca7..14d25ac1ea 100644
--- a/app/src/main/res/layout/dialog_link.xml
+++ b/app/src/main/res/layout/dialog_link.xml
@@ -18,6 +18,7 @@
         android:id="@+id/etLink"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:inputType="textUri"
         android:text="https://email.faircode.eu/"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index acf1f2f004..7286a93ceb 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -5,42 +5,40 @@
     android:layout_height="wrap_content"
     android:padding="12dp">
 
-    <TextView
-        android:id="@+id/tvPassword1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/title_setup_password"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <EditText
-        android:id="@+id/etPassword1"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilPassword1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="textPassword"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvPassword1" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:passwordToggleEnabled="true">
 
-    <TextView
-        android:id="@+id/tvPassword2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:text="@string/title_setup_password_repeat"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/etPassword1" />
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="password"
+            android:hint="@string/title_setup_password"
+            android:inputType="textPassword"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <EditText
-        android:id="@+id/etPassword2"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilPassword2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="textPassword"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvPassword2" />
+        app:layout_constraintTop_toBottomOf="@id/tilPassword1"
+        app:passwordToggleEnabled="true">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autofillHints="password"
+            android:hint="@string/title_setup_password_repeat"
+            android:inputType="textPassword"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+    </com.google.android.material.textfield.TextInputLayout>
+
 
     <TextView
         android:layout_width="wrap_content"
@@ -49,5 +47,5 @@
         android:text="@string/title_setup_import_do"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/etPassword2" />
+        app:layout_constraintTop_toBottomOf="@id/tilPassword2" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 7de3f39020..774a42d337 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -248,7 +248,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/title_optional"
-            android:inputType="text"
+            android:inputType="textCapSentences"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvNameRemark" />
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 1690e1602f..adb301f707 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -50,6 +50,7 @@
                 android:id="@+id/etExtra"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:inputType="text"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 app:layout_constraintEnd_toStartOf="@+id/tvExtraSuffix"
                 app:layout_constraintStart_toEndOf="@id/tvExtraPrefix"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 41edb244f5..29ba104d6a 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -14,7 +14,7 @@
         android:padding="12dp">
 
         <TextView
-            android:id="@+id/tvRename"
+            android:id="@+id/tvName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
@@ -27,11 +27,11 @@
             android:id="@+id/etName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="text"
+            android:inputType="textCapSentences"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvRename" />
+            app:layout_constraintTop_toBottomOf="@id/tvName" />
 
         <TextView
             android:id="@+id/tvDisplay"
@@ -47,8 +47,7 @@
             android:id="@+id/etDisplay"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/title_optional"
-            android:inputType="text"
+            android:inputType="textCapSentences"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 81e9876125..67f19b87a3 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -47,7 +47,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autofillHints="name"
-            android:inputType="textCapSentences"
+            android:inputType="textPersonName"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvName" />
@@ -92,7 +92,7 @@
             android:layout_height="wrap_content"
             android:autofillHints="name"
             android:hint="@string/title_optional"
-            android:inputType="textCapSentences"
+            android:inputType="textPersonName"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDisplay" />
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 4e1282a25a..7dd80af429 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -28,7 +28,7 @@
             android:layout_marginEnd="12dp"
             android:autofillHints="name"
             android:hint="@string/title_identity_name"
-            android:inputType="textCapSentences"
+            android:inputType="textPersonName"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ibHelp" />