diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 08f494739e..46fcacdb52 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -1310,7 +1310,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_password, null);
etPassword1 = dview.findViewById(R.id.tilPassword1);
etPassword2 = dview.findViewById(R.id.tilPassword2);
- TextView tvImportHint = dview.findViewById(R.id.tvImporthint);
+ TextView tvExportHint = dview.findViewById(R.id.tvExportHint);
+ TextView tvImportHint = dview.findViewById(R.id.tvImportHint);
if (savedInstanceState != null) {
etPassword1.getEditText().setText(savedInstanceState.getString("fair:password1"));
@@ -1318,6 +1319,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
}
etPassword2.setVisibility(export ? View.VISIBLE : View.GONE);
+ tvExportHint.setVisibility(export ? View.VISIBLE : View.GONE);
tvImportHint.setVisibility(export ? View.GONE : View.VISIBLE);
return new AlertDialog.Builder(getContext())
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index 8b37bdfb4e..46e1371f41 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -47,12 +47,22 @@
+
+
+ app:layout_constraintTop_toBottomOf="@id/tvExportHint" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72b7dd78d8..342149fa91 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -198,6 +198,7 @@
Export settings
Import settings
+ Gmail accounts linked to on-device Google accounts cannot be exported
Imported accounts will be added without overwriting any existing ones
Password
Password contains control or whitespace characters