diff --git a/HISTORY.rst b/HISTORY.rst
index cc4b8bee37..4363bb67a0 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -14,6 +14,9 @@
 * Fix document template column field. GitLab issue #655.
   Thanks to Christian Wiegand (@christianwgd) for the
   report.
+* Increase mailing profile password field max length 
+  from 48 to 128 characters. GitLab issue #657.
+  Thanks to sigsec (@sigsec) for the report.
 
 3.2.6 (2019-07-10)
 ==================
diff --git a/docs/releases/3.2.7.rst b/docs/releases/3.2.7.rst
index 9af62fdaac..802d3ca7ea 100644
--- a/docs/releases/3.2.7.rst
+++ b/docs/releases/3.2.7.rst
@@ -21,6 +21,9 @@ Changes
 - Fix document template column field. GitLab issue #655.
   Thanks to Christian Wiegand (@christianwgd) for the
   report.
+- Increase mailing profile password field max length
+  from 48 to 128 characters. GitLab issue #657.
+  Thanks to sigsec (@sigsec) for the report.
 
 Removals
 --------
@@ -115,6 +118,7 @@ Bugs fixed or issues closed
 
 - :gitlab-issue:`654` Internal Server Error, Document Checkout
 - :gitlab-issue:`655` Index setup tree view shows two times the "enabled" field instead of "Link documents"
+- :gitlab-issue:`657` Mailer password length restriction is too short
 - :forum-topic:`1039` Re: /api/documents/{id}/cabinets returns 500
 
 .. _PyPI: https://pypi.python.org/pypi/mayan-edms/
diff --git a/mayan/apps/mailer/mailers.py b/mayan/apps/mailer/mailers.py
index 4407c7e9b0..4ee5e5f487 100644
--- a/mayan/apps/mailer/mailers.py
+++ b/mayan/apps/mailer/mailers.py
@@ -78,7 +78,7 @@ class DjangoSMTP(MailerBackend):
                 'the SMTP server. If either of these settings is empty, '
                 'authentication won\'t be attempted.'
             ), 'kwargs': {
-                'max_length': 48
+                'max_length': 128
             }, 'required': False
         },
     }