diff --git a/modoboa/admin/tests/test_account.py b/modoboa/admin/tests/test_account.py
index 0fd77ff20..561079b02 100644
--- a/modoboa/admin/tests/test_account.py
+++ b/modoboa/admin/tests/test_account.py
@@ -88,6 +88,8 @@ class AccountTestCase(ModoTestCase):
                 "language": "en",
                 "secondary_email": "homer@simpson.com",
                 "phone_number": "+33612345678",
+                "subject": "subject",
+                "content": "content",
             }
         )
         self.ajax_post(reverse("admin:account_change", args=[account.id]), values)
@@ -203,6 +205,8 @@ class AccountTestCase(ModoTestCase):
             "is_active": False,
             "email": "user@test.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         self.ajax_post(reverse("admin:account_change", args=[account.id]), values)
         internal.refresh_from_db()
@@ -228,6 +232,8 @@ class AccountTestCase(ModoTestCase):
             "is_active": account.is_active,
             "email": "new_user@test.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
             "create_alias_with_old_address": False,
             "aliases_1": "alias@test.com",
         }
@@ -249,6 +255,8 @@ class AccountTestCase(ModoTestCase):
             "is_active": account.is_active,
             "email": "new_user@test.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
             "create_alias_with_old_address": False,
         }
         url = reverse("admin:account_change", args=[account.pk])
@@ -343,6 +351,8 @@ class AccountTestCase(ModoTestCase):
         account = User.objects.get(username=values["username"])
         password = account.password
         values["language"] = "en"
+        values["subject"] = "subject"
+        values["content"] = "content"
         # Since 'random_password' is still True, a new password should
         # be generated
         self.ajax_post(reverse("admin:account_change", args=[account.pk]), values)
@@ -367,6 +377,8 @@ class AccountTestCase(ModoTestCase):
             "is_active": True,
             "email": "user@test.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         account = User.objects.get(username="user@test.com")
         self.ajax_post(reverse("admin:account_change", args=[account.pk]), values)
@@ -385,6 +397,8 @@ class AccountTestCase(ModoTestCase):
             "senderaddress": "test@titi.com",
             "senderaddress_1": "toto@go.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         self.ajax_post(reverse("admin:account_change", args=[account.pk]), values)
         self.assertEqual(
@@ -474,6 +488,8 @@ class AccountTestCase(ModoTestCase):
             "quota": value,
             "email": email,
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         self.ajax_post(
             reverse("admin:account_change", args=[account.id]),
@@ -617,6 +633,8 @@ class PermissionsTestCase(ModoTestCase):
             "email": "user@test.com",
             "quota_act": True,
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
 
     def tearDown(self):
@@ -691,6 +709,8 @@ class PermissionsTestCase(ModoTestCase):
             "is_active": True,
             "email": "admin@test.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         self.ajax_post(reverse("admin:account_change", args=[admin.id]), values)
         self.assertEqual(admin.role, "DomainAdmins")
@@ -711,6 +731,8 @@ class PermissionsTestCase(ModoTestCase):
             "password2": "",
             "is_active": True,
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         self.ajax_post(reverse("admin:account_change", args=[self.reseller.pk]), values)
         self.assertEqual(self.reseller.role, "Resellers")
diff --git a/modoboa/admin/tests/test_alias.py b/modoboa/admin/tests/test_alias.py
index 94d3a57b7..dafa6b2cd 100644
--- a/modoboa/admin/tests/test_alias.py
+++ b/modoboa/admin/tests/test_alias.py
@@ -26,6 +26,8 @@ class AliasTestCase(ModoTestCase):
             "aliases": "toto@test.com",
             "aliases_1": "titi@test.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         self.ajax_post(reverse("admin:account_change", args=[user.id]), values)
         self.assertEqual(
@@ -65,6 +67,8 @@ class AliasTestCase(ModoTestCase):
             "email": "user@test.com",
             "aliases": "Toto@test.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         self.ajax_post(reverse("admin:account_change", args=[user.id]), values)
         mb = user.mailbox
@@ -96,6 +100,8 @@ class AliasTestCase(ModoTestCase):
             "is_active": user.is_active,
             "email": "user@test.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         self.ajax_post(reverse("admin:account_change", args=[user.id]), values)
 
@@ -236,6 +242,8 @@ class AliasTestCase(ModoTestCase):
             "is_active": True,
             "email": user.email,
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         self.ajax_post(reverse("admin:account_change", args=[user.id]), values)
 
@@ -264,6 +272,8 @@ class AliasTestCase(ModoTestCase):
             "aliases": "toto@test.com",
             "aliases_1": "titi@test2.com",
             "language": "en",
+            "subject": "subject",
+            "content": "content",
         }
         response = self.ajax_post(
             reverse("admin:account_change", args=[user.id]), values, 400
diff --git a/modoboa/admin/tests/test_mailbox_operations.py b/modoboa/admin/tests/test_mailbox_operations.py
index 40003cc62..99b32a1cf 100644
--- a/modoboa/admin/tests/test_mailbox_operations.py
+++ b/modoboa/admin/tests/test_mailbox_operations.py
@@ -63,6 +63,8 @@ class MailboxOperationTestCase(ModoTestCase):
             "is_active": True,
             "email": "admin2@test.com",
             "language": "en",
+            "subject": "test",
+            "content": "content",
         }
         self.ajax_post(reverse("admin:account_change", args=[mb.user.pk]), values)
         path = "{}/test.com/admin2".format(self.workdir)
diff --git a/modoboa/postfix_autoreply/api/v2/viewsets.py b/modoboa/postfix_autoreply/api/v2/viewsets.py
index 41d61e85f..923112483 100644
--- a/modoboa/postfix_autoreply/api/v2/viewsets.py
+++ b/modoboa/postfix_autoreply/api/v2/viewsets.py
@@ -7,6 +7,7 @@ from rest_framework.decorators import action
 
 from modoboa.admin import models as admin_models
 from modoboa.lib.email_utils import split_mailbox
+from modoboa.parameters import tools as param_tools
 
 from modoboa.postfix_autoreply import models
 from . import serializers