diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index ab7d65274f..46ae8b246b 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -395,6 +395,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/etRealm" />
 
+        <TextView
+            android:id="@+id/tvUseIpHint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/title_identity_use_ip_hint"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbUseIp" />
+
         <CheckBox
             android:id="@+id/cbSynchronize"
             android:layout_width="wrap_content"
@@ -402,7 +412,7 @@
             android:layout_marginTop="12dp"
             android:text="@string/title_synchronize_identity"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbUseIp" />
+            app:layout_constraintTop_toBottomOf="@id/tvUseIpHint" />
 
         <CheckBox
             android:id="@+id/cbPrimary"
@@ -587,7 +597,7 @@
             tvSmtp,tvHost,etHost,cbStartTls,cbInsecure,tvPort,etPort,
             tvUser,etUser,tvPassword,tilPassword,
             tvRealm,etRealm,
-            cbUseIp,
+            cbUseIp,tvUseIpHint,
             cbSynchronize,cbPrimary,
             tvReplyTo,etReplyTo,tvBcc,etBcc,
             cbPlainOnly,cbEncrypt,cbDeliveryReceipt,cbReadReceipt,tvReceipt,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f3677749b..3b5617b497 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,6 +203,7 @@
     <string name="title_identity_reply_to">Reply to address</string>
     <string name="title_identity_plain_text">Send plain text only</string>
     <string name="title_identity_encrypt">Encrypt by default</string>
+    <string name="title_identity_use_ip_hint">In case of \'invalid greeting\', \'requires valid address\' or a similar error, try to change this setting</string>
     <string name="title_identity_read_receipt">Request read receipt</string>
     <string name="title_identity_delivery_receipt">Request delivery receipt</string>
     <string name="title_identity_receipt_remark">Most providers ignore receipt requests</string>