diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
index 7ec9943858e..d3b6e66ccf3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
@@ -160,31 +160,34 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
             }
 
             var renderedDecl = DESCRIPTOR_RENDERER.render(declarationDescriptor)
+
             if (!quickNavigation) {
                 renderedDecl = "<pre>$renderedDecl</pre>"
             }
 
             renderedDecl += renderDeprecationInfo(declarationDescriptor)
 
-            val comment = declarationDescriptor.findKDoc()
-            if (comment != null) {
-                val renderedComment = KDocRenderer.renderKDoc(comment)
-                if (renderedComment.startsWith("<p>")) {
-                    renderedDecl += renderedComment
+            if (!quickNavigation) {
+                val comment = declarationDescriptor.findKDoc()
+                if (comment != null) {
+                    val renderedComment = KDocRenderer.renderKDoc(comment)
+                    if (renderedComment.startsWith("<p>")) {
+                        renderedDecl += renderedComment
+                    }
+                    else {
+                        renderedDecl = "$renderedDecl<br/>$renderedComment"
+                    }
                 }
                 else {
-                    renderedDecl = "$renderedDecl<br/>$renderedComment"
-                }
-            }
-            else {
-                if (declarationDescriptor is CallableDescriptor) { // If we couldn't find KDoc, try to find javadoc in one of super's
-                    val psi = declarationDescriptor.findPsi() as? KtFunction
-                    if (psi != null) {
-                        val lightElement = LightClassUtil.getLightClassMethod(psi) // Light method for super's scan in javadoc info gen
-                        val javaDocInfoGenerator = JavaDocInfoGeneratorFactory.create(psi.project, lightElement)
-                        val builder = StringBuilder()
-                        if (javaDocInfoGenerator.generateDocInfoCore(builder, false))
-                            renderedDecl += builder.toString().substringAfter("</PRE>") // Cut off light method signature
+                    if (declarationDescriptor is CallableDescriptor) { // If we couldn't find KDoc, try to find javadoc in one of super's
+                        val psi = declarationDescriptor.findPsi() as? KtFunction
+                        if (psi != null) {
+                            val lightElement = LightClassUtil.getLightClassMethod(psi) // Light method for super's scan in javadoc info gen
+                            val javaDocInfoGenerator = JavaDocInfoGeneratorFactory.create(psi.project, lightElement)
+                            val builder = StringBuilder()
+                            if (javaDocInfoGenerator.generateDocInfoCore(builder, false))
+                                renderedDecl += builder.toString().substringAfter("</PRE>") // Cut off light method signature
+                        }
                     }
                 }
             }
diff --git a/idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt b/idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt
index 4c5cae454a8..81ca171d352 100644
--- a/idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt
+++ b/idea/testData/editor/quickDoc/AtConstantWithUnderscore.kt
@@ -9,4 +9,4 @@ class C {
     }
 }
 
-//INFO: <b>public</b> <b>final</b> <b>fun</b> foo(): Unit <i>defined in</i> C<p>Use <a href="psi_element://SOME_REFERENCED_VAL">SOME_REFERENCED_VAL</a> to do something</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>fun</b> foo(): Unit <i>defined in</i> C</pre><p>Use <a href="psi_element://SOME_REFERENCED_VAL">SOME_REFERENCED_VAL</a> to do something</p>
diff --git a/idea/testData/editor/quickDoc/AtFunctionParameter.kt b/idea/testData/editor/quickDoc/AtFunctionParameter.kt
index ca67fda641b..1f21b8f1ebc 100644
--- a/idea/testData/editor/quickDoc/AtFunctionParameter.kt
+++ b/idea/testData/editor/quickDoc/AtFunctionParameter.kt
@@ -1,3 +1,3 @@
 fun some(<caret>f: (Int) -> String) : String? = null
 
-//INFO: <b>value-parameter</b> f: (Int) &rarr; String <i>defined in</i> some
+//INFO: <pre><b>value-parameter</b> f: (Int) &rarr; String <i>defined in</i> some</pre>
diff --git a/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt b/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt
index 5da8e91eb63..3f54784a958 100644
--- a/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt
+++ b/idea/testData/editor/quickDoc/AtImplicitLambdaParameter.kt
@@ -4,4 +4,4 @@ fun foo() {
     }
 }
 
-//INFO: <b>value-parameter</b> it: Int <i>defined in</i> foo.&lt;anonymous&gt;
\ No newline at end of file
+//INFO: <pre><b>value-parameter</b> it: Int <i>defined in</i> foo.&lt;anonymous&gt;</pre>
diff --git a/idea/testData/editor/quickDoc/AtTypeParameter.kt b/idea/testData/editor/quickDoc/AtTypeParameter.kt
index 7aa73d71d78..bb239791a0b 100644
--- a/idea/testData/editor/quickDoc/AtTypeParameter.kt
+++ b/idea/testData/editor/quickDoc/AtTypeParameter.kt
@@ -2,4 +2,4 @@ interface Base
 
 class Some<<caret>T: Base>
 
-//INFO: &lt;T : <a href="psi_element://Base">Base</a>&gt; <i>defined in</i> Some
+//INFO: <pre>&lt;T : <a href="psi_element://Base">Base</a>&gt; <i>defined in</i> Some</pre>
diff --git a/idea/testData/editor/quickDoc/AtVariableDeclaration.kt b/idea/testData/editor/quickDoc/AtVariableDeclaration.kt
index 6eef2e9091f..0afad3aaad1 100644
--- a/idea/testData/editor/quickDoc/AtVariableDeclaration.kt
+++ b/idea/testData/editor/quickDoc/AtVariableDeclaration.kt
@@ -5,4 +5,4 @@ fun test() {
 }
 
 
-//INFO: <b>val</b> test: String? <i>defined in</i> test
+//INFO: <pre><b>val</b> test: String? <i>defined in</i> test</pre>
diff --git a/idea/testData/editor/quickDoc/ConstructorVarParameter.kt b/idea/testData/editor/quickDoc/ConstructorVarParameter.kt
index 4b2fcf79fc4..e0550f31bc9 100644
--- a/idea/testData/editor/quickDoc/ConstructorVarParameter.kt
+++ b/idea/testData/editor/quickDoc/ConstructorVarParameter.kt
@@ -4,4 +4,4 @@ class C(var v: Int) {
     }
 }
 
