diff --git a/FAQ.md b/FAQ.md
index 7df71b4707..f2a94e02a6 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -467,7 +467,7 @@ You can pin the certificate too, see above.
 
 *Empty password*
 
-Your username is likely easily guessed, so this is insecure.
+Your username is likely easily guessed, so this is pretty insecure, unless the SMTP server is available via a restricted local network or a VPN only.
 
 *Plain text connection*
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index eaffae116d..d095df5d81 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -88,6 +88,7 @@ public class FragmentAccount extends FragmentBase {
     private EditText etHost;
     private RadioGroup rgEncryption;
     private CheckBox cbInsecure;
+    private TextView tvInsecureRemark;
     private EditText etPort;
     private EditText etUser;
     private TextInputLayout tilPassword;
@@ -194,6 +195,7 @@ public class FragmentAccount extends FragmentBase {
         etPort = view.findViewById(R.id.etPort);
         rgEncryption = view.findViewById(R.id.rgEncryption);
         cbInsecure = view.findViewById(R.id.cbInsecure);
+        tvInsecureRemark = view.findViewById(R.id.tvInsecureRemark);
         etUser = view.findViewById(R.id.etUser);
         tilPassword = view.findViewById(R.id.tilPassword);
         tvCharacters = view.findViewById(R.id.tvCharacters);
@@ -318,6 +320,13 @@ public class FragmentAccount extends FragmentBase {
             }
         });
 
+        tvInsecureRemark.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.viewFAQ(v.getContext(), 4);
+            }
+        });
+
         tilPassword.getEditText().addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index fa6f308691..7b87e55388 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -94,6 +94,7 @@ public class FragmentIdentity extends FragmentBase {
     private EditText etHost;
     private RadioGroup rgEncryption;
     private CheckBox cbInsecure;
+    private TextView tvInsecureRemark;
     private EditText etPort;
     private EditText etUser;
     private TextInputLayout tilPassword;
@@ -192,6 +193,7 @@ public class FragmentIdentity extends FragmentBase {
         etHost = view.findViewById(R.id.etHost);
         rgEncryption = view.findViewById(R.id.rgEncryption);
         cbInsecure = view.findViewById(R.id.cbInsecure);
+        tvInsecureRemark = view.findViewById(R.id.tvInsecureRemark);
         etPort = view.findViewById(R.id.etPort);
         etUser = view.findViewById(R.id.etUser);
         tilPassword = view.findViewById(R.id.tilPassword);
@@ -429,6 +431,13 @@ public class FragmentIdentity extends FragmentBase {
             }
         });
 
+        tvInsecureRemark.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.viewFAQ(v.getContext(), 4);
+            }
+        });
+
         btnCertificate.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java
index e376ba6a03..d406a2882e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPop.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPop.java
@@ -73,6 +73,7 @@ public class FragmentPop extends FragmentBase {
     private EditText etHost;
     private RadioGroup rgEncryption;
     private CheckBox cbInsecure;
+    private TextView tvInsecureRemark;
     private EditText etPort;
     private EditText etUser;
     private TextInputLayout tilPassword;
@@ -137,6 +138,7 @@ public class FragmentPop extends FragmentBase {
         etPort = view.findViewById(R.id.etPort);
         rgEncryption = view.findViewById(R.id.rgEncryption);
         cbInsecure = view.findViewById(R.id.cbInsecure);
+        tvInsecureRemark = view.findViewById(R.id.tvInsecureRemark);
         etUser = view.findViewById(R.id.etUser);
         tilPassword = view.findViewById(R.id.tilPassword);
         tvCharacters = view.findViewById(R.id.tvCharacters);
@@ -177,6 +179,13 @@ public class FragmentPop extends FragmentBase {
             }
         });
 
+        tvInsecureRemark.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.viewFAQ(v.getContext(), 4);
+            }
+        });
+
         tilPassword.getEditText().addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 3876d454de..01f1f731f4 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -188,12 +188,15 @@
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvInsecureRemark"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
+            android:drawableEnd="@drawable/twotone_info_24"
+            android:drawablePadding="6dp"
             android:text="@string/title_insecure_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbInsecure" />
 
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index f57f27776f..ab22abb0bb 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -335,12 +335,15 @@
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvInsecureRemark"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
+            android:drawableEnd="@drawable/twotone_info_24"
+            android:drawablePadding="6dp"
             android:text="@string/title_insecure_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbInsecure" />
 
diff --git a/app/src/main/res/layout/fragment_pop.xml b/app/src/main/res/layout/fragment_pop.xml
index 98f0a90699..486bc2b08c 100644
--- a/app/src/main/res/layout/fragment_pop.xml
+++ b/app/src/main/res/layout/fragment_pop.xml
@@ -121,12 +121,15 @@
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvInsecureRemark"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
+            android:drawableEnd="@drawable/twotone_info_24"
+            android:drawablePadding="6dp"
             android:text="@string/title_insecure_remark"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbInsecure" />