diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index f4cfbe9ec8..ea8d2b6cb6 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -72,9 +72,9 @@ public class EntityAccount {
json.put("insecure", insecure);
json.put("port", port);
json.put("user", user);
- json.put("password", "");
+ json.put("password", password);
json.put("auth_type", auth_type);
- json.put("synchronize", false);
+ json.put("synchronize", synchronize);
json.put("primary", primary);
if (color != null)
json.put("color", color);
diff --git a/app/src/main/java/eu/faircode/email/EntityIdentity.java b/app/src/main/java/eu/faircode/email/EntityIdentity.java
index 0ac2b2c4d5..eb8cbdd55e 100644
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@@ -88,12 +88,12 @@ public class EntityIdentity {
json.put("insecure", insecure);
json.put("port", port);
json.put("user", user);
- json.put("password", "");
+ json.put("password", password);
json.put("auth_type", auth_type);
json.put("primary", primary);
if (color != null)
json.put("color", color);
- json.put("synchronize", false);
+ json.put("synchronize", synchronize);
json.put("store_sent", store_sent);
if (sent_folder != null)
json.put("sent_folder", sent_folder);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06c63d1082..1af2c931fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -70,7 +70,7 @@
Setup
Export settings
Import settings
- Accounts and identities will be exported without passwords
+ The export file will contain your passwords, so keep it safe
Imported accounts will be added, not overwritten
Settings exported
Settings imported