diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index 769b6e0..761b4c8 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -11,14 +11,14 @@ module Emails
       @note = Note.find(note_id)
       @issue = @note.noteable
       @project = @note.project
-      mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.id}"))
+      mail(to: recipient(recipient_id), subject: subject("note for issue ##{@issue.iid}"))
     end
 
     def note_merge_request_email(recipient_id, note_id)
       @note = Note.find(note_id)
       @merge_request = @note.noteable
       @project = @note.project
-      mail(to: recipient(recipient_id), subject: subject("note for merge request !#{@merge_request.id}"))
+      mail(to: recipient(recipient_id), subject: subject("note for merge request !#{@merge_request.iid}"))
     end
 
     def note_wall_email(recipient_id, note_id)
diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml
index 9836923..bf81cfd 100644
--- a/app/views/projects/milestones/_issues.html.haml
+++ b/app/views/projects/milestones/_issues.html.haml
@@ -4,7 +4,7 @@
     - issues.each do |issue|
       %li
         = link_to [@project, issue] do
-          %span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.id}
+          %span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.iid}
         = link_to_gfm truncate(issue.title, length: 40), [@project, issue]
         - if issue.assignee
           .pull-right
--
libgit2 0.21.2