diff --git a/organize/comment/browser.py b/organize/comment/browser.py
index e38561f..1d41cc1 100644
--- a/organize/comment/browser.py
+++ b/organize/comment/browser.py
@@ -23,6 +23,7 @@ Definition of view classes and other browser related stuff for comments.
 from zope import interface, component
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.cachedescriptors.property import Lazy
+from zope.security import checkPermission
 
 from cybertools.browser.action import actions
 from cybertools.tracking.btree import TrackingStorage
@@ -32,6 +33,7 @@ from loops.browser.form import ObjectForm, EditObject
 from loops.browser.node import NodeView
 from loops.organize.comment.base import Comment
 from loops.organize.party import getPersonForUser
+from loops.organize.stateful.browser import StateAction
 from loops.organize.tracking.report import TrackDetails
 from loops.security.common import canAccessObject
 from loops.setup import addObject
@@ -83,6 +85,14 @@ class CommentsView(NodeView):
             result.append(CommentDetails(self, tr))
         return result
 
+    def getActionsFor(self, comment):
+        if not checkPermission('loops.ViewRestricted', self.context):
+            return []
+        stateAct = StateAction(self, 
+                        definition='organize.commentStates', 
+                        stateful=comment.track)
+        return [stateAct]
+
 
 class CommentDetails(TrackDetails):
 
diff --git a/organize/comment/comment_macros.pt b/organize/comment/comment_macros.pt
index e13d018..37cec4b 100644
--- a/organize/comment/comment_macros.pt
+++ b/organize/comment/comment_macros.pt
@@ -14,6 +14,13 @@
     <tal:comment tal:repeat="comment items">
       <br />
       <div class="comment">
+        <div class="object-actions"
+             tal:define="actions python:comments.getActionsFor(comment)"
+             tal:condition="actions">
+          <tal:actions repeat="action actions">
+            <metal:action use-macro="action/macro" />
+          </tal:actions>
+        </div>
         <h3>
           <span tal:content="comment/subject">Subject</span></h3>
         <div class="info">