diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index b6dcb6023e..4452c3c2fd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -62,6 +62,7 @@ public class FragmentSetup extends FragmentBase {
 
     private Button btnHelp;
     private Button btnQuick;
+    private TextView tvQuickRemark;
 
     private TextView tvAccountDone;
     private Button btnAccount;
@@ -106,6 +107,7 @@ public class FragmentSetup extends FragmentBase {
 
         btnHelp = view.findViewById(R.id.btnHelp);
         btnQuick = view.findViewById(R.id.btnQuick);
+        tvQuickRemark = view.findViewById(R.id.tvQuickRemark);
 
         tvAccountDone = view.findViewById(R.id.tvAccountDone);
         btnAccount = view.findViewById(R.id.btnAccount);
@@ -249,6 +251,8 @@ public class FragmentSetup extends FragmentBase {
         });
 
         // Initialize
+        tvQuickRemark.setVisibility(View.GONE);
+
         tvAccountDone.setText(null);
         tvAccountDone.setCompoundDrawables(null, null, null, null);
         tvNoPrimaryDrafts.setVisibility(View.GONE);
@@ -325,6 +329,8 @@ public class FragmentSetup extends FragmentBase {
 
                 getActivity().invalidateOptionsMenu();
 
+                tvQuickRemark.setVisibility(done ? View.VISIBLE : View.GONE);
+
                 tvAccountDone.setText(done ? R.string.title_setup_done : R.string.title_setup_to_do);
                 tvAccountDone.setTextColor(done ? textColorPrimary : colorWarning);
                 tvAccountDone.setCompoundDrawablesWithIntrinsicBounds(done ? check : null, null, null, null);
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 34822e2a89..0402c47975 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -106,6 +106,17 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvQuick" />
 
+        <TextView
+            android:id="@+id/tvQuickRemark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="@string/title_setup_wizard_remark"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btnQuick" />
+
         <!-- account -->
 
         <View
@@ -116,7 +127,7 @@
             android:background="?attr/colorSeparator"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnQuick" />
+            app:layout_constraintTop_toBottomOf="@id/tvQuickRemark" />
 
         <ImageView
             android:id="@+id/one"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88e20ce978..c39d87c6bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -135,6 +135,7 @@
     <string name="title_setup_quick_smtp">SMTP server to send messages</string>
     <string name="title_setup_go">Go</string>
     <string name="title_setup_wizard">Wizard</string>
+    <string name="title_setup_wizard_remark">Go \'back\' to go to the inbox</string>
     <string name="title_setup_gmail" translatable="false">Gmail</string>
     <string name="title_setup_other">Other provider</string>
     <string name="title_setup_gmail_support">Authorizing Google accounts will work in official versions only because Android checks the app signature</string>