diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index f62e24d51..591f4e97c 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -420,13 +420,13 @@ class Mailer < ActionMailer::Base
   def render_multipart(method_name, body)
     if Setting.plain_text_mail?
       content_type "text/plain"
-      body render(:file => "#{method_name}.text.plain.rhtml",
+      body render(:file => "#{method_name}.text.erb",
                   :body => body,
                   :layout => 'mailer.text.erb')
     else
       content_type "multipart/alternative"
       part :content_type => "text/plain",
-           :body => render(:file => "#{method_name}.text.plain.rhtml",
+           :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)
diff --git a/app/views/mailer/account_activated.text.plain.rhtml b/app/views/mailer/account_activated.text.erb
similarity index 100%
rename from app/views/mailer/account_activated.text.plain.rhtml
rename to app/views/mailer/account_activated.text.erb
diff --git a/app/views/mailer/account_activation_request.text.plain.rhtml b/app/views/mailer/account_activation_request.text.erb
similarity index 100%
rename from app/views/mailer/account_activation_request.text.plain.rhtml
rename to app/views/mailer/account_activation_request.text.erb
diff --git a/app/views/mailer/account_information.text.plain.rhtml b/app/views/mailer/account_information.text.erb
similarity index 100%
rename from app/views/mailer/account_information.text.plain.rhtml
rename to app/views/mailer/account_information.text.erb
diff --git a/app/views/mailer/attachments_added.text.plain.rhtml b/app/views/mailer/attachments_added.text.erb
similarity index 100%
rename from app/views/mailer/attachments_added.text.plain.rhtml
rename to app/views/mailer/attachments_added.text.erb
diff --git a/app/views/mailer/document_added.text.plain.rhtml b/app/views/mailer/document_added.text.erb
similarity index 100%
rename from app/views/mailer/document_added.text.plain.rhtml
rename to app/views/mailer/document_added.text.erb
diff --git a/app/views/mailer/issue_add.text.plain.rhtml b/app/views/mailer/issue_add.text.erb
similarity index 100%
rename from app/views/mailer/issue_add.text.plain.rhtml
rename to app/views/mailer/issue_add.text.erb
diff --git a/app/views/mailer/issue_edit.text.plain.rhtml b/app/views/mailer/issue_edit.text.erb
similarity index 100%
rename from app/views/mailer/issue_edit.text.plain.rhtml
rename to app/views/mailer/issue_edit.text.erb
diff --git a/app/views/mailer/lost_password.text.plain.rhtml b/app/views/mailer/lost_password.text.erb
similarity index 100%
rename from app/views/mailer/lost_password.text.plain.rhtml
rename to app/views/mailer/lost_password.text.erb
diff --git a/app/views/mailer/message_posted.text.plain.rhtml b/app/views/mailer/message_posted.text.erb
similarity index 100%
rename from app/views/mailer/message_posted.text.plain.rhtml
rename to app/views/mailer/message_posted.text.erb
diff --git a/app/views/mailer/news_added.text.plain.rhtml b/app/views/mailer/news_added.text.erb
similarity index 100%
rename from app/views/mailer/news_added.text.plain.rhtml
rename to app/views/mailer/news_added.text.erb
diff --git a/app/views/mailer/news_comment_added.text.plain.rhtml b/app/views/mailer/news_comment_added.text.erb
similarity index 100%
rename from app/views/mailer/news_comment_added.text.plain.rhtml
rename to app/views/mailer/news_comment_added.text.erb
diff --git a/app/views/mailer/register.text.plain.rhtml b/app/views/mailer/register.text.erb
similarity index 100%
rename from app/views/mailer/register.text.plain.rhtml
rename to app/views/mailer/register.text.erb
diff --git a/app/views/mailer/reminder.text.plain.rhtml b/app/views/mailer/reminder.text.erb
similarity index 100%
rename from app/views/mailer/reminder.text.plain.rhtml
rename to app/views/mailer/reminder.text.erb
diff --git a/app/views/mailer/test.text.plain.rhtml b/app/views/mailer/test.text.erb
similarity index 100%
rename from app/views/mailer/test.text.plain.rhtml
rename to app/views/mailer/test.text.erb
diff --git a/app/views/mailer/wiki_content_added.text.plain.rhtml b/app/views/mailer/wiki_content_added.text.erb
similarity index 100%
rename from app/views/mailer/wiki_content_added.text.plain.rhtml
rename to app/views/mailer/wiki_content_added.text.erb
diff --git a/app/views/mailer/wiki_content_updated.text.plain.rhtml b/app/views/mailer/wiki_content_updated.text.erb
similarity index 100%
rename from app/views/mailer/wiki_content_updated.text.plain.rhtml
rename to app/views/mailer/wiki_content_updated.text.erb