diff --git a/app/src/main/java/org/dystopia/email/FragmentAccount.java b/app/src/main/java/org/dystopia/email/FragmentAccount.java
index 31068f31..1a2a0e56 100644
--- a/app/src/main/java/org/dystopia/email/FragmentAccount.java
+++ b/app/src/main/java/org/dystopia/email/FragmentAccount.java
@@ -40,8 +40,12 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.Html;
+import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.text.method.LinkMovementMethod;
+import android.text.util.Linkify;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -60,6 +64,7 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.Group;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentResultListener;
@@ -100,7 +105,7 @@ public class FragmentAccount extends FragmentEx {
   private TextInputLayout tilPassword;
 
   private Button btnAuthorize;
-
+  private TextView tvGmailNote;
   private Button btnAdvanced;
 
   private TextView tvName;
@@ -184,6 +189,7 @@ public class FragmentAccount extends FragmentEx {
     tilPassword = view.findViewById(R.id.tilPassword);
 
     btnAuthorize = view.findViewById(R.id.btnAuthorize);
+    tvGmailNote = view.findViewById(R.id.tvGmailNote);
     btnAdvanced = view.findViewById(R.id.btnAdvanced);
 
     etName = view.findViewById(R.id.etName);
@@ -230,7 +236,18 @@ public class FragmentAccount extends FragmentEx {
             cbInsecure.setVisibility(position == 1 && insecure ? View.VISIBLE : View.GONE);
             grpAuthorize.setVisibility(position > 0 ? View.VISIBLE : View.GONE);
 
-            btnAuthorize.setVisibility(provider.type == null ? View.GONE : View.VISIBLE);
+            // TODO: since December 31, 2019 Gmail retricted the oAuth
+            // gmail scopes and it require privative google play services java libraries
+            // so, only with "insecure" app enabled is supported
+            // see: https://developers.google.com/terms/api-services-user-data-policy#additional-requirements-for-specific-api-scopes
+            //
+            // maybe with webview and a web library?
+            btnAuthorize.setVisibility(View.GONE);
+            tvGmailNote.setVisibility(View.GONE);
+            if (provider.type != null) {
+              tvGmailNote.setVisibility(View.VISIBLE);
+              tvGmailNote.setText(Html.fromHtml(getString(R.string.text_gmail_note)));
+            }
 
             btnAdvanced.setVisibility(position > 0 ? View.VISIBLE : View.GONE);
             if (position == 0) {
@@ -354,6 +371,24 @@ public class FragmentAccount extends FragmentEx {
           }
         });
 
+    tvGmailNote.setOnClickListener(
+      new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+          Spanned htmlMessage = Html.fromHtml(getString(R.string.message_gmail_note));
+          final SpannableString dialogMessage = new SpannableString(htmlMessage);
+          Linkify.addLinks(dialogMessage, Linkify.WEB_URLS);
+
+          AlertDialog dialog = new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
+            .setMessage(dialogMessage)
+            .setPositiveButton(android.R.string.ok, null)
+            .show();
+
+          ((TextView) dialog.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
+        }
+      }
+    );
+
     btnAdvanced.setOnClickListener(
         new View.OnClickListener() {
           @Override
@@ -420,9 +455,7 @@ public class FragmentAccount extends FragmentEx {
             args.putString("port", etPort.getText().toString());
             args.putString("user", etUser.getText().toString());
             args.putString("password", tilPassword.getEditText().getText().toString());
-            args.putInt(
-                "auth_type",
-                authorized == null ? Helper.AUTH_TYPE_PASSWORD : provider.getAuthType());
+            args.putInt("auth_type", provider.getAuthType());
 
             new SimpleTask<CheckResult>() {
               @Override
@@ -457,14 +490,24 @@ public class FragmentAccount extends FragmentEx {
                 Session isession = Session.getInstance(props, null);
                 isession.setDebug(true);
                 IMAPStore istore = null;
+
                 try {
                   istore = (IMAPStore) isession.getStore(starttls ? "imap" : "imaps");
+                  String originalPassword = password;
                   try {
+                    if (auth_type == Helper.AUTH_TYPE_GMAIL) {
+                      password = Helper.refreshToken(context, "com.google", user, password);
+                    }
                     istore.connect(host, Integer.parseInt(port), user, password);
                   } catch (AuthenticationFailedException ex) {
+                    // Try normal imap access with gmail allowed "insecure" app enabled
                     if (auth_type == Helper.AUTH_TYPE_GMAIL) {
-                      password = Helper.refreshToken(context, "com.google", user, password);
-                      istore.connect(host, Integer.parseInt(port), user, password);
+                      auth_type = Helper.AUTH_TYPE_PASSWORD;
+                      args.putInt("auth_type", auth_type);
+                      props = MessageHelper.getSessionProperties(auth_type, insecure);
+                      isession = Session.getInstance(props, null);
+                      istore = (IMAPStore) isession.getStore(starttls ? "imap" : "imaps");
+                      istore.connect(host, Integer.parseInt(port), user, originalPassword);
                     } else {
                       throw ex;
                     }
@@ -1183,7 +1226,7 @@ public class FragmentAccount extends FragmentEx {
                     }
                   }
                 },
-                null);
+              null);
             break;
           }
         }
diff --git a/app/src/main/java/org/dystopia/email/ViewButtonColor.java b/app/src/main/java/org/dystopia/email/ViewButtonColor.java
index 82f89578..0fc2d8c0 100644
--- a/app/src/main/java/org/dystopia/email/ViewButtonColor.java
+++ b/app/src/main/java/org/dystopia/email/ViewButtonColor.java
@@ -66,7 +66,7 @@ public class ViewButtonColor extends AppCompatButton {
     GradientDrawable background = new GradientDrawable();
     background.setColor(color);
     background.setStroke(
-      ViewHelper.dp2px(getContext(), 1),
+      ViewHelper.dp2px(getContext(), 3),
       Helper.resolveColor(getContext(), R.attr.colorSeparator));
     background.setCornerRadius(50);
     setBackground(background);
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 23d8d4e5..d7a086e4 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -1,550 +1,565 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".ActivityView">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            tools:context=".ActivityView">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:padding="12dp">
+
+    <!-- provider -->
+
+    <TextView
+        android:id="@+id/tvProvider"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_provider"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Spinner
+        android:id="@+id/spProvider"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@style/Widget.AppCompat.Spinner.Underlined"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvProvider" />
+
+    <!-- auto config -->
+
+    <TextView
+        android:id="@+id/tvDomain"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/title_domain"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/spProvider" />
+
+    <EditText
+        android:id="@+id/etDomain"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
-
-        <!-- provider -->
-
-        <TextView
-            android:id="@+id/tvProvider"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_provider"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <Spinner
-            android:id="@+id/spProvider"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            style="@style/Widget.AppCompat.Spinner.Underlined"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvProvider" />
-
-        <!-- auto config -->
-
-        <TextView
-            android:id="@+id/tvDomain"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_domain"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/spProvider" />
-
-        <EditText
-            android:id="@+id/etDomain"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/default_hint_domain"
-            android:inputType="textUri"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvDomain" />
-
-        <Button
-            android:id="@+id/btnAutoConfig"
-            style="@style/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="@string/title_autoconfig"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etDomain" />
-
-        <!-- IMAP -->
-
-        <TextView
-            android:id="@+id/tvImap"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_imap"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnAutoConfig" />
-
-        <TextView
-            android:id="@+id/tvPop"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_pop"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvImap" />
-
-        <TextView
-            android:id="@+id/tvInsecure"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/title_insecure"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="italic"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvPop" />
-
-        <!-- host -->
-
-        <TextView
-            android:id="@+id/tvHost"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_host"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvInsecure" />
-
-        <EditText
-            android:id="@+id/etHost"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/default_hint_imap"
-            android:inputType="textUri"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvHost" />
-
-        <CheckBox
-            android:id="@+id/cbStartTls"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_starttls"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etHost" />
-
-        <CheckBox
-            android:id="@+id/cbInsecure"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_allow_insecure"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbStartTls" />
-
-        <!-- port -->
-
-        <TextView
-            android:id="@+id/tvPort"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_port"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbInsecure" />
-
-        <EditText
-            android:id="@+id/etPort"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/default_imap_port"
-            android:inputType="number"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvPort" />
-
-        <Button
-            android:id="@+id/btnAuthorize"
-            style="@style/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="@string/title_authorize"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etPort" />
-
-        <!-- user -->
-
-        <TextView
-            android:id="@+id/tvUser"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_user"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnAuthorize" />
-
-        <EditText
-            android:id="@+id/etUser"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="text"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvUser" />
-
-        <!-- password -->
-
-        <TextView
-            android:id="@+id/tvPassword"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_password"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etUser" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/tilPassword"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvPassword"
-            app:passwordToggleEnabled="true">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textPassword" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <LinearLayout
-            android:id="@+id/llContainerColor"
-            android:clickable="true"
-            android:focusable="true"
-            android:orientation="horizontal"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:gravity="center"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tilPassword">
-
-          <TextView
-            android:id="@+id/tvColor"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/title_account_color"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-
-          <org.dystopia.email.ViewButtonColor
-              android:id="@+id/btnColor"
-              android:clickable="false"
-            android:focusable="false"
-            android:layout_width="@dimen/color_pick"
-            android:layout_height="@dimen/color_pick"
-            android:layout_marginEnd="@dimen/margin_sm"
-            android:layout_gravity="right"
-            android:background="@color/colorAccent"
-            android:tag="disable" />
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/btnAdvanced"
-            style="@style/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="@string/title_setup_advanced"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/llContainerColor" />
-
-        <!-- advanced -->
-
-        <TextView
-            android:id="@+id/tvName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_account_name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnAdvanced" />
-
-        <EditText
-            android:id="@+id/etName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/title_account_name_hint"
-            android:inputType="text"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvName" />
-
-        <TextView
-            android:id="@+id/tvSignature"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_account_signature"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etName" />
-
-        <EditText
-            android:id="@+id/etSignature"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:fontFamily="monospace"
-            android:hint="@string/title_optional"
-            android:inputType="textCapSentences|textMultiLine"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvSignature" />
-
-        <CheckBox
-            android:id="@+id/cbSynchronize"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_synchronize_account"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etSignature" />
-
-        <CheckBox
-            android:id="@+id/cbPrimary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_primary_account"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
-
-        <!-- keep alive -->
-
-        <TextView
-            android:id="@+id/tvInterval"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_keep_alive_interval"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
-
-        <EditText
-            android:id="@+id/etInterval"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/default_interval"
-            android:inputType="number"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvInterval" />
-
-        <!-- check -->
-
-        <Button
-            android:id="@+id/btnCheck"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_check"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etInterval" />
-
-        <ProgressBar
-            android:id="@+id/pbCheck"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="12dp"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="@id/btnCheck"
-            app:layout_constraintStart_toEndOf="@id/btnCheck"
-            app:layout_constraintTop_toTopOf="@id/btnCheck" />
-
-        <ImageButton
-            android:id="@+id/ibDelete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:src="@drawable/baseline_delete_24"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etInterval" />
-
-        <TextView
-            android:id="@+id/tvIdle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:minWidth="100dp"
-            android:text="@string/title_no_idle"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnCheck" />
-
-        <TextView
-            android:id="@+id/tvDrafts"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:text="@string/title_folder_drafts"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@+id/spDrafts"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/spDrafts" />
-
-        <Spinner
-            android:id="@+id/spDrafts"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvDrafts"
-            app:layout_constraintTop_toBottomOf="@id/tvIdle" />
-
-        <TextView
-            android:id="@+id/tvSent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:text="@string/title_folder_sent"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@+id/spSent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/spSent" />
-
-        <Spinner
-            android:id="@+id/spSent"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvSent"
-            app:layout_constraintTop_toBottomOf="@id/spDrafts" />
-
-        <TextView
-            android:id="@+id/tvAll"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:text="@string/title_folder_all"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@+id/spAll"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/spAll" />
-
-        <Spinner
-            android:id="@+id/spAll"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvAll"
-            app:layout_constraintTop_toBottomOf="@id/spSent" />
-
-        <TextView
-            android:id="@+id/tvTrash"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:text="@string/title_folder_trash"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@+id/spTrash"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/spTrash" />
-
-        <Spinner
-            android:id="@+id/spTrash"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvTrash"
-            app:layout_constraintTop_toBottomOf="@id/spAll" />
-
-        <TextView
-            android:id="@+id/tvJunk"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="100dp"
-            android:text="@string/title_folder_junk"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@+id/spJunk"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/spJunk" />
-
-        <Spinner
-            android:id="@+id/spJunk"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvJunk"
-            app:layout_constraintTop_toBottomOf="@id/spTrash" />
-
-        <!-- save -->
-
-        <Button
-            android:id="@+id/btnSave"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_save"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/spJunk" />
-
-        <ProgressBar
-            android:id="@+id/pbSave"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_marginStart="12dp"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="@id/btnSave"
-            app:layout_constraintStart_toEndOf="@id/btnSave"
-            app:layout_constraintTop_toTopOf="@id/btnSave" />
-
-        <ProgressBar
-            android:id="@+id/pbWait"
-            style="@style/Base.Widget.AppCompat.ProgressBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:indeterminate="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpServer"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="tvDomain,etDomain,btnAutoConfig,tvImap,tvPop,tvInsecure,tvHost,etHost,tvPort,etPort" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpAuthorize"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="tvUser,etUser,tvPassword,tilPassword" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpAdvanced"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="tvName,etName,tvSignature,etSignature,cbSynchronize,cbPrimary,tvInterval,etInterval" />
-
-        <androidx.constraintlayout.widget.Group
-            android:id="@+id/grpFolders"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:constraint_referenced_ids="tvDrafts,spDrafts,tvSent,spSent,tvAll,spAll,tvTrash,spTrash,tvJunk,spJunk" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        android:hint="@string/default_hint_domain"
+        android:inputType="textUri"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvDomain" />
+
+    <Button
+        android:id="@+id/btnAutoConfig"
+        style="@style/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:text="@string/title_autoconfig"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etDomain" />
+
+    <!-- IMAP -->
+
+    <TextView
+        android:id="@+id/tvImap"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/title_imap"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btnAutoConfig" />
+
+    <TextView
+        android:id="@+id/tvPop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_pop"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textStyle="italic"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvImap" />
+
+    <TextView
+        android:id="@+id/tvInsecure"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/title_insecure"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textStyle="italic"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvPop" />
+
+    <!-- host -->
+
+    <TextView
+        android:id="@+id/tvHost"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/title_host"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvInsecure" />
+
+    <EditText
+        android:id="@+id/etHost"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/default_hint_imap"
+        android:inputType="textUri"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvHost" />
+
+    <CheckBox
+        android:id="@+id/cbStartTls"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/title_starttls"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etHost" />
+
+    <CheckBox
+        android:id="@+id/cbInsecure"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/title_allow_insecure"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cbStartTls" />
+
+    <!-- port -->
+
+    <TextView
+        android:id="@+id/tvPort"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/title_port"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cbInsecure" />
+
+    <EditText
+        android:id="@+id/etPort"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/default_imap_port"
+        android:inputType="number"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvPort" />
+
+    <Button
+        android:id="@+id/btnAuthorize"
+        style="@style/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:text="@string/title_authorize"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etPort" />
+
+    <TextView
+        android:id="@+id/tvGmailNote"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:paddingTop="@dimen/margin_lg"
+        android:paddingBottom="@dimen/margin_lg"
+        android:text="@string/text_gmail_note"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etPort" />
+
+    <!-- user -->
+
+    <TextView
+        android:id="@+id/tvUser"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:text="@string/title_user"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvGmailNote" />
+
+    <EditText
+        android:id="@+id/etUser"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="text"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvUser" />
+
+    <!-- password -->
+
+    <TextView
+        android:id="@+id/tvPassword"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/title_password"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etUser" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilPassword"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textPassword"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvPassword"
+        app:passwordToggleEnabled="true">
+
+      <com.google.android.material.textfield.TextInputEditText
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:inputType="textPassword" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <LinearLayout
+        android:id="@+id/llContainerColor"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tilPassword">
+
+      <TextView
+          android:id="@+id/tvColor"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:text="@string/title_account_color"
+          android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+      <org.dystopia.email.ViewButtonColor
+          android:id="@+id/btnColor"
+          android:layout_width="@dimen/color_pick"
+          android:layout_height="@dimen/color_pick"
+          android:layout_gravity="center|right"
+          android:layout_marginTop="@dimen/margin_lg"
+          android:layout_marginEnd="@dimen/margin_sm"
+          android:layout_marginBottom="@dimen/margin_lg"
+          android:background="@color/colorAccent"
+          android:clickable="false"
+          android:focusable="false"
+          android:tag="disable" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btnAdvanced"
+        style="@style/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:text="@string/title_setup_advanced"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/llContainerColor" />
+
+    <!-- advanced -->
+
+    <TextView
+        android:id="@+id/tvName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:text="@string/title_account_name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/btnAdvanced" />
+
+    <EditText
+        android:id="@+id/etName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/title_account_name_hint"
+        android:inputType="text"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvName" />
+
+    <TextView
+        android:id="@+id/tvSignature"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:text="@string/title_account_signature"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etName" />
+
+    <EditText
+        android:id="@+id/etSignature"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:fontFamily="monospace"
+        android:hint="@string/title_optional"
+        android:inputType="textCapSentences|textMultiLine"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvSignature" />
+
+    <CheckBox
+        android:id="@+id/cbSynchronize"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:text="@string/title_synchronize_account"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etSignature" />
+
+    <CheckBox
+        android:id="@+id/cbPrimary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:text="@string/title_primary_account"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cbSynchronize" />
+
+    <!-- keep alive -->
+
+    <TextView
+        android:id="@+id/tvInterval"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:text="@string/title_keep_alive_interval"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/cbPrimary" />
+
+    <EditText
+        android:id="@+id/etInterval"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/default_interval"
+        android:inputType="number"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvInterval" />
+
+    <!-- check -->
+
+    <Button
+        android:id="@+id/btnCheck"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:text="@string/title_check"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etInterval" />
+
+    <ProgressBar
+        android:id="@+id/pbCheck"
+        style="@style/Base.Widget.AppCompat.ProgressBar"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="12dp"
+        android:indeterminate="true"
+        app:layout_constraintBottom_toBottomOf="@id/btnCheck"
+        app:layout_constraintStart_toEndOf="@id/btnCheck"
+        app:layout_constraintTop_toTopOf="@id/btnCheck" />
+
+    <ImageButton
+        android:id="@+id/ibDelete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:src="@drawable/baseline_delete_24"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etInterval" />
+
+    <TextView
+        android:id="@+id/tvIdle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:minWidth="100dp"
+        android:text="@string/title_no_idle"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnCheck" />
+
+    <TextView
+        android:id="@+id/tvDrafts"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="100dp"
+        android:text="@string/title_folder_drafts"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/spDrafts"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/spDrafts" />
+
+    <Spinner
+        android:id="@+id/spDrafts"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/tvDrafts"
+        app:layout_constraintTop_toBottomOf="@id/tvIdle" />
+
+    <TextView
+        android:id="@+id/tvSent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="100dp"
+        android:text="@string/title_folder_sent"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/spSent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/spSent" />
+
+    <Spinner
+        android:id="@+id/spSent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/tvSent"
+        app:layout_constraintTop_toBottomOf="@id/spDrafts" />
+
+    <TextView
+        android:id="@+id/tvAll"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="100dp"
+        android:text="@string/title_folder_all"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/spAll"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/spAll" />
+
+    <Spinner
+        android:id="@+id/spAll"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/tvAll"
+        app:layout_constraintTop_toBottomOf="@id/spSent" />
+
+    <TextView
+        android:id="@+id/tvTrash"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="100dp"
+        android:text="@string/title_folder_trash"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/spTrash"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/spTrash" />
+
+    <Spinner
+        android:id="@+id/spTrash"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/tvTrash"
+        app:layout_constraintTop_toBottomOf="@id/spAll" />
+
+    <TextView
+        android:id="@+id/tvJunk"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="100dp"
+        android:text="@string/title_folder_junk"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@+id/spJunk"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/spJunk" />
+
+    <Spinner
+        android:id="@+id/spJunk"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/tvJunk"
+        app:layout_constraintTop_toBottomOf="@id/spTrash" />
+
+    <!-- save -->
+
+    <Button
+        android:id="@+id/btnSave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_md"
+        android:text="@string/title_save"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/spJunk" />
+
+    <ProgressBar
+        android:id="@+id/pbSave"
+        style="@style/Base.Widget.AppCompat.ProgressBar"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="12dp"
+        android:indeterminate="true"
+        app:layout_constraintBottom_toBottomOf="@id/btnSave"
+        app:layout_constraintStart_toEndOf="@id/btnSave"
+        app:layout_constraintTop_toTopOf="@id/btnSave" />
+
+    <ProgressBar
+        android:id="@+id/pbWait"
+        style="@style/Base.Widget.AppCompat.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpServer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="tvDomain,etDomain,btnAutoConfig,tvImap,tvPop,tvInsecure,tvHost,etHost,tvPort,etPort" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpAuthorize"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="tvUser,etUser,tvPassword,tilPassword" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpAdvanced"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="tvName,etName,tvSignature,etSignature,cbSynchronize,cbPrimary,tvInterval,etInterval" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/grpFolders"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:constraint_referenced_ids="tvDrafts,spDrafts,tvSent,spSent,tvAll,spAll,tvTrash,spTrash,tvJunk,spJunk" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index c9c39c14..23cf4861 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -263,4 +263,6 @@
   <string name="title_reset">Reset</string>
   <string name="title_color">Color</string>
   <string name="title_cancel">Cancel</string>
+  <string name="text_gmail_note"><![CDATA[Require have plain IMAP authentication enabled <font color=\'#0055C7\'>More info</font>]]></string>
+  <string name="message_gmail_note"><![CDATA[Since January 2020 Gmail restricted the oAuth scopes, now requires authorization to be able to authenticate, we have plans to fix this and allow oAuth authentication without privative libraries.<br/><br/> As a temporary solution you need to allow IMAP authentication or how Google says <i>\"less secure apps\"</i>.<br/><br/><b>Instructions here:</b> https://support.google.com/accounts/answer/6010255</br>]]></string>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 41b60bf8..50bfeb74 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -15,5 +15,5 @@
     <dimen name="compose_padding">6dp</dimen>
     <dimen name="input_height">40dp</dimen>
     <dimen name="normal_size">40dp</dimen>
-    <dimen name="color_pick">24dp</dimen>
+    <dimen name="color_pick">40dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08d1aa77..02594521 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
 <resources>
   <string name="app_name" translatable="false">SimpleEmail</string>
   <string name="app_label" translatable="false">Email</string>
-  <string name="app_copyright" translatable="false">Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors</string>
+  <string name="app_copyright" translatable="false">Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018-2020 by Distopico (dystopia project) and contributors</string>
   <string name="app_eula" translatable="false">This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See theGNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses.</string>
   <string name="fingerprint" translatable="false">BCB07BD93B29C1959C15F1CF6C3A2619BAF7A17</string>
 
@@ -307,4 +307,6 @@
   <string name="title_reset">Reset</string>
   <string name="title_color">Color</string>
   <string name="title_cancel">Cancel</string>
+  <string name="text_gmail_note"><![CDATA[Require have plain IMAP authentication enabled <font color=\'#0055C7\'>More info</font>]]></string>
+  <string name="message_gmail_note"><![CDATA[Since January 2020 Gmail restricted the oAuth scopes, now requires authorization to be able to authenticate, we have plans to fix this and allow oAuth authentication without privative libraries.<br/><br/> As a temporary solution you need to allow IMAP authentication or how Google says <i>\"less secure apps\"</i>.<br/><br/><b>Instructions here:</b> https://support.google.com/accounts/answer/6010255</br>]]></string>
 </resources>
diff --git a/docs/FAQ.md b/docs/FAQ.md
index e49ef99b..4e2ef11a 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -62,22 +62,17 @@ See also [this FAQ](#FAQ16).
 
 Valid security certificates are officially signed (not self signed) and have matching a host name.
 
-#### ~~What does 'no IDLE support' mean?~~
+#### What does 'no IDLE support' mean?
 
-~~Without [IMAP IDLE](https://en.wikipedia.org/wiki/IMAP_IDLE) emails need to be periodically fetched,~~
-~~which is a waste of battery power and internet bandwidth and will delay notification of new emails.~~
-~~Since the goal of SimpleEmail is to offer safe and fast email, providers without IMAP IDLE are not supported.~~
-~~You should consider this a problem of the provider, not of the app.~~
-~~Almost all email providers offer IMAP IDLE, with as notable exception Yahoo!~~
+Without [IMAP IDLE](https://en.wikipedia.org/wiki/IMAP_IDLE) emails need to be periodically fetched.
 
 #### How can I login to Gmail / G suite?
 
-Preferably select Gmail as provider and select an account on your device.
+Since January 2020 Gmail restricted the scopes, now requires authorization 'oAuth' to be able to authenticate,
+we have plans to fix this and allow oAuth authentication without privative libraries.
 
-To login to Gmail / G suite you'll often need an app password, for example when two factor authentication is enabled.
-See here for instructions: [https://support.google.com/accounts/answer/185833](https://support.google.com/accounts/answer/185833).
-
-If this doesn't work, see here for more solutions: [https://support.google.com/mail/accounts/answer/78754](https://support.google.com/mail/accounts/answer/78754)
+As a temporary solution you need to allow IMAP authentication or how Google says "less secure apps".
+See here for instructions: [https://support.google.com/accounts/answer/6010255](https://support.google.com/accounts/answer/6010255)
 
 #### Why are messages in the outbox not moved to the sent folder?