-//INFO: <b>public</b> <b>final</b> <b>var</b> v: Int <i>defined in</i> C
+//INFO: <pre><b>public</b> <b>final</b> <b>var</b> v: Int <i>defined in</i> C</pre>
diff --git a/idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt b/idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt
index 0261aea5cf2..928f91b8693 100644
--- a/idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt
+++ b/idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt
@@ -3,4 +3,4 @@ fun <caret>lol() {
     println("lol")
 }
 
-//INFO: @<a href="psi_element://kotlin.Deprecated">Deprecated</a> <b>public</b> <b>fun</b> lol(): Unit <i>defined in</i> root package<DL><DT><b>Deprecated:</b></DT><DD>lol no more mainstream</DD><DT><b>Replace with:</b></DT><DD><code>kek()</code></DD></DL>
+//INFO: <pre>@<a href="psi_element://kotlin.Deprecated">Deprecated</a> <b>public</b> <b>fun</b> lol(): Unit <i>defined in</i> root package</pre><DL><DT><b>Deprecated:</b></DT><DD>lol no more mainstream</DD><DT><b>Replace with:</b></DT><DD><code>kek()</code></DD></DL>
diff --git a/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt b/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt
index 6425206677d..56966d1d88a 100644
--- a/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt
+++ b/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt
@@ -8,7 +8,7 @@
  */
 class <caret>A<T>
 
-//INFO: <b>public</b> <b>final</b> <b>class</b> A&lt;T&gt; <i>defined in</i> root package<p>Code block:</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>class</b> A&lt;T&gt; <i>defined in</i> root package</pre><p>Code block:</p>
 //INFO: <pre><code>
 //INFO: A&lt;T&gt;
 //INFO: </code></pre><p>Code span: <code>&lt;T&gt;</code> is type parameter</p>
diff --git a/idea/testData/editor/quickDoc/IndentedCodeBlock.kt b/idea/testData/editor/quickDoc/IndentedCodeBlock.kt
index 76e22368692..8c1296e8348 100644
--- a/idea/testData/editor/quickDoc/IndentedCodeBlock.kt
+++ b/idea/testData/editor/quickDoc/IndentedCodeBlock.kt
@@ -13,7 +13,7 @@
  */
 class <caret>A
 
