diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/unnecessaryTostring/afterSimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/unnecessaryTostring/afterSimple.java
index b8c4cb1ed8ac..e8f659be4be6 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/unnecessaryTostring/afterSimple.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/unnecessaryTostring/afterSimple.java
@@ -1,4 +1,4 @@
-// "Fix all 'Unnecessary call to 'toString()'' problems in file" "true"
+// "Remove redundant 'toString()' call" "true"
 class X {
   void test(Object x) {
     System.out.println(x);
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/unnecessaryTostring/beforeSimple.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/unnecessaryTostring/beforeSimple.java
index e95d58dc95d9..c74fc233c09f 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/unnecessaryTostring/beforeSimple.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/unnecessaryTostring/beforeSimple.java
@@ -1,4 +1,4 @@
-// "Fix all 'Unnecessary call to 'toString()'' problems in file" "true"
+// "Remove redundant 'toString()' call" "true"
 class X {
   void test(Object x) {
     System.out.println(x.toStri<caret>ng());
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java
index 231bfb6ead5e..e95b066bfb47 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java
@@ -36,8 +36,7 @@ public class UnnecessaryToStringCallInspection extends BaseInspection implements
   @Override
   @NotNull
   protected String buildErrorString(Object... infos) {
-    final String text = (String)infos[0];
-    return InspectionGadgetsBundle.message("unnecessary.tostring.call.problem.descriptor", text);
+    return InspectionGadgetsBundle.message("unnecessary.tostring.call.problem.descriptor");
   }
 
   @Override
@@ -48,16 +47,18 @@ public class UnnecessaryToStringCallInspection extends BaseInspection implements
   }
 
   private static class UnnecessaryToStringCallFix extends InspectionGadgetsFix {
+    private final @Nullable String replacementText;
 
-    private final String replacementText;
-
-    private UnnecessaryToStringCallFix(String replacementText) {
+    private UnnecessaryToStringCallFix(@Nullable String replacementText) {
       this.replacementText = replacementText;
     }
 
     @Override
     @NotNull
     public String getName() {
+      if (replacementText == null) {
+        return InspectionGadgetsBundle.message("inspection.redundant.string.remove.fix.name", "toString");
+      }
       return CommonQuickFixBundle.message("fix.replace.with.x", replacementText);
     }
 
@@ -98,7 +99,7 @@ public class UnnecessaryToStringCallInspection extends BaseInspection implements
       if (referenceNameElement == null) return;
       PsiExpression qualifier = ExpressionUtils.getEffectiveQualifier(methodExpression);
       if (qualifier == null) return;
-      registerError(referenceNameElement, ProblemHighlightType.LIKE_UNUSED_SYMBOL, qualifier.getText());
+      registerError(referenceNameElement, ProblemHighlightType.LIKE_UNUSED_SYMBOL, qualifier.isPhysical() ? null : qualifier.getText());
     }
   }