diff --git a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
index 7236c9de453c..e6c791dafe49 100644
--- a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
+++ b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
@@ -321,10 +321,10 @@ inspection.requires.auto.module.message='requires' directive for an automatic mo
 inspection.requires.auto.module.option=Highlight only transitive dependencies
 inspection.requires.auto.module.transitive='requires transitive' directive for an automatic module
 inspection.requires.auto.module=Dependencies on automatic modules
-inspection.same.return.value.display.name=Method returns the same value
-inspection.same.return.value.problem.descriptor1=Method and all its derivables always return {0}
-inspection.same.return.value.problem.descriptor2=All implementations of this method always return {0}
-inspection.same.return.value.problem.descriptor=Method always returns {0}
+inspection.same.return.value.display.name=Method always returns the same value
+inspection.same.return.value.problem.descriptor1=Method <code>#ref()</code> and all its overriding methods always return <code>{0}</code>
+inspection.same.return.value.problem.descriptor2=All implementations of method <code>#ref()</code> always return <code>{0}</code>
+inspection.same.return.value.problem.descriptor=Method <code>#ref()</code> always returns <code>{0}</code>
 inspection.surround.requirenonnull.quickfix=Replace with ''Objects.requireNonNull({0})''
 inspection.suspicious.array.method.call.display.name=Suspicious 'Arrays' method call
 inspection.suspicious.array.method.call.problem.arrays=Array types are incompatible: arrays are always different
diff --git a/java/java-impl-inspections/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java b/java/java-impl-inspections/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
index b2f11977509e..4e58ac71d596 100644
--- a/java/java-impl-inspections/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
+++ b/java/java-impl-inspections/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInspection.sameReturnValue;
 
 import com.intellij.analysis.AnalysisScope;
@@ -26,11 +26,11 @@ public class SameReturnValueInspection extends GlobalJavaBatchInspectionTool {
       if (returnValue != null) {
         final String message;
         if (refMethod.getDerivedReferences().isEmpty()) {
-          message = JavaAnalysisBundle.message("inspection.same.return.value.problem.descriptor", "<code>" + returnValue + "</code>");
+          message = JavaAnalysisBundle.message("inspection.same.return.value.problem.descriptor", returnValue);
         } else if (refMethod.hasBody()) {
-          message = JavaAnalysisBundle.message("inspection.same.return.value.problem.descriptor1", "<code>" + returnValue + "</code>");
+          message = JavaAnalysisBundle.message("inspection.same.return.value.problem.descriptor1", returnValue);
         } else {
-          message = JavaAnalysisBundle.message("inspection.same.return.value.problem.descriptor2", "<code>" + returnValue + "</code>");
+          message = JavaAnalysisBundle.message("inspection.same.return.value.problem.descriptor2", returnValue);
         }
 
         final UDeclaration decl = refMethod.getUastElement();
diff --git a/java/java-impl/src/inspectionDescriptions/SameReturnValue.html b/java/java-impl/src/inspectionDescriptions/SameReturnValue.html
index 5fee2f2f409c..de72c24375b8 100644
--- a/java/java-impl/src/inspectionDescriptions/SameReturnValue.html
+++ b/java/java-impl/src/inspectionDescriptions/SameReturnValue.html
@@ -1,6 +1,13 @@
 <html>
 <body>
-Reports methods and method hierarchies in which the return value always appears to
-be the same constant.
+Reports methods and method hierarchies that always return the same constant.
+<p><b>Example:</b></p>
+<pre><code>
+  class X {
+    int xxx() {
+      return 0;
+    }
+  }
+</code></pre>
 </body>
 </html>
diff --git a/java/java-tests/testData/inspection/jvm/sameReturnValue/java/expected.xml b/java/java-tests/testData/inspection/jvm/sameReturnValue/java/expected.xml
index 5b139ecd8499..72a3f27a350b 100644
--- a/java/java-tests/testData/inspection/jvm/sameReturnValue/java/expected.xml
+++ b/java/java-tests/testData/inspection/jvm/sameReturnValue/java/expected.xml
@@ -4,19 +4,19 @@
     <file>Test.java</file>
     <line>3</line>
     <problem_class>Method returns the same value</problem_class>
-    <description>Method always returns &lt;code&gt;0&lt;/code&gt;</description>
+    <description>Method &lt;code&gt;xxx()&lt;/code&gt; always returns &lt;code&gt;0&lt;/code&gt;</description>
   </problem>
   <problem>
     <file>Test.java</file>
     <line>10</line>
     <problem_class>Method returns the same value</problem_class>
-    <description>Method always returns &lt;code&gt;0&lt;/code&gt;</description>
+    <description>Method &lt;code&gt;compare()&lt;/code&gt; always returns &lt;code&gt;0&lt;/code&gt;</description>
   </problem>
   <problem>
     <file>LambdaWithSameValue.java</file>
     <line>2</line>
     <problem_class>Method returns the same value</problem_class>
-    <description>All implementations of this method always return &lt;code&gt;42&lt;/code&gt;</description>
+    <description>All implementations of method &lt;code&gt;getResult()&lt;/code&gt; always return &lt;code&gt;42&lt;/code&gt;</description>
   </problem>
 </problems>
 
diff --git a/java/java-tests/testData/inspection/jvm/sameReturnValue/kotlin/expected.xml b/java/java-tests/testData/inspection/jvm/sameReturnValue/kotlin/expected.xml
index 5038dd0ed1d3..6356fb3face5 100644
--- a/java/java-tests/testData/inspection/jvm/sameReturnValue/kotlin/expected.xml
+++ b/java/java-tests/testData/inspection/jvm/sameReturnValue/kotlin/expected.xml
@@ -4,14 +4,14 @@
     <file>Test.kt</file>
     <line>2</line>
     <problem_class>Method returns the same value</problem_class>
-    <description>Method always returns &lt;code&gt;0&lt;/code&gt;</description>
+    <description>Method &lt;code&gt;xxx()&lt;/code&gt; always returns &lt;code&gt;0&lt;/code&gt;</description>
   </problem>
 
   <problem>
     <file>Test.kt</file>
     <line>8</line>
     <problem_class>Method returns the same value</problem_class>
-    <description>Method and all its derivables always return &lt;code&gt;foo&lt;/code&gt;</description>
+    <description>Method &lt;code&gt;xxx()&lt;/code&gt; and all its overriding methods always return &lt;code&gt;foo&lt;/code&gt;</description>
   </problem>
 </problems>
 
diff --git a/java/java-tests/testData/inspection/jvm/sameReturnValue/mixed/expected.xml b/java/java-tests/testData/inspection/jvm/sameReturnValue/mixed/expected.xml
index dbc086b34e0e..b2389b4a3f23 100644
--- a/java/java-tests/testData/inspection/jvm/sameReturnValue/mixed/expected.xml
+++ b/java/java-tests/testData/inspection/jvm/sameReturnValue/mixed/expected.xml
@@ -4,7 +4,7 @@
     <file>Bar.kt</file>
     <line>2</line>
     <problem_class>Method returns the same value</problem_class>
-    <description>Method and all its derivables always return &lt;code&gt;0&lt;/code&gt;</description>
+    <description>Method &lt;code&gt;xxx()&lt;/code&gt; and all its overriding methods always return &lt;code&gt;0&lt;/code&gt;</description>
   </problem>
 
 </problems>