diff --git a/app/views/mailer/account_activated.html.erb b/app/views/mailer/account_activated.html.erb
index 6dc952238..40b2bbd81 100644
--- a/app/views/mailer/account_activated.html.erb
+++ b/app/views/mailer/account_activated.html.erb
@@ -1,2 +1,4 @@
 <p><%= l(:notice_account_activated) %></p>
 <p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
+
+<%= call_hook(:view_mailer_account_activated_bottom) %>
diff --git a/app/views/mailer/account_activated.text.erb b/app/views/mailer/account_activated.text.erb
index 4dac4fb80..5a43d6b23 100644
--- a/app/views/mailer/account_activated.text.erb
+++ b/app/views/mailer/account_activated.text.erb
@@ -1,2 +1,4 @@
 <%= l(:notice_account_activated) %>
 <%= l(:label_login) %>: <%= @login_url %>
+
+<%= call_hook(:view_mailer_account_activated_bottom) %>
diff --git a/app/views/mailer/account_activation_request.html.erb b/app/views/mailer/account_activation_request.html.erb
index b19cf3219..138881e7e 100644
--- a/app/views/mailer/account_activation_request.html.erb
+++ b/app/views/mailer/account_activation_request.html.erb
@@ -1,2 +1,5 @@
 <p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
 <p><%= link_to @url, @url %></p>
+
+<%= call_hook(:view_mailer_account_activation_request_bottom,
+              :user => @user) %>
diff --git a/app/views/mailer/account_activation_request.text.erb b/app/views/mailer/account_activation_request.text.erb
index f431e22d3..e71a3f7fd 100644
--- a/app/views/mailer/account_activation_request.text.erb
+++ b/app/views/mailer/account_activation_request.text.erb
@@ -1,2 +1,5 @@
 <%= l(:mail_body_account_activation_request, @user.login) %>
 <%= @url %>
+
+<%= call_hook(:view_mailer_account_activation_request_bottom,
+              :user => @user) %>
diff --git a/app/views/mailer/account_information.html.erb b/app/views/mailer/account_information.html.erb
index d010431ab..edde87bad 100644
--- a/app/views/mailer/account_information.html.erb
+++ b/app/views/mailer/account_information.html.erb
@@ -11,3 +11,6 @@
 <% end %>
 
 <p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
+
+<%= call_hook(:view_mailer_account_information_bottom,
+              :user => @user) %>
diff --git a/app/views/mailer/account_information.text.erb b/app/views/mailer/account_information.text.erb
index f2f37d9c3..53f14e43e 100644
--- a/app/views/mailer/account_information.text.erb
+++ b/app/views/mailer/account_information.text.erb
@@ -4,3 +4,6 @@
 <% if @password %>* <%= l(:field_password) %>: <%= @password %><% end %>
 <% end %>
 <%= l(:label_login) %>: <%= @login_url %>
+
+<%= call_hook(:view_mailer_account_information_bottom,
+              :user => @user) %>
diff --git a/app/views/mailer/attachments_added.html.erb b/app/views/mailer/attachments_added.html.erb
index d2355b1c4..d68fc4296 100644
--- a/app/views/mailer/attachments_added.html.erb
+++ b/app/views/mailer/attachments_added.html.erb
@@ -3,3 +3,6 @@
 <ul><% @attachments.each do |attachment | %>
 <li><%= attachment.filename %></li>
 <% end %></ul>
+
+<%= call_hook(:view_mailer_attachments_added_bottom,
+              :attachments => @attachments) %>
diff --git a/app/views/mailer/attachments_added.text.erb b/app/views/mailer/attachments_added.text.erb
index 28cb8285e..eade1dfc7 100644
--- a/app/views/mailer/attachments_added.text.erb
+++ b/app/views/mailer/attachments_added.text.erb
@@ -2,3 +2,6 @@
 - <%= attachment.filename %><% end %>
 
 <%= @added_to_url %>
+
+<%= call_hook(:view_mailer_attachments_added_bottom,
+              :attachments => @attachments) %>
diff --git a/app/views/mailer/document_added.html.erb b/app/views/mailer/document_added.html.erb
index e3ece786d..18a9d71aa 100644
--- a/app/views/mailer/document_added.html.erb
+++ b/app/views/mailer/document_added.html.erb
@@ -1,3 +1,6 @@
 <%= link_to(@document.title, @document_url) %> (<%= @document.category.name %>)<br />
 <br />
 <%= textilizable(@document, :description, :only_path => false) %>
