diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index 5a508ed..9b21cd7 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -3,11 +3,13 @@
            i18n:domain="plone">
 
     <div class="discussion">
-
-        <tal:getreplies repeat="reply_dict replies">
+        <tal:getreplies repeat="reply_dict view/replies">
 
             <div class="comment"
-                 tal:define="reply python:reply_dict[1]">
+                 tal:define="reply reply_dict/comment;
+                             depth reply_dict/depth|python:0;"
+                 tal:attributes="class python:'comment replyTreeLevel'+str(depth);
+                                 style string:margin-left: ${depth}em;">
 
                 <h3>
                     <a name="comments" tal:attributes="name reply/title">
diff --git a/plone/app/discussion/browser/comments.py b/plone/app/discussion/browser/comments.py
index b6abdfb..51b021e 100644
--- a/plone/app/discussion/browser/comments.py
+++ b/plone/app/discussion/browser/comments.py
@@ -34,8 +34,9 @@ class CommentsViewlet(BrowserView):
         pass
 
     def replies(self):
+        # Return all direct replies
         conversation = conversationAdapterFactory(self.context)
-        return conversation.items()
+        return conversation.getThreads()
 
     def format_time(self, time):
         # TODO: to localized time not working!!!