diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 68535ee5d6..1d9d21c53e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -51,6 +51,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
+import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Observer;
@@ -71,6 +72,7 @@ public class FragmentSetup extends FragmentBase {
 
     private ImageButton ibManual;
     private TextView tvManual;
+    private CardView cardManual;
 
     private Button btnAccount;
 
@@ -94,7 +96,6 @@ public class FragmentSetup extends FragmentBase {
 
     private Button btnInbox;
 
-    private Group grpManual;
     private Group grpBackgroundRestricted;
     private Group grpDataSaver;
 
@@ -129,6 +130,7 @@ public class FragmentSetup extends FragmentBase {
 
         ibManual = view.findViewById(R.id.ibManual);
         tvManual = view.findViewById(R.id.tvManual);
+        cardManual = view.findViewById(R.id.cardManual);
 
         btnAccount = view.findViewById(R.id.btnAccount);
 
@@ -152,7 +154,6 @@ public class FragmentSetup extends FragmentBase {
 
         btnInbox = view.findViewById(R.id.btnInbox);
 
-        grpManual = view.findViewById(R.id.grpManual);
         grpBackgroundRestricted = view.findViewById(R.id.grpBackgroundRestricted);
         grpDataSaver = view.findViewById(R.id.grpDataSaver);
 
@@ -581,7 +582,7 @@ public class FragmentSetup extends FragmentBase {
         }
 
         ibManual.setImageLevel(manual ? 0 /* less */ : 1 /* more */);
-        grpManual.setVisibility(manual ? View.VISIBLE : View.GONE);
+        cardManual.setVisibility(manual ? View.VISIBLE : View.GONE);
     }
 
     @Override
diff --git a/app/src/main/res/color/background_warning.xml b/app/src/main/res/color/background_warning.xml
new file mode 100644
index 0000000000..836888b22e
--- /dev/null
+++ b/app/src/main/res/color/background_warning.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="0.1" android:color="?attr/colorWarning" />
+</selector>
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 7e62f82e52..99a0814cd3 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -234,175 +234,190 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="@id/ibManual" />
 
-                <View
-                    android:id="@+id/vSeparatorManualTop"
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:background="?attr/colorSeparator"
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/cardManual"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="3dp"
+                    app:cardBackgroundColor="@color/background_warning"
+                    app:cardCornerRadius="6dp"
+                    app:cardElevation="0dp"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ibManual" />
+                    app:layout_constraintTop_toBottomOf="@id/ibManual">
 
-                <androidx.constraintlayout.widget.Guideline
-                    android:id="@+id/guideline_center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:layout_constraintGuide_percent="0.5" />
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingHorizontal="6dp"
+                        android:paddingVertical="6dp">
 
-                <Button
-                    android:id="@+id/btnAccount"
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_account_circle_24"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_setup_accounts"
-                    app:layout_constraintEnd_toStartOf="@+id/guideline_center"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/vSeparatorManualTop" />
+                        <androidx.constraintlayout.widget.Guideline
+                            android:id="@+id/guideline_center"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            app:layout_constraintGuide_percent="0.5" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvAccount"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
-                    android:layout_marginEnd="6dp"
-                    android:text="@string/title_setup_account_remark"
-                    android:textAlignment="center"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    app:layout_constraintEnd_toStartOf="@+id/guideline_center"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnAccount" />
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/classic"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/title_setup_classic"
+                            android:textAlignment="center"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                            android:textStyle="bold"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvImap"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/title_imap"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    app:layout_constraintEnd_toStartOf="@+id/tvPop"
-                    app:layout_constraintHorizontal_chainStyle="packed"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvAccount" />
+                        <Button
+                            android:id="@+id/btnAccount"
+                            style="?android:attr/buttonStyleSmall"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:drawableEnd="@drawable/twotone_account_circle_24"
+                            android:drawablePadding="6dp"
+                            android:text="@string/title_setup_accounts"
+                            app:layout_constraintEnd_toStartOf="@+id/guideline_center"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/classic" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvPop"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
-                    android:text="@string/title_pop3"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    app:layout_constraintEnd_toStartOf="@+id/guideline_center"
-                    app:layout_constraintHorizontal_chainStyle="packed"
-                    app:layout_constraintStart_toEndOf="@id/tvImap"
-                    app:layout_constraintTop_toBottomOf="@id/tvAccount" />
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/tvAccount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="6dp"
+                            android:layout_marginEnd="6dp"
+                            android:text="@string/title_setup_account_remark"
+                            android:textAlignment="center"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                            app:layout_constraintEnd_toStartOf="@+id/guideline_center"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/btnAccount" />
 
-                <Button
-                    android:id="@+id/btnIdentity"
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_person_24"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_setup_identities"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/guideline_center"
-                    app:layout_constraintTop_toBottomOf="@id/vSeparatorManualTop" />
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/tvImap"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/title_imap"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                            app:layout_constraintEnd_toStartOf="@+id/tvPop"
+                            app:layout_constraintHorizontal_chainStyle="packed"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/tvAccount" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvIdentity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
-                    android:layout_marginEnd="6dp"
-                    android:text="@string/title_setup_identity_remark"
-                    android:textAlignment="center"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/guideline_center"
-                    app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/tvPop"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="6dp"
+                            android:text="@string/title_pop3"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                            app:layout_constraintEnd_toStartOf="@+id/guideline_center"
+                            app:layout_constraintHorizontal_chainStyle="packed"
+                            app:layout_constraintStart_toEndOf="@id/tvImap"
+                            app:layout_constraintTop_toBottomOf="@id/tvAccount" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvSmtp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/title_smtp"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    app:layout_constraintEnd_toStartOf="@+id/tvAliases"
-                    app:layout_constraintHorizontal_chainStyle="packed"
-                    app:layout_constraintStart_toEndOf="@id/guideline_center"
-                    app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
+                        <Button
+                            android:id="@+id/btnIdentity"
+                            style="?android:attr/buttonStyleSmall"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:drawableEnd="@drawable/twotone_person_24"
+                            android:drawablePadding="6dp"
+                            android:text="@string/title_setup_identities"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/guideline_center"
+                            app:layout_constraintTop_toBottomOf="@id/classic" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvAliases"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
-                    android:text="@string/title_aliases"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_chainStyle="packed"
-                    app:layout_constraintStart_toEndOf="@id/tvSmtp"
-                    app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/tvIdentity"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="6dp"
+                            android:layout_marginEnd="6dp"
+                            android:text="@string/title_setup_identity_remark"
+                            android:textAlignment="center"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@id/guideline_center"
+                            app:layout_constraintTop_toBottomOf="@id/btnIdentity" />
 
-                <androidx.constraintlayout.widget.Barrier
-                    android:id="@+id/barrier_manual"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    app:barrierDirection="bottom"
-                    app:constraint_referenced_ids="tvImap,tvPop,tvSmtp,tvAliases" />
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/tvSmtp"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/title_smtp"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                            app:layout_constraintEnd_toStartOf="@+id/tvAliases"
+                            app:layout_constraintHorizontal_chainStyle="packed"
+                            app:layout_constraintStart_toEndOf="@id/guideline_center"
+                            app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvAccountIdentity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:text="@string/title_setup_account_identity_hint"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/barrier_manual" />
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/tvAliases"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="6dp"
+                            android:text="@string/title_aliases"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintHorizontal_chainStyle="packed"
+                            app:layout_constraintStart_toEndOf="@id/tvSmtp"
+                            app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvExchangeSupport"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_open_in_new_12"
-                    android:drawablePadding="6dp"
-                    android:drawableTint="?android:attr/textColorLink"
-                    android:text="@string/title_setup_exchange_support"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?android:attr/textColorLink"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvAccountIdentity" />
+                        <androidx.constraintlayout.widget.Barrier
+                            android:id="@+id/barrier_manual"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:barrierDirection="bottom"
+                            app:constraint_referenced_ids="tvImap,tvPop,tvSmtp,tvAliases" />
 
-                <eu.faircode.email.FixedTextView
-                    android:id="@+id/tvIdentityWhat"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_open_in_new_12"
-                    android:drawablePadding="6dp"
-                    android:drawableTint="?android:attr/textColorLink"
-                    android:text="@string/title_setup_identity_what"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?android:attr/textColorLink"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvExchangeSupport" />
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/tvAccountIdentity"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:text="@string/title_setup_account_identity_hint"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/barrier_manual" />
 
-                <View
-                    android:id="@+id/vSeparatorManualBottom"
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="12dp"
-                    android:background="?attr/colorSeparator"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvIdentityWhat" />
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/tvExchangeSupport"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:drawableEnd="@drawable/twotone_open_in_new_12"
+                            android:drawablePadding="6dp"
+                            android:drawableTint="?android:attr/textColorLink"
+                            android:text="@string/title_setup_exchange_support"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                            android:textColor="?android:attr/textColorLink"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/tvAccountIdentity" />
+
+                        <eu.faircode.email.FixedTextView
+                            android:id="@+id/tvIdentityWhat"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:drawableEnd="@drawable/twotone_open_in_new_12"
+                            android:drawablePadding="6dp"
+                            android:drawableTint="?android:attr/textColorLink"
+                            android:text="@string/title_setup_identity_what"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                            android:textColor="?android:attr/textColorLink"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/tvExchangeSupport" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </androidx.cardview.widget.CardView>
 
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvNoComposable"
@@ -413,7 +428,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textColor="?attr/colorWarning"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/vSeparatorManualBottom" />
+                    app:layout_constraintTop_toBottomOf="@id/cardManual" />
 
                 <Button
                     android:id="@+id/btnInbox"
@@ -442,17 +457,6 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/btnInbox" />
-
-                <androidx.constraintlayout.widget.Group
-                    android:id="@+id/grpManual"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    app:constraint_referenced_ids="
-                        vSeparatorManualTop,
-                        btnAccount,tvAccount,tvImap,tvPop,
-                        btnIdentity,tvIdentity,tvSmtp,tvAliases,
-                        tvAccountIdentity,tvExchangeSupport,tvIdentityWhat,
-                        vSeparatorManualBottom" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd48d1a262..9e33308163 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -169,6 +169,7 @@
     <string name="title_setup_wizard_multiple">The wizard can be used multiple times to set up multiple accounts</string>
     <string name="title_setup_wizard_new">I need a new email address</string>
     <string name="title_setup_manual">Manual setup and account options</string>
+    <string name="title_setup_classic">Classic configuration</string>
     <string name="title_setup_account_remark">Receive email</string>
     <string name="title_setup_identity_remark">Send email</string>
     <string name="title_setup_account_identity_hint">You can configure the name, color and swipe actions in the account settings, and configure a signature in the identity settings</string>