-//INFO: <b>public</b> <b>final</b> <b>class</b> A <i>defined in</i> root package<br/><pre><code>val a = A()
+//INFO: <pre><b>public</b> <b>final</b> <b>class</b> A <i>defined in</i> root package</pre><br/><pre><code>val a = A()
 //INFO: println(a) // comment</code></pre><pre><code>
 //INFO: &lt;fenced&gt;Code_block&lt;/fenced&gt;
 //INFO: </code></pre><pre><code>val b = B()
diff --git a/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt b/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt
index 110b681e276..f905d3ee993 100644
--- a/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt
+++ b/idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt
@@ -2,4 +2,7 @@ fun testing() {
     <caret>SomeClass<List<String>>()
 }
 
-//INFO: <b>public</b> <b>constructor</b> SomeClass&lt;T : (<(raw) Any?>&lt;Any?&gt;..<(raw) Any?>&lt;*&gt;?)&gt;()<br/>Java declaration:<br/>[light_idea_test_case] public class SomeClass&lt;T extends java.util.List&gt; extends Object
+//INFO: <html><head>    <style type="text/css">        #error {            background-color: #eeeeee;            margin-bottom: 10px;        }        p {            margin: 5px 0;        }    </style></head><body><PRE>public class <b>SomeClass</b>&lt;T extends <a href="psi_element://java.util.List"><code>List</code></a>&gt;
+//INFO: extends <a href="psi_element://java.lang.Object"><code>Object</code></a></PRE>
+//INFO:    Some Java Class
+//INFO:    <DD><DL><DT><b>Type parameters:</b><DD><code>&lt;T&gt;</code> - </DD></DL></DD></body></html>
diff --git a/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt b/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt
index 70ceeb3bf57..6d54330807d 100644
--- a/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt
+++ b/idea/testData/editor/quickDoc/JavaDocFromOverridenClass.kt
@@ -4,6 +4,6 @@ class A : OverrideMe() {
 }
 
 
-//INFO: <b>protected</b> <b>open</b> <b>fun</b> overrideMe(): Unit <i>defined in</i> A<DD><DL><DT><b>Description copied from class:</b>&nbsp;<a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
+//INFO: <pre><b>protected</b> <b>open</b> <b>fun</b> overrideMe(): Unit <i>defined in</i> A</pre><DD><DL><DT><b>Description copied from class:</b>&nbsp;<a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
 //INFO:        Some comment
 //INFO:      </DD></DL></DD><DD><DL><DT><b>Overrides:</b><DD><a href="psi_element://OverrideMe#overrideMe()"><code>overrideMe</code></a> in class <a href="psi_element://OverrideMe"><code>OverrideMe</code></a></DD></DL></DD>
diff --git a/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt b/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt
index b75eeb8e565..3581f116c53 100644
--- a/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt
+++ b/idea/testData/editor/quickDoc/JavaDocFromOverridenInterface.kt
@@ -4,6 +4,6 @@ class A : OverrideMe {
 }
 
 
-//INFO: <b>public</b> <b>open</b> <b>fun</b> overrideMe(): Unit <i>defined in</i> A<DD><DL><DT><b>Description copied from interface:</b>&nbsp;<a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
+//INFO: <pre><b>public</b> <b>open</b> <b>fun</b> overrideMe(): Unit <i>defined in</i> A</pre><DD><DL><DT><b>Description copied from interface:</b>&nbsp;<a href="psi_element://OverrideMe"><code>OverrideMe</code></a><br>
 //INFO:        Some comment
 //INFO:      </DD></DL></DD><DD><DL><DT><b>Specified by:</b><DD><a href="psi_element://OverrideMe#overrideMe()"><code>overrideMe</code></a> in interface <a href="psi_element://OverrideMe"><code>OverrideMe</code></a></DD></DL></DD>
diff --git a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
index a98e6526025..403f69fdefb 100644
--- a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
+++ b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt
@@ -2,4 +2,6 @@ fun ktTest() {
     Test.<caret>foo("SomeTest")
 }
 
