diff --git a/java/change-notes/2021-06-18-insecure-java-mail-query.md b/java/change-notes/2021-06-18-insecure-java-mail-query.md
index 495a7019f9a..e2778ec1b02 100644
--- a/java/change-notes/2021-06-18-insecure-java-mail-query.md
+++ b/java/change-notes/2021-06-18-insecure-java-mail-query.md
@@ -1,2 +1,2 @@
 lgtm,codescanning
-* The query "Insecure JavaMail SSL Configuration" (`java/insecure-smtp-ssl`) has been promoted from experimental to the main query pack. Its results will now appear by default. This query was originally [submitted as an experimental query by @luchua-bc](https://github.com/github/codeql/pull/3491)
\ No newline at end of file
+* The query "Insecure JavaMail SSL Configuration" (`java/insecure-smtp-ssl`) has been promoted from experimental to the main query pack. Its results will now appear by default. This query was originally [submitted as an experimental query by @luchua-bc](https://github.com/github/codeql/pull/3491).
diff --git a/java/ql/src/Security/CWE/CWE-297/InsecureJavaMail.ql b/java/ql/src/Security/CWE/CWE-297/InsecureJavaMail.ql
index 9697b2ae588..3c6fff0678d 100644
--- a/java/ql/src/Security/CWE/CWE-297/InsecureJavaMail.ql
+++ b/java/ql/src/Security/CWE/CWE-297/InsecureJavaMail.ql
@@ -1,8 +1,8 @@
 /**
  * @name Insecure JavaMail SSL Configuration
- * @description Java application configured to use authenticated mail session
- *              over SSL does not validate the SSL certificate to properly
- *              ensure that it is actually associated with that host.
+ * @description Configuring a Java application to use authenticated mail session
+ *              over SSL without certificate validation
+ *              makes the session susceptible to a man-in-the-middle attack.
  * @kind problem
  * @problem.severity warning
  * @precision medium