diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index a8caf87f10..296f9b85d6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -379,8 +379,10 @@ public class FragmentQuickSetup extends FragmentBase {
             protected void onExecuted(Bundle args, EmailProvider result) {
                 boolean check = args.getBoolean("check");
                 if (check) {
-                    tvImap.setText(result == null ? null : result.imap_host + ":" + result.imap_port);
-                    tvSmtp.setText(result == null ? null : result.smtp_host + ":" + result.smtp_port);
+                    tvImap.setText(result == null ? null
+                            : result.imap_host + ":" + result.imap_port + (result.imap_starttls ? " starttls" : " ssl"));
+                    tvSmtp.setText(result == null ? null
+                            : result.smtp_host + ":" + result.smtp_port + (result.smtp_starttls ? " starttls" : " ssl"));
                     grpSetup.setVisibility(result == null ? View.GONE : View.VISIBLE);
                 } else
                     new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index d3f101e4eb..9b10e2fd57 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -125,10 +125,10 @@
             android:id="@+id/tvImap"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
             android:gravity="center_horizontal"
             android:text="imap.domain.tld:993"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvImapTitle" />
 
@@ -147,10 +147,10 @@
             android:id="@+id/tvSmtp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
             android:gravity="center_horizontal"
             android:text="smtp.domain.tld:993"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvSmtpTitle" />