-//INFO: <b>public</b> <b>open</b> <b>fun</b> foo(param: String!): Array&lt;(out) Any!&gt;!<br/>Java declaration:<br/>Test...
+//INFO: <html><head>    <style type="text/css">        #error {            background-color: #eeeeee;            margin-bottom: 10px;        }        p {            margin: 5px 0;        }    </style></head><body><small><b><a href="psi_element://Test"><code>Test</code></a></b></small><PRE><i>@Contract(value = &quot;_ -&gt; !null&quot;, pure = true)</i>&nbsp;
+//INFO: public static&nbsp;<a href="psi_element://java.lang.Object"><code>Object</code></a>[]&nbsp;<b>foo</b>(<a href="psi_element://java.lang.String"><code>String</code></a>&nbsp;param)</PRE>
+//INFO:        Java Method</body></html>
diff --git a/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java b/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java
index c01bbe787d9..ea3aea7edd6 100644
--- a/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java
+++ b/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java
@@ -6,4 +6,4 @@ class KotlinClassUsedFromJava {
     }
 }
 
-//INFO: <b>public</b> <b>final</b> <b>class</b> Test <i>defined in</i> testing<p>Some comment</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>class</b> Test <i>defined in</i> testing</pre><p>Some comment</p>
diff --git a/idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java b/idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java
index 3a5c38cb594..1471e1049a4 100644
--- a/idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java
+++ b/idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java
@@ -6,4 +6,5 @@ class KotlinPackageClassUsedFromJava {
     }
 }
 
-//INFO: [light_idea_test_case] testing...
+//INFO: <html><head>    <style type="text/css">        #error {            background-color: #eeeeee;            margin-bottom: 10px;        }        p {            margin: 5px 0;        }    </style></head><body><small><b>testing</b></small><PRE>public final class <b>testing.KotlinPackageClassUsedFromJava_DataKt</b>
+//INFO: extends <a href="psi_element://java.lang.Object"><code>Object</code></a></PRE></body></html>
diff --git a/idea/testData/editor/quickDoc/MethodFromStdLib.kt b/idea/testData/editor/quickDoc/MethodFromStdLib.kt
index b1daded16be..ff448d6df98 100644
--- a/idea/testData/editor/quickDoc/MethodFromStdLib.kt
+++ b/idea/testData/editor/quickDoc/MethodFromStdLib.kt
@@ -2,4 +2,4 @@ fun test() {
     listOf(1, 2, 4).<caret>filter { it > 0 }
 }
 
-//INFO: <b>public</b> inline <b>fun</b> &lt;T&gt; <a href="psi_element://kotlin.collections.Iterable">Iterable</a>&lt;<a href="psi_element://kotlin.collections.filter.T">T</a>&gt;.filter(predicate: (<a href="psi_element://kotlin.collections.filter.T">T</a>) &rarr; Boolean): <a href="psi_element://kotlin.collections.List">List</a>&lt;<a href="psi_element://kotlin.collections.filter.T">T</a>&gt; <i>defined in</i> kotlin.collections<p>Returns a list containing only elements matching the given <a href="psi_element://predicate">predicate</a>.</p>
+//INFO: <pre><b>public</b> inline <b>fun</b> &lt;T&gt; <a href="psi_element://kotlin.collections.Iterable">Iterable</a>&lt;<a href="psi_element://kotlin.collections.filter.T">T</a>&gt;.filter(predicate: (<a href="psi_element://kotlin.collections.filter.T">T</a>) &rarr; Boolean): <a href="psi_element://kotlin.collections.List">List</a>&lt;<a href="psi_element://kotlin.collections.filter.T">T</a>&gt; <i>defined in</i> kotlin.collections</pre><p>Returns a list containing only elements matching the given <a href="psi_element://predicate">predicate</a>.</p>
diff --git a/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt b/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt
index f906b1ed483..22390000ad0 100644
--- a/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt
+++ b/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt
@@ -3,4 +3,4 @@
  */
 class <caret>Some
 