+
+<%= call_hook(:view_mailer_document_added_bottom,
+              :document => @document) %>
diff --git a/app/views/mailer/document_added.text.erb b/app/views/mailer/document_added.text.erb
index a6a72829e..609bbdcab 100644
--- a/app/views/mailer/document_added.text.erb
+++ b/app/views/mailer/document_added.text.erb
@@ -2,3 +2,6 @@
 <%= @document_url %>
 
 <%= @document.description %>
+
+<%= call_hook(:view_mailer_document_added_bottom,
+              :document => @document) %>
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index 14292be96..26ae4cb53 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -1,3 +1,8 @@
 <%= l(:text_issue_added, :id => link_to("##{@issue.id}", @issue_url), :author => h(@issue.author)).html_safe %>
 <hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
+
+<%= call_hook(:view_mailer_issue_add_bottom,
+              :issue => @issue,
+              :users => @users,
+              :issue_url => @issue_url) %>
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index 6e3b42725..b1b2654f4 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -2,3 +2,8 @@
 
 ----------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
+
+<%= call_hook(:view_mailer_issue_add_bottom,
+              :issue => @issue,
+              :users => @users,
+              :issue_url => @issue_url) %>
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index b7fc18ed6..b97a48348 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -13,3 +13,8 @@
 <%= textilizable(@journal, :notes, :only_path => false) %>
 <hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
+
+<%= call_hook(:view_mailer_issue_edit_bottom,
+              :issue => @issue,
+              :users => @users,
+              :issue_url => @issue_url) %>
diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
index 173d2c4fe..21c207553 100644
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@@ -10,3 +10,8 @@
 <% end -%>
 ----------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
+
+<%= call_hook(:view_mailer_issue_edit_bottom,
+              :issue => @issue,
+              :users => @users,
+              :issue_url => @issue_url) %>
diff --git a/app/views/mailer/lost_password.html.erb b/app/views/mailer/lost_password.html.erb
index 9294bcfae..c96d34504 100644
--- a/app/views/mailer/lost_password.html.erb
+++ b/app/views/mailer/lost_password.html.erb
@@ -2,3 +2,5 @@
 <%= link_to @url, @url %></p>
 
 <p><%= l(:field_login) %>: <b><%= @token.user.login %></b></p>
+
+<%= call_hook(:view_mailer_lost_password_bottom) %>
diff --git a/app/views/mailer/lost_password.text.erb b/app/views/mailer/lost_password.text.erb
index f5000ed7e..b9935086a 100644
--- a/app/views/mailer/lost_password.text.erb
+++ b/app/views/mailer/lost_password.text.erb
@@ -2,3 +2,5 @@
 <%= @url %>
 
 <%= l(:field_login) %>: <%= @token.user.login %>
+
+<%= call_hook(:view_mailer_lost_password_bottom) %>
diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index 3401b1816..9e0f43fe9 100644
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -2,3 +2,6 @@
 <em><%= @message.author %></em>
 
 <%= textilizable(@message, :content, :only_path => false) %>
+
+<%= call_hook(:view_mailer_message_posted_bottom,
+              :message => @message) %>
diff --git a/app/views/mailer/message_posted.text.erb b/app/views/mailer/message_posted.text.erb
index ef6a3b3ae..d59e8aea3 100644
--- a/app/views/mailer/message_posted.text.erb
+++ b/app/views/mailer/message_posted.text.erb
@@ -2,3 +2,6 @@
 <%= @message.author %>
 
 <%= @message.content %>
+
+<%= call_hook(:view_mailer_message_posted_bottom,
+              :message => @message) %>
diff --git a/app/views/mailer/news_added.html.erb b/app/views/mailer/news_added.html.erb
index daf250adf..4d0c85b1d 100644
--- a/app/views/mailer/news_added.html.erb
+++ b/app/views/mailer/news_added.html.erb
@@ -2,3 +2,6 @@
 <em><%= @news.author.name %></em>
 
 <%= textilizable(@news, :description, :only_path => false) %>
+
+<%= call_hook(:view_mailer_news_added_bottom,
+              :news => @news) %>
diff --git a/app/views/mailer/news_added.text.erb b/app/views/mailer/news_added.text.erb
index c8ae3035f..1ac154318 100644
--- a/app/views/mailer/news_added.text.erb
+++ b/app/views/mailer/news_added.text.erb
@@ -3,3 +3,6 @@
 <%= @news.author.name %>
 
 <%= @news.description %>
