diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 591f4e97c..4f5be2fc1 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -429,7 +429,7 @@ class Mailer < ActionMailer::Base
            :body => render(:file => "#{method_name}.text.erb",
                            :body => body, :layout => 'mailer.text.erb')
       part :content_type => "text/html",
-           :body => render_message("#{method_name}.text.html.rhtml", body)
+           :body => render_message("#{method_name}.html.erb", body)
     end
   end
 
diff --git a/app/views/mailer/account_activated.text.html.rhtml b/app/views/mailer/account_activated.html.erb
similarity index 100%
rename from app/views/mailer/account_activated.text.html.rhtml
rename to app/views/mailer/account_activated.html.erb
diff --git a/app/views/mailer/account_activation_request.text.html.rhtml b/app/views/mailer/account_activation_request.html.erb
similarity index 100%
rename from app/views/mailer/account_activation_request.text.html.rhtml
rename to app/views/mailer/account_activation_request.html.erb
diff --git a/app/views/mailer/account_information.text.html.rhtml b/app/views/mailer/account_information.html.erb
similarity index 100%
rename from app/views/mailer/account_information.text.html.rhtml
rename to app/views/mailer/account_information.html.erb
diff --git a/app/views/mailer/attachments_added.text.html.rhtml b/app/views/mailer/attachments_added.html.erb
similarity index 100%
rename from app/views/mailer/attachments_added.text.html.rhtml
rename to app/views/mailer/attachments_added.html.erb
diff --git a/app/views/mailer/document_added.text.html.rhtml b/app/views/mailer/document_added.html.erb
similarity index 100%
rename from app/views/mailer/document_added.text.html.rhtml
rename to app/views/mailer/document_added.html.erb
diff --git a/app/views/mailer/issue_add.text.html.rhtml b/app/views/mailer/issue_add.html.erb
similarity index 100%
rename from app/views/mailer/issue_add.text.html.rhtml
rename to app/views/mailer/issue_add.html.erb
diff --git a/app/views/mailer/issue_edit.text.html.rhtml b/app/views/mailer/issue_edit.html.erb
similarity index 100%
rename from app/views/mailer/issue_edit.text.html.rhtml
rename to app/views/mailer/issue_edit.html.erb
diff --git a/app/views/mailer/lost_password.text.html.rhtml b/app/views/mailer/lost_password.html.erb
similarity index 100%
rename from app/views/mailer/lost_password.text.html.rhtml
rename to app/views/mailer/lost_password.html.erb
diff --git a/app/views/mailer/message_posted.text.html.rhtml b/app/views/mailer/message_posted.html.erb
similarity index 100%
rename from app/views/mailer/message_posted.text.html.rhtml
rename to app/views/mailer/message_posted.html.erb
diff --git a/app/views/mailer/news_added.text.html.rhtml b/app/views/mailer/news_added.html.erb
similarity index 100%
rename from app/views/mailer/news_added.text.html.rhtml
rename to app/views/mailer/news_added.html.erb
diff --git a/app/views/mailer/news_comment_added.text.html.rhtml b/app/views/mailer/news_comment_added.html.erb
similarity index 100%
rename from app/views/mailer/news_comment_added.text.html.rhtml
rename to app/views/mailer/news_comment_added.html.erb
diff --git a/app/views/mailer/register.text.html.rhtml b/app/views/mailer/register.html.erb
similarity index 100%
rename from app/views/mailer/register.text.html.rhtml
rename to app/views/mailer/register.html.erb
diff --git a/app/views/mailer/reminder.text.html.rhtml b/app/views/mailer/reminder.html.erb
similarity index 100%
rename from app/views/mailer/reminder.text.html.rhtml
rename to app/views/mailer/reminder.html.erb
diff --git a/app/views/mailer/test.text.html.rhtml b/app/views/mailer/test.html.erb
similarity index 100%
rename from app/views/mailer/test.text.html.rhtml
rename to app/views/mailer/test.html.erb
diff --git a/app/views/mailer/wiki_content_added.text.html.rhtml b/app/views/mailer/wiki_content_added.html.erb
similarity index 100%
rename from app/views/mailer/wiki_content_added.text.html.rhtml
rename to app/views/mailer/wiki_content_added.html.erb
diff --git a/app/views/mailer/wiki_content_updated.text.html.rhtml b/app/views/mailer/wiki_content_updated.html.erb
similarity index 100%
rename from app/views/mailer/wiki_content_updated.text.html.rhtml
rename to app/views/mailer/wiki_content_updated.html.erb