-//INFO: <b>public</b> <b>final</b> <b>class</b> Some <i>defined in</i> root package<p>Usefull comment</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>class</b> Some <i>defined in</i> root package</pre><p>Usefull comment</p>
diff --git a/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt
index ebf8ec30ffe..7f0777db3ef 100644
--- a/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt
+++ b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt
@@ -12,5 +12,5 @@ package test
  */
 fun <caret>testFun(first: String, second: Int) = 12
 
-//INFO: <b>public</b> <b>fun</b> testFun(first: String, second: Int): Int <i>defined in</i> test<p>Test function</p>
+//INFO: <pre><b>public</b> <b>fun</b> testFun(first: String, second: Int): Int <i>defined in</i> test</pre><p>Test function</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>first</code> - Some</dd><dd><code>second</code> - Other</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt b/idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt
index 29586df5d8e..ceb71bce1fa 100644
--- a/idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt
+++ b/idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt
@@ -14,4 +14,4 @@ fun test() {
     D().f<caret>oo()
 }
 
-//INFO: <b>public</b> <b>open</b> <b>fun</b> foo(): Int <i>defined in</i> D<p>This method returns zero.</p>
+//INFO: <pre><b>public</b> <b>open</b> <b>fun</b> foo(): Int <i>defined in</i> D</pre><p>This method returns zero.</p>
diff --git a/idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt b/idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt
index 6ebf11b717a..ab9c857aa27 100644
--- a/idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt
+++ b/idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt
@@ -14,4 +14,4 @@ fun test() {
     D().f<caret>oo
 }
 
-//INFO: <b>public</b> <b>open</b> <b>val</b> foo: Int <i>defined in</i> D<p>This property returns zero.</p>
+//INFO: <pre><b>public</b> <b>open</b> <b>val</b> foo: Int <i>defined in</i> D</pre><p>This property returns zero.</p>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsage.kt b/idea/testData/editor/quickDoc/OnMethodUsage.kt
index e6479e4de9b..792a157f64e 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsage.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsage.kt
@@ -12,5 +12,5 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package<p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt b/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt
index f273b92e222..9d720de94f1 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt
@@ -10,4 +10,4 @@ fun test() {
     <caret>testMethod()
 }
 
-//INFO: <b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package<p>Some documentation on two lines.</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package</pre><p>Some documentation on two lines.</p>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt
index db96215889f..9bcb9ead457 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt
@@ -12,5 +12,5 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package<p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt
index 2a22c4eb761..8087176e991 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt
@@ -24,7 +24,7 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package<p>Some documentation.</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package</pre><p>Some documentation.</p>
 //INFO: <pre><code>
 //INFO: Code block
 //INFO:     Second line
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt
index dc51d2f542a..6e3d2bb6ead 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt
@@ -27,7 +27,7 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package<p>Some documentation. <strong>Bold</strong> <em>underline</em> <code>code</code> foo: bar (baz) <a href="psi_element://quux">quux</a>  'apos'</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package</pre><p>Some documentation. <strong>Bold</strong> <em>underline</em> <code>code</code> foo: bar (baz) <a href="psi_element://quux">quux</a>  'apos'</p>
 //INFO: <p><a href="http://www.kotlinlang.org">Kotlin</a> <a href="http://www.ibm.com">a<strong>b</strong><strong>d</strong> kas</a></p>
 //INFO: <p><a href="psi_element://C">C</a></p>
 //INFO: <p><a href="psi_element://C">See <strong>this</strong> class</a></p>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt
index 6caef876148..fc6edf826d3 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt
@@ -13,7 +13,7 @@ fun test() {
     1.<caret>testMethod("value")
 }
 
-//INFO: <b>public</b> <b>fun</b> Int.testMethod(b: String): Unit <i>defined in</i> root package<p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> Int.testMethod(b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Receiver:</b></dt><dd>Some int</dd></dl>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>b</code> - String</dd></dl>
 //INFO: <dl><dt><b>Returns:</b></dt><dd>Return <a href="psi_element://a">a</a> and nothing else</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt
index 79f856c02a5..d2689982a5b 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt
@@ -13,6 +13,6 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package<p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
 //INFO: <dl><dt><b>Returns:</b></dt><dd>Return <a href="psi_element://a">a</a> and nothing else</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt
