diff --git a/app/views/mailer/account_information.html.erb b/app/views/mailer/account_information.html.erb
index 70040f8e3..426aacee1 100644
--- a/app/views/mailer/account_information.html.erb
+++ b/app/views/mailer/account_information.html.erb
@@ -8,4 +8,4 @@
 </ul>
 <% end %>
 
-<p><%= l(:label_login) %>: <%= auto_link(@login_url).html_safe %></p>
+<p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p>
diff --git a/app/views/mailer/lost_password.html.erb b/app/views/mailer/lost_password.html.erb
index 18d1be303..d740480ad 100644
--- a/app/views/mailer/lost_password.html.erb
+++ b/app/views/mailer/lost_password.html.erb
@@ -1,4 +1,4 @@
 <p><%= l(:mail_body_lost_password) %><br />
-<%= auto_link(@url).html_safe %></p>
+<%= link_to h(@url), @url %></p>
 
 <p><%= l(:field_login) %>: <b><%=h @token.user.login %></b></p>
diff --git a/app/views/mailer/register.html.erb b/app/views/mailer/register.html.erb
index 2e382e6ba..282deca90 100644
--- a/app/views/mailer/register.html.erb
+++ b/app/views/mailer/register.html.erb
@@ -1,2 +1,2 @@
 <p><%= l(:mail_body_register) %><br />
-<%= auto_link(@url).html_safe %></p>
+<%= link_to h(@url), @url %></p>
diff --git a/app/views/mailer/test.html.erb b/app/views/mailer/test.html.erb
index fe5b6f313..1e81b3bfe 100644
--- a/app/views/mailer/test.html.erb
+++ b/app/views/mailer/test.html.erb
@@ -1,2 +1,2 @@
 <p>This is a test email sent by Redmine.<br />
-Redmine URL: <%= auto_link(@url).html_safe %></p>
+Redmine URL: <%= link_to h(@url), @url %></p>