diff --git a/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSender.java b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSender.java
index 6fd3dce63..200bd8aeb 100644
--- a/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSender.java
+++ b/app/src/main/java/org/fdroid/fdroid/acra/CrashReportSender.java
@@ -28,7 +28,7 @@ public class CrashReportSender implements ReportSender {
             throws ReportSenderException {
         Intent emailIntent = new Intent("android.intent.action.SENDTO");
         emailIntent.setData(Uri.fromParts("mailto", this.config.mailTo(), (String) null));
-        emailIntent.addFlags(268435456);
+        emailIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         String[] subjectBody = this.buildSubjectBody(context, errorContent);
         emailIntent.putExtra("android.intent.extra.SUBJECT", subjectBody[0]);
         emailIntent.putExtra("android.intent.extra.TEXT", subjectBody[1]);
diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java
index ad1d84816..5fb70b1bf 100644
--- a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java
@@ -102,7 +102,7 @@ public class SwapService extends Service {
      * a different network.
      */
     private SharedPreferences persistence() {
-        return getSharedPreferences(SHARED_PREFERENCES, MODE_APPEND);
+        return getSharedPreferences(SHARED_PREFERENCES, MODE_PRIVATE);
     }
 
     // ==========================================================