diff --git a/python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java b/python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java
index 63663acfc9e7..97d59e08c56f 100644
--- a/python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java
+++ b/python/src/com/jetbrains/python/documentation/PythonDocumentationProvider.java
@@ -77,7 +77,7 @@ public class PythonDocumentationProvider extends AbstractDocumentationProvider i
           summary = docString.getSummary();
       }
       return $(cat.toString()).add(describeDecorators(func, LSame2, ", ", LSame1)).add(describeFunction(func, LSame2, LSame1))
-        .toString() + summary;
+        .toString() + "\n" + summary;
     }
     else if (element instanceof PyClass) {
       PyClass cls = (PyClass)element;
@@ -94,7 +94,7 @@ public class PythonDocumentationProvider extends AbstractDocumentationProvider i
           summary = docString.getSummary();
       }
 
-      return describeDecorators(cls, LSame2, ", ", LSame1).add(describeClass(cls, LSame2, false, false)).toString() + summary;
+      return describeDecorators(cls, LSame2, ", ", LSame1).add(describeClass(cls, LSame2, false, false)).toString() + "\n" + summary;
     }
     else if (element instanceof PyTargetExpression || element instanceof PyNamedParameter) {
       return describeExpression((PyExpression)element, originalElement);
diff --git a/python/testData/quickdoc/HoverOverClass.html b/python/testData/quickdoc/HoverOverClass.html
index 8404accf51be..63aebdfa4702 100644
--- a/python/testData/quickdoc/HoverOverClass.html
+++ b/python/testData/quickdoc/HoverOverClass.html
@@ -1 +1,2 @@
-class A(object)
\ No newline at end of file
+class A(object)
+Doc of A
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/EpydocStringTest.java b/python/testSrc/com/jetbrains/python/EpydocStringTest.java
index 4488d28d8170..29f2dc3f9d2a 100644
--- a/python/testSrc/com/jetbrains/python/EpydocStringTest.java
+++ b/python/testSrc/com/jetbrains/python/EpydocStringTest.java
@@ -64,7 +64,7 @@ public class EpydocStringTest extends UsefulTestCase {
     assertOrderedEquals(params, "euid", "egid", "function", "*args", "**kwargs");
     assertEquals("effective UID used to call the function.", docString.getParamDescription("euid"));
     assertEquals("effective GID used to call the function.", docString.getParamDescription("egid"));
-    assertEquals("arguments passed to function", docString.getParamDescription("args"));
+    assertEquals("arguments passed to function.", docString.getParamDescription("args"));
   }
 
   public void testInlineMarkupToHTML() {