diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index d6d334e3..46c77bb0 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -20,10 +20,24 @@
   # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<% unless @dmsf_already_rendered %>
-  <% @dmsf_already_rendered = true # Prevent recursion %>
-  <%# Render the original view %>
-  <%= render partial: 'mailer/issue', locals: { issue: issue, issue_url: issue_url, user: user } %>
-  <%# DMSF extension %>
-  <%= render partial: 'hooks/redmine_dmsf/view_mailer_issue', locals: { issue: issue } %>
+<%# The original Redmine code %>
+<%# TODO: Render the original template %>
+<h1>
+  <%= link_to("#{issue.tracker.name} ##{issue.id}: #{issue.subject}", issue_url) %>
+  <%= issue_status_type_badge(issue.status) %>
+</h1>
+
+<%= render_email_issue_attributes(issue, user, true) %>
+
+<%= textilizable(issue, :description, :only_path => false) %>
+
+<% if issue.attachments.any? %>
+  <fieldset class="attachments"><legend><%= l(:label_attachment_plural) %></legend>
+    <% issue.attachments.each do |attachment| %>
+      <%= link_to_attachment attachment, :download => true, :only_path => false %>
+      (<%= number_to_human_size(attachment.filesize) %>)<br />
+    <% end %>
+  </fieldset>
 <% end %>
+<%# DMSF extension %>
+<%= render partial: 'hooks/redmine_dmsf/view_mailer_issue', locals: { issue: issue } %>
diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb
index d6d334e3..ebf3a974 100644
--- a/app/views/mailer/_issue.text.erb
+++ b/app/views/mailer/_issue.text.erb
@@ -20,10 +20,20 @@
   # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<% unless @dmsf_already_rendered %>
-  <% @dmsf_already_rendered = true # Prevent recursion %>
-  <%# Render the original view %>
-  <%= render partial: 'mailer/issue', locals: { issue: issue, issue_url: issue_url, user: user } %>
-  <%# DMSF extension %>
-  <%= render partial: 'hooks/redmine_dmsf/view_mailer_issue', locals: { issue: issue } %>
-<% end %>
+<%# The original Redmine code %>
+<%# TODO: Render the original template %>
+<%= "#{issue.tracker.name} ##{issue.id}: #{issue.subject}" %>
+<%= issue_url %>
+
+<%= render_email_issue_attributes(issue, user) %>
+----------------------------------------
+<%= issue.description %>
+
+<% if issue.attachments.any? -%>
+  ---<%= l(:label_attachment_plural).ljust(37, '-') %>
+  <% issue.attachments.each do |attachment| -%>
+    <%= attachment.filename %> (<%= number_to_human_size(attachment.filesize) %>)
+  <% end -%>
+<% end -%>
+<%# DMSF extension %>
+<%= render partial: 'hooks/redmine_dmsf/view_mailer_issue', locals: { issue: issue } %>