diff --git a/CHANGES.txt b/CHANGES.txt
index 94c3fdb..742dd94 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,13 @@ Changelog
 1.0b5 (unreleased)
 ------------------
 
+* Make sure the form fields in the reply form are always placed under the field 
+  labels. 
+  [timo]
+  
+* Fix CSS overflow bug that occurs with the new Plone 4.0b5 comment styles.
+  [timo]
+  
 * Unnecessary imports and variables removed.
   [timo]
   
diff --git a/plone/app/discussion/browser/stylesheets/discussion.css b/plone/app/discussion/browser/stylesheets/discussion.css
index 8deb390..459cdfa 100644
--- a/plone/app/discussion/browser/stylesheets/discussion.css
+++ b/plone/app/discussion/browser/stylesheets/discussion.css
@@ -18,7 +18,6 @@
 
 .comment {
     min-height: 100px;
-    overflow: auto;
 }
 
 .commentImage {
@@ -60,6 +59,13 @@
     margin: 0 !important;
 }
 
+.reply .text-widget {
+	/* Make sure the input fields are always below the label. This sometimes
+	 * break when the reply form is copied from the main comment form. 
+	 */
+	display: block;
+}
+
 .reply-to-comment-button {
    /* Hide the reply-to-comment button and show it only if Javascript
     * is enabled. Since the reply functions rely on jQuery.