From 172b37239fec9bb7b88da084158c45946826145f Mon Sep 17 00:00:00 2001
From: Jonas Winkler <jonas.winkler@jpwinkler.de>
Date: Sun, 22 Nov 2020 11:42:17 +0100
Subject: [PATCH] changed a few things with the mail rule admin.

---
 .../migrations/0005_help_texts.py             | 23 +++++++++++++++++++
 src/paperless_mail/models.py                  | 14 +++++------
 2 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 src/paperless_mail/migrations/0005_help_texts.py

diff --git a/src/paperless_mail/migrations/0005_help_texts.py b/src/paperless_mail/migrations/0005_help_texts.py
new file mode 100644
index 000000000..71899c8ef
--- /dev/null
+++ b/src/paperless_mail/migrations/0005_help_texts.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.3 on 2020-11-22 10:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('paperless_mail', '0004_mailrule_order'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mailrule',
+            name='action',
+            field=models.PositiveIntegerField(choices=[(3, "Mark as read, don't process read mails"), (4, "Flag the mail, don't process flagged mails"), (2, 'Move to specified folder'), (1, 'Delete')], default=3),
+        ),
+        migrations.AlterField(
+            model_name='mailrule',
+            name='maximum_age',
+            field=models.PositiveIntegerField(default=30, help_text='Specified in days.'),
+        ),
+    ]
diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py
index c8ab09479..fbcfaf980 100644
--- a/src/paperless_mail/models.py
+++ b/src/paperless_mail/models.py
@@ -46,10 +46,10 @@ class MailRule(models.Model):
     ACTION_FLAG = 4
 
     ACTIONS = (
-        (ACTION_DELETE, "Delete"),
-        (ACTION_MOVE, "Move to specified folder"),
         (ACTION_MARK_READ, "Mark as read, don't process read mails"),
-        (ACTION_FLAG, "Flag the mail, don't process flagged mails")
+        (ACTION_FLAG, "Flag the mail, don't process flagged mails"),
+        (ACTION_MOVE, "Move to specified folder"),
+        (ACTION_DELETE, "Delete"),
     )
 
     TITLE_FROM_SUBJECT = 1
@@ -92,15 +92,13 @@ class MailRule(models.Model):
     filter_subject = models.CharField(max_length=256, null=True, blank=True)
     filter_body = models.CharField(max_length=256, null=True, blank=True)
 
-    maximum_age = models.PositiveIntegerField(default=30)
+    maximum_age = models.PositiveIntegerField(
+        default=30,
+        help_text="Specified in days.")
 
     action = models.PositiveIntegerField(
         choices=ACTIONS,
         default=ACTION_MARK_READ,
-        help_text="The action applied to the mail. This action is only "
-                  "performed when documents were consumed from the mail. "
-                  "Mails without attachments will remain entirely "
-                  "untouched."
     )
 
     action_parameter = models.CharField(