diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala
index 487c3b5..dc5cfed 100644
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -88,7 +88,7 @@
       try {
         // TODO mark issue as 'merged'
         val loginAccount = context.loginAccount.get
-        createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Closed", Some("close"))
+        createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Closed", "close")
         updateClosed(repository.owner, repository.name, issueId, true)
         recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)
 
diff --git a/src/main/twirl/pulls/discussion.scala.html b/src/main/twirl/pulls/discussion.scala.html
index 40fc098..dc5b385 100644
--- a/src/main/twirl/pulls/discussion.scala.html
+++ b/src/main/twirl/pulls/discussion.scala.html
@@ -79,17 +79,20 @@
           @markdown(comment.content, repository, false, true)
         </div>
       </div>
-      @comment.action.map { action =>
       <div class="small issue-comment-action">
-        @if(action == "close"){
+        @if(comment.action == "close" || comment.action == "close_comment"){
+        <div class="small issue-comment-action">
           <span class="label label-important">Closed</span>
           <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate)
-        } else {
+        </div>
+        }
+        @if(comment.action == "reopen" || comment.action == "reopen_comment"){
+        <div class="small issue-comment-action">
           <span class="label label-success">Reopened</span>
           <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> reopened the issue @datetime(comment.registeredDate)
+        </div>
         }
       </div>
-      }
     }
     @if(hasWritePermission && !issue.closed){
       <div class="box issue-comment-box" style="background-color: #d8f5cd;">