diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index b6c3e26209..f1223f65ad 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -76,6 +76,7 @@ public class FragmentFolder extends FragmentBase {
private EditText etKeepDays;
private CheckBox cbKeepAll;
private CheckBox cbAutoDelete;
+ private TextView tvAutoDeleteArchiveHint;
private Button btnSave;
private ContentLoadingProgressBar pbSave;
private TextView tvInboxRootHint;
@@ -140,6 +141,7 @@ public class FragmentFolder extends FragmentBase {
etKeepDays = view.findViewById(R.id.etKeepDays);
cbKeepAll = view.findViewById(R.id.cbKeepAll);
cbAutoDelete = view.findViewById(R.id.cbAutoDelete);
+ tvAutoDeleteArchiveHint = view.findViewById(R.id.tvAutoDeleteArchiveHint);
btnSave = view.findViewById(R.id.btnSave);
pbSave = view.findViewById(R.id.pbSave);
tvInboxRootHint = view.findViewById(R.id.tvInboxRootHint);
@@ -245,6 +247,7 @@ public class FragmentFolder extends FragmentBase {
cbAutoClassifySource.setVisibility(View.GONE);
cbAutoClassifyTarget.setVisibility(View.GONE);
tvAutoClassifyPro.setVisibility(View.GONE);
+ tvAutoDeleteArchiveHint.setVisibility(View.GONE);
grpAutoDelete.setVisibility(View.GONE);
btnSave.setEnabled(false);
pbSave.setVisibility(View.GONE);
@@ -322,6 +325,8 @@ public class FragmentFolder extends FragmentBase {
Helper.setViewsEnabled(view, true);
boolean canAutoClassify = (imap && MessageClassifier.isEnabled(getContext()));
+ boolean canAutoDelete = (imap && (folder == null || !folder.read_only));
+ boolean isArchive = (folder != null && EntityFolder.ARCHIVE.equals(folder.type));
boolean pro = (ActivityBilling.isPro(getContext()) ||
(folder != null && EntityFolder.JUNK.equals(folder.type)));
@@ -340,7 +345,8 @@ public class FragmentFolder extends FragmentBase {
cbAutoDelete.setEnabled(!cbKeepAll.isChecked());
cbAutoDelete.setText(folder != null && EntityFolder.TRASH.equals(folder.type)
? R.string.title_auto_delete : R.string.title_auto_trash);
- grpAutoDelete.setVisibility(!imap || (folder != null && folder.read_only) ? View.GONE : View.VISIBLE);
+ grpAutoDelete.setVisibility(canAutoDelete ? View.VISIBLE : View.GONE);
+ tvAutoDeleteArchiveHint.setVisibility(canAutoDelete && isArchive ? View.VISIBLE : View.GONE);
btnSave.setEnabled(true);
tvInboxRootHint.setVisibility(folder == null && parent == null ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index e62ae0e926..c678db0af0 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -346,6 +346,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbAutoDelete" />
+
+
+ app:layout_constraintTop_toBottomOf="@id/tvAutoDeleteArchiveHint" />
Automatically move old messages to trash
Automatically permanently delete old messages
Old messages are messages that are no longer kept on the device
+ Deletion from the archive folder is not always allowed by the email server
Some providers require new folders to be created below the inbox.
In this case, you can long press the inbox in the folder list and select \'Create sub folder\'.