diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index 893fe03..5ca99d3 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -1,9 +1,13 @@
-<tal:block define="errors options/state/getErrors|nothing;
-                   replies view/replies | nothing;"
+<tal:block define="userHasReplyPermission view/can_reply;
+                   isDiscussionAllowed view/is_discussion_allowed;
+                   replies view/get_replies;
+                   isAnon view/is_anonymous;
+                   errors options/state/getErrors|nothing;"
            i18n:domain="plone">
 
-    <div class="discussion">
-        <tal:getreplies repeat="reply_dict view/replies">
+    <div class="discussion"
+         tal:condition="python:replies or (userHasReplyPermission and isDiscussionAllowed) or (isAnon and not userHasReplyPermission and isDiscussionAllowed)">
+        <tal:getreplies repeat="reply_dict replies">
 
             <div class="comment"
                  tal:define="reply reply_dict/comment;
diff --git a/plone/app/discussion/browser/comments.py b/plone/app/discussion/browser/comments.py
index 62f7047..6285244 100644
--- a/plone/app/discussion/browser/comments.py
+++ b/plone/app/discussion/browser/comments.py
@@ -9,6 +9,8 @@ from zope.viewlet.interfaces import IViewlet
 
 from Acquisition import aq_inner, aq_parent
 
+from AccessControl import getSecurityManager
+
 from Products.Five.browser import BrowserView
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
@@ -46,13 +48,28 @@ class CommentsViewlet(BrowserView):
         self.portal_state = getMultiAdapter((context, self.request), name=u"plone_portal_state")
 
     def update(self):
-        pass
+        super(CommentsViewlet, self).update()
+        self.portal_discussion = getToolByName(self.context, 'portal_discussion', None)
+        self.portal_membership = getToolByName(self.context, 'portal_membership', None)
 
-    def replies(self):
+    def can_reply(self):
+        return getSecurityManager().checkPermission('Reply to item', aq_inner(self.context))
+
+    def is_discussion_allowed(self):
+        if self.portal_discussion is None:
+            return False
+        else:
+            return self.portal_discussion.isDiscussionAllowedFor(aq_inner(self.context))
+
+    def get_replies(self):
         # Return all direct replies
         conversation = conversationAdapterFactory(self.context)
         return conversation.getThreads()
 
+    def is_anonymous(self):
+        return self.portal_state.anonymous()
+
+
     def format_time(self, time):
         # TODO: to localized time not working!!!
         #util = getToolByName(self.context, 'translation_service')