diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 943fb3c069..610d51474b 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -196,6 +196,24 @@
             app:layout_constraintStart_toEndOf="@id/tvSmtp"
             app:layout_constraintTop_toBottomOf="@id/tvIdentity" />
 
+        <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/tvAccountIdentity"
+            android:layout_width="0dp"
+            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/tvIdentityWhat"
             android:layout_width="wrap_content"
@@ -205,7 +223,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorLink"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAliases" />
+            app:layout_constraintTop_toBottomOf="@id/tvAccountIdentity" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvNoComposable"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a6eb49487..a8a047956c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,8 +168,7 @@
     <string name="title_setup_manual">Manual setup</string>
     <string name="title_setup_account_remark">To receive email</string>
     <string name="title_setup_identity_remark">To send email</string>
-    <string name="title_setup_account_hint">To change color, swipe left/right target folder, etc</string>
-    <string name="title_setup_identity_hint">To change name, color, signature, etc</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>
     <string name="title_setup_accounts">Accounts</string>
     <string name="title_setup_identities">Identities</string>
     <string name="title_setup_gmail" translatable="false">Gmail</string>