diff --git a/app/views/notify/closed_merge_request_email.html.haml b/app/views/notify/closed_merge_request_email.html.haml
index 3157f59..809d46f 100644
--- a/app/views/notify/closed_merge_request_email.html.haml
+++ b/app/views/notify/closed_merge_request_email.html.haml
@@ -1,7 +1,2 @@
 %p
-  = "Merge Request #{@merge_request.iid} was closed by #{@updated_by.name}"
-%p
-  != merge_path_description(@merge_request, '→')
-%p
-  Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
-
+  = "Merge Request !#{@merge_request.iid} was closed by #{@updated_by.name}"
diff --git a/app/views/notify/merged_merge_request_email.html.haml b/app/views/notify/merged_merge_request_email.html.haml
index e3a5239..0c62d43 100644
--- a/app/views/notify/merged_merge_request_email.html.haml
+++ b/app/views/notify/merged_merge_request_email.html.haml
@@ -1,7 +1,2 @@
 %p
-  = "Merge Request #{@merge_request.iid} was merged"
-%p
-  != merge_path_description(@merge_request, '→')
-%p
-  Assignee: #{@merge_request.author_name} → #{@merge_request.assignee_name}
-
+  = "Merge Request !#{@merge_request.iid} was merged"
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml
index f528717..65f0e4c 100644
--- a/app/views/notify/note_merge_request_email.html.haml
+++ b/app/views/notify/note_merge_request_email.html.haml
@@ -1,7 +1,7 @@
-%p.details
-  - if @note.for_diff_line?
-    = link_to "New comment on diff", diffs_project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
-  - else
-    = link_to "New comment", project_merge_request_url(@merge_request.target_project, @merge_request, anchor: "note_#{@note.id}")
-  for Merge Request ##{@merge_request.iid}
+- if @note.diff_file_name
+  %p.details
+    New comment on diff for
+    = link_to @note.diff_file_name, @target_url
+    \:
+
 = render 'note_message'
--
libgit2 0.21.2