diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 6bd9ab06fb..5ff0591602 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1143,33 +1143,36 @@ section {
   height: 25px;
 }
 /* threaded comments */
-.children > .children {
+.children .children {
   margin-left: 40px;
 }
-.children > .children .wall-item-container {
+.children .children .wall-item-container {
   width: 710px;
 }
-.children > .children > .children {
+.children .children .children {
   margin-left: 40px;
 }
-.children > .children > .children .wall-item-container {
+.children .children .children .wall-item-container {
   width: 670px;
 }
-.children > .children > .children > .children {
+.children .children .children .children {
   margin-left: 40px;
 }
-.children > .children > .children > .children .wall-item-container {
+.children .children .children .children .wall-item-container {
   width: 630px;
 }
-.children > .children > .children > .children > .children {
+.children .children .children .children .children {
   margin-left: 40px;
 }
-.children > .children > .children > .children > .children .wall-item-container {
+.children .children .children .children .children .wall-item-container {
   width: 590px;
 }
-.children > .children > .children > .children > .children .children {
+.children .children .children .children .children .children {
   margin-left: 0px;
 }
+.threaded .hide-comments-outer {
+  margin-left: 20px;
+}
 span[id^="showmore-teaser"] {
   background: url("showmore-bg.jpg") no-repeat center bottom;
 }
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 2e97027b4b..3cc4e8cf61 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1143,33 +1143,36 @@ section {
   height: 25px;
 }
 /* threaded comments */
-.children > .children {
+.children .children {
   margin-left: 40px;
 }
-.children > .children .wall-item-container {
+.children .children .wall-item-container {
   width: 710px;
 }
-.children > .children > .children {
+.children .children .children {
   margin-left: 40px;
 }
-.children > .children > .children .wall-item-container {
+.children .children .children .wall-item-container {
   width: 670px;
 }
-.children > .children > .children > .children {
+.children .children .children .children {
   margin-left: 40px;
 }
-.children > .children > .children > .children .wall-item-container {
+.children .children .children .children .wall-item-container {
   width: 630px;
 }
-.children > .children > .children > .children > .children {
+.children .children .children .children .children {
   margin-left: 40px;
 }
-.children > .children > .children > .children > .children .wall-item-container {
+.children .children .children .children .children .wall-item-container {
   width: 590px;
 }
-.children > .children > .children > .children > .children .children {
+.children .children .children .children .children .children {
   margin-left: 0px;
 }
+.threaded .hide-comments-outer {
+  margin-left: 20px;
+}
 span[id^="showmore-teaser"] {
   background: url("showmore-bg.jpg") no-repeat center bottom;
 }
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 55b2d73ac5..a424ee0207 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -599,19 +599,19 @@ section {
 /* threaded comments */
 .children {
 
-	&> .children {
+	& .children {
 		margin-left: 40px;
 		.wall-item-container { width: 710px; }
 	
-		&> .children {
+		& .children {
 			margin-left: 40px;
 			.wall-item-container { width: 670px; }
 		
-			&> .children {
+			& .children {
 				margin-left: 40px;
 				.wall-item-container { width: 630px; }
 
-				&> .children {
+				& .children {
 					margin-left: 40px;
 					.wall-item-container { width: 590px; }
 					
@@ -623,6 +623,7 @@ section {
 		}
 	}
 }
+.threaded .hide-comments-outer { margin-left: 20px; }
 
 span[id^="showmore-teaser"]{
     background: url("showmore-bg.jpg") no-repeat center bottom;
diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl
index 305ace92ef..491c47302f 100644
--- a/view/theme/quattro/threaded_conversation.tpl
+++ b/view/theme/quattro/threaded_conversation.tpl
@@ -1,16 +1,6 @@
 {{ for $threads as $item }}
 <div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}">
-        {{if $mode == display}}
-        {{ else }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-        {{ endif }}
-        
+       
 		{{ if $item.type == tag }}
 			{{ inc wall_item_tag.tpl }}{{ endinc }}
 		{{ else }}
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
index b51dc3d7df..4d454f00db 100644
--- a/view/theme/quattro/wall_thread.tpl
+++ b/view/theme/quattro/wall_thread.tpl
@@ -1,3 +1,13 @@
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+	</div>
+	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}
+{{ endif }}
+
 
 <div class="wall-item-decor">
 	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
@@ -105,6 +115,11 @@
 	</div>
 {{ endfor }}
 
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_lastcollapsed}}</div>{{endif}}
+{{ endif }}
+
 {{ if $item.flatten }}
 <div class="wall-item-comment-wrapper" >
 	$item.comment
diff --git a/view/theme/quattro/wallwall_thread.tpl b/view/theme/quattro/wallwall_thread.tpl
index 038b156d12..cc2f8e3627 100644
--- a/view/theme/quattro/wallwall_thread.tpl
+++ b/view/theme/quattro/wallwall_thread.tpl
@@ -1,3 +1,13 @@
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+	</div>
+	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}
+{{ endif }}
+
 <div class="wall-item-decor">
 	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
 	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
@@ -112,6 +122,11 @@
 	</div>
 {{ endfor }}
 
+{{if $mode == display}}
+{{ else }}
+{{if $item.comment_lastcollapsed}}</div>{{endif}}
+{{ endif }}
+
 {{ if $item.flatten }}
 <div class="wall-item-comment-wrapper" >
 	$item.comment