diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index b6b80ac570..bc56c9a827 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -999,7 +999,8 @@ class Core {
             Log.i(folder.name + " sync=" + new Date(sync_time) + " keep=" + new Date(keep_time));
 
             // Delete old local messages
-            if (auto_delete && EntityFolder.TRASH.equals(folder.type)) {
+            if (auto_delete &&
+                    (EntityFolder.JUNK.equals(folder.type) || EntityFolder.TRASH.equals(folder.type))) {
                 List<Long> tbds = db.message().getMessagesBefore(folder.id, keep_time, delete_unseen);
                 Log.i(folder.name + " local tbd=" + tbds.size());
                 for (Long tbd : tbds) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index eac8160332..de48d71c54 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -210,7 +210,10 @@ public class FragmentFolder extends FragmentBase {
                     else
                         etKeepDays.setText(Integer.toString(folder == null ? EntityFolder.DEFAULT_KEEP : folder.keep_days));
                     cbAutoDelete.setChecked(folder == null ? false : folder.auto_delete);
-                    cbAutoDelete.setVisibility(folder != null && EntityFolder.TRASH.equals(folder.type) ? View.VISIBLE : View.GONE);
+                    cbAutoDelete.setVisibility(
+                            folder != null &&
+                                    (EntityFolder.JUNK.equals(folder.type) || EntityFolder.TRASH.equals(folder.type))
+                                    ? View.VISIBLE : View.GONE);
                 }
 
                 // Consider previous save as cancelled