diff --git a/src/main/java/com/b44t/messenger/DcContext.java b/src/main/java/com/b44t/messenger/DcContext.java
index 21e610644..8813385d0 100644
--- a/src/main/java/com/b44t/messenger/DcContext.java
+++ b/src/main/java/com/b44t/messenger/DcContext.java
@@ -239,12 +239,14 @@ public class DcContext {
     // Called for new profiles on chatmail servers that are "single device" initially;
     // to save server disk space, we make use of that delete all messages immediately after download.
     public void assumeSingleDevice() {
-      setConfigInt("delete_server_after", 1 /*at once*/);
+      if (isChatmail()) {
+        setConfigInt("delete_server_after", 1 /*at once*/);
+      }
     }
 
     // Called when we get a hint that another device may be set up.
     public void assumeMultiDevice() {
-      if (getConfigInt("delete_server_after") == 1 /*at once*/) {
+      if (isChatmail() && getConfigInt("delete_server_after") == 1 /*at once*/) {
         setConfigInt("delete_server_after", 0 /*never/automatic*/);
       }
     }
diff --git a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
index c62ef0bb3..17f4fdb8d 100644
--- a/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/InstantOnboardingActivity.java
@@ -373,6 +373,7 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
         progressUpdate((int)progress);
       } else if (progress==1000/*done*/) {
         DcHelper.getAccounts(this).startIo();
+        dcContext.assumeSingleDevice();
         progressSuccess();
       }
     }
@@ -481,9 +482,6 @@ public class InstantOnboardingActivity extends BaseActionBarActivity implements
         return;
       }
       DcHelper.getAccounts(this).stopIo();
-      if (!isDcLogin) {
-        dcContext.assumeSingleDevice();
-      }
       dcContext.configure();
     }).start();
   }