+
+<%= call_hook(:view_mailer_news_added_bottom,
+              :news => @news) %>
diff --git a/app/views/mailer/news_comment_added.html.erb b/app/views/mailer/news_comment_added.html.erb
index c9cc2a78e..65d6d3874 100644
--- a/app/views/mailer/news_comment_added.html.erb
+++ b/app/views/mailer/news_comment_added.html.erb
@@ -3,3 +3,7 @@
 <p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
 
 <%= textilizable @comment, :comments, :only_path => false %>
+
+<%= call_hook(:view_mailer_news_comment_added_bottom,
+              :news => @news,
+              :comment => @comment) %>
diff --git a/app/views/mailer/news_comment_added.text.erb b/app/views/mailer/news_comment_added.text.erb
index aadbc37c0..d28b0992d 100644
--- a/app/views/mailer/news_comment_added.text.erb
+++ b/app/views/mailer/news_comment_added.text.erb
@@ -4,3 +4,7 @@
 <%= l(:text_user_wrote, :value => @comment.author) %>
 
 <%= @comment.comments %>
+
+<%= call_hook(:view_mailer_news_comment_added_bottom,
+              :news => @news,
+              :comment => @comment) %>
diff --git a/app/views/mailer/register.html.erb b/app/views/mailer/register.html.erb
index 5e8f6dfcf..59cad9f19 100644
--- a/app/views/mailer/register.html.erb
+++ b/app/views/mailer/register.html.erb
@@ -1,2 +1,4 @@
 <p><%= l(:mail_body_register) %><br />
 <%= link_to @url, @url %></p>
+
+<%= call_hook(:view_mailer_register_bottom) %>
diff --git a/app/views/mailer/register.text.erb b/app/views/mailer/register.text.erb
index 102a15ee3..f7c16b00b 100644
--- a/app/views/mailer/register.text.erb
+++ b/app/views/mailer/register.text.erb
@@ -1,2 +1,4 @@
 <%= l(:mail_body_register) %>
 <%= @url %>
+
+<%= call_hook(:view_mailer_register_bottom) %>
diff --git a/app/views/mailer/reminder.html.erb b/app/views/mailer/reminder.html.erb
index 506fd697b..45c8d39b2 100644
--- a/app/views/mailer/reminder.html.erb
+++ b/app/views/mailer/reminder.html.erb
@@ -7,3 +7,6 @@
 </ul>
 
 <p><%= link_to l(:label_issue_view_all), @issues_url %></p>
+
+<%= call_hook(:view_mailer_reminder_bottom,
+              :issues => @issues) %>
diff --git a/app/views/mailer/reminder.text.erb b/app/views/mailer/reminder.text.erb
index c9e27dc8d..3a10f5ef7 100644
--- a/app/views/mailer/reminder.text.erb
+++ b/app/views/mailer/reminder.text.erb
@@ -5,3 +5,6 @@
 <% end -%>
 
 <%= @issues_url %>
+
+<%= call_hook(:view_mailer_reminder_bottom,
+              :issues => @issues) %>
diff --git a/app/views/mailer/security_notification.html.erb b/app/views/mailer/security_notification.html.erb
index 53bf0a0d5..b193bea4d 100644
--- a/app/views/mailer/security_notification.html.erb
+++ b/app/views/mailer/security_notification.html.erb
@@ -11,3 +11,4 @@
 <%= l(:field_remote_ip) %>: <strong><%= User.current.remote_ip %></strong><br/>
 <%= l(:label_date) %>: <strong><%= format_time Time.now, true, @user %></strong></p>
 
+<%= call_hook(:view_mailer_security_notification_bottom) %>
diff --git a/app/views/mailer/security_notification.text.erb b/app/views/mailer/security_notification.text.erb
index 17fd6ef67..5c08fd28a 100644
--- a/app/views/mailer/security_notification.text.erb
+++ b/app/views/mailer/security_notification.text.erb
@@ -6,3 +6,4 @@
 <%= l(:field_remote_ip) %>: <%= User.current.remote_ip %>
 <%= l(:label_date) %>: <%= format_time Time.now, true, @user %>
 
