diff --git a/app/src/main/java/eu/faircode/email/FragmentGmail.java b/app/src/main/java/eu/faircode/email/FragmentGmail.java
index 2a8878046b..72fbcb99dd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentGmail.java
+++ b/app/src/main/java/eu/faircode/email/FragmentGmail.java
@@ -521,8 +521,10 @@ public class FragmentGmail extends FragmentBase {
                         account.synchronize = true;
                         account.primary = (primary == null);
 
-                        if (pop)
+                        if (pop) {
+                            account.leave_on_device = true;
                             account.max_messages = EntityAccount.DEFAULT_MAX_MESSAGES;
+                        }
 
                         account.created = new Date().getTime();
                         account.last_connected = account.created;