diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 90600fb921..fb9494defa 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -44,6 +44,8 @@ import androidx.room.PrimaryKey;
 public class EntityAccount implements Serializable {
     static final String TABLE_NAME = "account";
 
+    static final int DEFAULT_KEEP_ALIVE_INTERVAL = 9; // minutes
+
     @PrimaryKey(autoGenerate = true)
     public Long id;
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 7e36b07d1b..f7210f122a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -825,7 +825,7 @@ public class FragmentAccount extends FragmentBase {
                 if (synchronize && TextUtils.isEmpty(password) && !insecure)
                     throw new IllegalArgumentException(context.getString(R.string.title_no_password));
                 if (TextUtils.isEmpty(interval))
-                    interval = "19";
+                    interval = Integer.toString(EntityAccount.DEFAULT_KEEP_ALIVE_INTERVAL);
 
                 if (TextUtils.isEmpty(realm))
                     realm = null;
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index 5cff1e03b2..660eec913a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -344,7 +344,7 @@ public class FragmentQuickSetup extends FragmentBase {
                     account.primary = (primary == null);
                     account.notify = false;
                     account.browse = true;
-                    account.poll_interval = 19;
+                    account.poll_interval = EntityAccount.DEFAULT_KEEP_ALIVE_INTERVAL;
                     account.prefix = provider.prefix;
 
                     account.created = now;