index 50bbd0bd200..12e921a24a3 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt
@@ -14,7 +14,7 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package<p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
 //INFO: <dl><dt><b>Returns:</b></dt><dd>Return value</dd></dl>
 //INFO: <dl><dt><b>Throws:</b></dt><dd><code>IllegalArgumentException</code> - if the weather is bad</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
index 1b05406a617..363c22bd572 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
@@ -17,5 +17,5 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package<br/>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package</pre><br/>
 //INFO: <DD><DL><DT><b>See Also:</b><DD><a href="psi_element://C"><code>C</code></a>, <a href="psi_element://D"><code>D</code></a>, <a href="http://kotl.in">kotlin</a></DD></DL></DD>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt
index 5e378c12200..07031f65495 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt
@@ -13,5 +13,5 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <b>public</b> <b>fun</b> &lt;T&gt; testMethod(a: Int, b: String): Unit <i>defined in</i> root package<p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> &lt;T&gt; testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>T</code> - the type parameter</dd><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
diff --git a/idea/testData/editor/quickDoc/Samples.kt b/idea/testData/editor/quickDoc/Samples.kt
index d1d391304e5..6d9f3665425 100644
--- a/idea/testData/editor/quickDoc/Samples.kt
+++ b/idea/testData/editor/quickDoc/Samples.kt
@@ -19,7 +19,7 @@ fun <caret>castTextSpell(spell: String) {
     throw SecurityException("Magic prohibited outside Hogwarts")
 }
 
-//INFO: <b>public</b> <b>fun</b> castTextSpell(spell: String): Unit <i>defined in</i> magic<br/>
+//INFO: <pre><b>public</b> <b>fun</b> castTextSpell(spell: String): Unit <i>defined in</i> magic</pre><br/>
 //INFO: <dl><dt><b>Samples:</b></dt><dd><a href="psi_element://Samples.sampleMagic"><code>Samples.sampleMagic</code></a><pre><code>
 //INFO: castTextSpell("[asd] [dse] [asz]")
 //INFO: </code></pre></dd><dd><a href="psi_element://sampleScroll"><code>sampleScroll</code></a><pre><code>
diff --git a/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java b/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java
index 8731a9d887d..12a628445eb 100644
--- a/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java
+++ b/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java
@@ -8,4 +8,4 @@ class Testing {
     }
 }
 
-//INFO: <b>public</b> <b>fun</b> foo(bar: Int): Unit <i>defined in</i> some<p>KDoc foo</p>
+//INFO: <pre><b>public</b> <b>fun</b> foo(bar: Int): Unit <i>defined in</i> some</pre><p>KDoc foo</p>
diff --git a/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt b/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt
index 378d061b225..81abe6e0328 100644
--- a/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt
+++ b/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt
@@ -8,4 +8,4 @@ fun main(args: Array<String>) {
     <caret>foo()
 }
 
-//INFO: <b>public</b> <b>fun</b> foo(x: <a href="psi_element://A">A</a>): Unit <i>defined in</i> root package
+//INFO: <pre><b>public</b> <b>fun</b> foo(x: <a href="psi_element://A">A</a>): Unit <i>defined in</i> root package</pre>
diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractQuickDocProviderTest.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractQuickDocProviderTest.java
index c6749053767..280d1f8b038 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractQuickDocProviderTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractQuickDocProviderTest.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.idea.editor.quickDoc;
 
+import com.intellij.codeInsight.documentation.DocumentationComponent;
 import com.intellij.codeInsight.documentation.DocumentationManager;
 import com.intellij.codeInsight.navigation.CtrlMouseHandler;
 import com.intellij.openapi.util.io.FileUtil;
@@ -41,8 +42,9 @@ public abstract class AbstractQuickDocProviderTest extends KotlinLightCodeInsigh
 
         DocumentationManager documentationManager = DocumentationManager.getInstance(myFixture.getProject());
         PsiElement targetElement = documentationManager.findTargetElement(myFixture.getEditor(), myFixture.getFile());
+        PsiElement originalElement = DocumentationManager.getOriginalElement(targetElement);
 
-        String info = CtrlMouseHandler.getInfo(targetElement, element);
+        String info = DocumentationManager.getProviderFromElement(targetElement).generateDoc(targetElement, originalElement);
         if (info != null) {
             info = StringUtil.convertLineSeparators(info);
         }