diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorUtil.java b/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorUtil.java
index 25df9669f1e6..4108c1bce9c9 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorUtil.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorUtil.java
@@ -98,7 +98,7 @@ public class ProblemDescriptorUtil {
     message = StringUtil.replace(message, "#end", "");
     message = StringUtil.replace(message, "#treeend", "");
 
-    return message;
+    return message.trim();
   }
 
   public static String unescapeTags(String message) {
@@ -108,7 +108,7 @@ public class ProblemDescriptorUtil {
       message = unescapeXmlCode(message);
     }
     else {
-      message = StringUtil.unescapeXml(message).trim();
+      message = StringUtil.unescapeXml(message);
     }
     return message;
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java
index 40809a7f1477..b7444727f7ea 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java
@@ -66,7 +66,7 @@ public class OfflineProblemDescriptorNode extends ProblemDescriptionNode {
   protected String calculatePresentableName() {
     String presentableName = super.calculatePresentableName();
     return presentableName.isEmpty() && getUserObject() instanceof OfflineProblemDescriptor
-           ? ProblemDescriptorUtil.unescapeTags(StringUtil.notNullize(((OfflineProblemDescriptor)getUserObject()).getDescription()))
+           ? ProblemDescriptorUtil.unescapeTags(StringUtil.notNullize(((OfflineProblemDescriptor)getUserObject()).getDescription())).trim()
            : presentableName;
   }