+<%= call_hook(:view_mailer_security_notification_bottom) %>
diff --git a/app/views/mailer/settings_updated.html.erb b/app/views/mailer/settings_updated.html.erb
index 8596089a2..19758a5e5 100644
--- a/app/views/mailer/settings_updated.html.erb
+++ b/app/views/mailer/settings_updated.html.erb
@@ -12,3 +12,5 @@
 <%= l(:field_remote_ip) %>: <strong><%= User.current.remote_ip %></strong><br/>
 <%= l(:label_date) %>: <strong><%= format_time Time.now, true %></strong></p>
 
+<%= call_hook(:view_mailer_settings_updated_bottom,
+              :changes => @changes) %>
diff --git a/app/views/mailer/settings_updated.text.erb b/app/views/mailer/settings_updated.text.erb
index 51a2a8f6a..ab039b979 100644
--- a/app/views/mailer/settings_updated.text.erb
+++ b/app/views/mailer/settings_updated.text.erb
@@ -10,3 +10,5 @@
 <%= l(:field_remote_ip) %>: <%= User.current.remote_ip %>
 <%= l(:label_date) %>: <%= format_time Time.now, true %>
 
+<%= call_hook(:view_mailer_settings_updated_bottom,
+              :changes => @changes) %>
diff --git a/app/views/mailer/test_email.html.erb b/app/views/mailer/test_email.html.erb
index c73f0e341..a3e26b94a 100644
--- a/app/views/mailer/test_email.html.erb
+++ b/app/views/mailer/test_email.html.erb
@@ -1,2 +1,4 @@
 <p>This is a test email sent by Redmine.<br />
 Redmine URL: <%= link_to @url, @url %></p>
+
+<%= call_hook(:view_mailer_test_email_bottom) %>
diff --git a/app/views/mailer/test_email.text.erb b/app/views/mailer/test_email.text.erb
index 790d6ab22..5e4074a73 100644
--- a/app/views/mailer/test_email.text.erb
+++ b/app/views/mailer/test_email.text.erb
@@ -1,2 +1,4 @@
 This is a test email sent by Redmine.
 Redmine URL: <%= @url %>
+
+<%= call_hook(:view_mailer_test_email_bottom) %>
diff --git a/app/views/mailer/wiki_content_added.html.erb b/app/views/mailer/wiki_content_added.html.erb
index f6d92a9d8..ed1a47de0 100644
--- a/app/views/mailer/wiki_content_added.html.erb
+++ b/app/views/mailer/wiki_content_added.html.erb
@@ -1,3 +1,6 @@
 <p><%= l(:mail_body_wiki_content_added, :id => link_to(@wiki_content.page.pretty_title, @wiki_content_url),
                                         :author => h(@wiki_content.author)).html_safe %><br />
 <em><%= @wiki_content.comments %></em></p>
+
+<%= call_hook(:view_mailer_wiki_content_added_bottom,
+              :wiki_content => @wiki_content) %>
diff --git a/app/views/mailer/wiki_content_added.text.erb b/app/views/mailer/wiki_content_added.text.erb
index 5e8c77fd9..6b84728fc 100644
--- a/app/views/mailer/wiki_content_added.text.erb
+++ b/app/views/mailer/wiki_content_added.text.erb
@@ -3,3 +3,6 @@
 <%= @wiki_content.comments %>
 
 <%= @wiki_content_url %>
+
+<%= call_hook(:view_mailer_wiki_content_added_bottom,
+              :wiki_content => @wiki_content) %>
diff --git a/app/views/mailer/wiki_content_updated.html.erb b/app/views/mailer/wiki_content_updated.html.erb
index 83a9a1675..76fca7405 100644
--- a/app/views/mailer/wiki_content_updated.html.erb
+++ b/app/views/mailer/wiki_content_updated.html.erb
@@ -4,3 +4,6 @@
 
 <p><%= l(:label_view_diff) %>:<br />
 <%= link_to @wiki_diff_url, @wiki_diff_url %></p>
+
+<%= call_hook(:view_mailer_wiki_content_updated_bottom,
+              :wiki_content => @wiki_content) %>
diff --git a/app/views/mailer/wiki_content_updated.text.erb b/app/views/mailer/wiki_content_updated.text.erb
index 4b3a97360..4589f2c6e 100644
--- a/app/views/mailer/wiki_content_updated.text.erb
+++ b/app/views/mailer/wiki_content_updated.text.erb
@@ -6,3 +6,6 @@
 <%= @wiki_content_url %>
 <%= l(:label_view_diff) %>:
 <%= @wiki_diff_url %>
+
+<%= call_hook(:view_mailer_wiki_content_updated_bottom,
+              :wiki_content => @wiki_content) %>