diff --git a/doc/org-manual.org b/doc/org-manual.org
index 38f551a6e..157a57d4b 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -3289,7 +3289,7 @@ current buffer:
      points to the current article, or, in some Gnus buffers, to the
      group.  The description is constructed according to the variable
      ~org-email-link-description-format~.  By default, it refers to
-     the addressee and the subject, possibly truncated.
+     the addressee and the subject.
 
 - /Web browsers: W3, W3M and EWW/ ::
 
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 2bef7a1fe..d3be383ac 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -14,6 +14,17 @@ Please send Org bug reports to mailto:emacs-orgmode@gnu.org.
 
 ** Incompatible change
 
+*** Change default value for ~org-email-link-description-format~
+
+When linking from a mail buffer, Org used to truncate the subject of
+the message to 30 characters in order to build the description of the
+link.  This behavior was considered as too surprising.  As
+a consequence, Org no longer truncates subjects.
+
+You can get the old behaviour back with the following:
+
+: (setq org-email-link-description-format "Email %c: %.30s")
+
 *** ~:file~ header argument no longer assume "file" ~:results~
 
 The "file" ~:results~ value is now mandatory for a code block
diff --git a/lisp/org.el b/lisp/org.el
index 5591c1d4a..67b230502 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1867,7 +1867,7 @@ use."
   :version "24.3"
   :group 'org-link-store)
 
-(defcustom org-email-link-description-format "Email %c: %.30s"
+(defcustom org-email-link-description-format "Email %c: %s"
   "Format of the description part of a link to an email or usenet message.
 The following %-escapes will be replaced by corresponding information:
 
@@ -1886,7 +1886,9 @@ This is for example useful to limit the length of the subject.
 
 Examples: \"%f on: %.30s\", \"Email from %f\", \"Email %c\""
   :group 'org-link-store
-  :type 'string)
+  :package-version '(Org . 9.3)
+  :type 'string
+  :safe #'stringp)
 
 (defcustom org-from-is-user-regexp
   (let (r1 r2)