diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index f6d5d65cd4e29f7eeefc96f7967386d0257f9c87..a6b22d641610172b15bfc17319b7e4cafc7559a5 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -112,8 +112,9 @@ def create_cross_reference_note(mentioned, noteable, author)
       },
       entity: {
         name: noteable_name.humanize.downcase,
-        url: entity_url
-      }
+        url: entity_url,
+        id: noteable_id
+      },
     }
 
     add_comment(data, issue_name)
@@ -170,7 +171,7 @@ def close_issue(commit, issue)
       update: {
         comment: [{
           add: {
-            body: "Issue solved with [#{commit.id}|#{commit_url}]."
+            body: "Issue solved by commit [#{commit.id}|#{commit_url}]."
           }
         }]
       },
@@ -188,10 +189,12 @@ def add_comment(data, issue_name)
     user_url = data[:user][:url]
     entity_name = data[:entity][:name]
     entity_url = data[:entity][:url]
+    entity_id = data[:entity][:id]
     project_name = data[:project][:name]
+    project_url = data[:project][:url]
 
     message = {
-      body: "[#{user_name}|#{user_url}] mentioned this issue in [a #{entity_name} of #{project_name}|#{entity_url}]."
+      body: "[#{user_name}|#{user_url}] mentioned this issue in [#{entity_name} ##{entity_id}|#{entity_url}] of [#{project_name}|#{project_url}]."
     }
 
     unless existing_comment?(issue_name, message[:body])