diff --git a/src/paperless_mail/migrations/0027_mailaccount_expiration_mailaccount_account_type_and_more.py b/src/paperless_mail/migrations/0027_mailaccount_expiration_mailaccount_account_type_and_more.py
index a39455b0f..3fb1e6af2 100644
--- a/src/paperless_mail/migrations/0027_mailaccount_expiration_mailaccount_account_type_and_more.py
+++ b/src/paperless_mail/migrations/0027_mailaccount_expiration_mailaccount_account_type_and_more.py
@@ -10,6 +10,11 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AlterField(
+            model_name="mailaccount",
+            name="password",
+            field=models.CharField(max_length=3072, verbose_name="password"),
+        ),
         migrations.AddField(
             model_name="mailaccount",
             name="expiration",
@@ -35,7 +40,7 @@ class Migration(migrations.Migration):
             field=models.CharField(
                 blank=True,
                 help_text="The refresh token to use for token authentication e.g. with oauth2.",
-                max_length=2048,
+                max_length=3072,
                 null=True,
                 verbose_name="refresh token",
             ),
diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py
index 15f7bef35..6ba00151d 100644
--- a/src/paperless_mail/models.py
+++ b/src/paperless_mail/models.py
@@ -42,7 +42,7 @@ class MailAccount(document_models.ModelWithOwner):
 
     username = models.CharField(_("username"), max_length=256)
 
-    password = models.CharField(_("password"), max_length=2048)
+    password = models.CharField(_("password"), max_length=3072)
 
     is_token = models.BooleanField(_("Is token authentication"), default=False)
 
@@ -64,7 +64,7 @@ class MailAccount(document_models.ModelWithOwner):
 
     refresh_token = models.CharField(
         _("refresh token"),
-        max_length=2048,
+        max_length=3072,
         blank=True,
         null=True,
         help_text=_(