diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a2d9ddb..852fbf0 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -219,6 +219,21 @@ class Mailer < ActionMailer::Base
     body[:content_for_layout] = render(:file => method_name, :body => body)
     ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}", :use_full_path => true)
   end
+
+  # for the case of plain text only
+  def body(*params)
+    value = super(*params)
+    if Setting.plain_only_mail?
+      templates = Dir.glob("#{template_path}/#{@template}.text.plain.{rhtml,erb}")
+      unless String === @body or templates.empty?
+        template = File.basename(templates.first)
+        @body[:content_for_layout] = render(:file => template, :body => @body)
+        @body = ActionView::Base.new(template_root, @body, self).render(:file => "mailer/layout.text.plain.rhtml", :use_full_path => true)
+        return @body
+      end
+    end
+    return value
+  end
   
   # Makes partial rendering work with Rails 1.2 (retro-compatibility)
   def self.controller_path
diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml
index 3670146..6dda931 100644
--- a/app/views/settings/_notifications.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -10,6 +10,12 @@
 <%= hidden_field_tag 'settings[bcc_recipients]', 0 %></p>
 </div>
 
+<div class="box tabular">
+  <p><label><%= l(:setting_plain_only_mail) %></label>
+  <%= check_box_tag 'settings[plain_only_mail]', 1, Setting.plain_only_mail? %>
+  <%= hidden_field_tag 'settings[plain_only_mail]', 0 %></p>
+</div>
+
 <fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
 <% @notifiables.each do |notifiable| %>
   <label><%= check_box_tag 'settings[notified_events][]', notifiable, Setting.notified_events.include?(notifiable) %>
diff --git a/config/settings.yml b/config/settings.yml
index e1ad341..011cb5b 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -46,6 +46,8 @@ mail_from:
   default: redmine@example.net
 bcc_recipients:
   default: 1
+plain_only_mail:
+  default: 0
 text_formatting:
   default: textile
 wiki_compression:
diff --git a/lang/en.yml b/lang/en.yml
index 8a73a39..8d7e8c2 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -195,6 +195,7 @@ setting_attachment_max_size: Attachment max. size
 setting_issues_export_limit: Issues export limit
 setting_mail_from: Emission email address
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+setting_plain_only_mail: plain text only (no HTML)
 setting_host_name: Host name
 setting_text_formatting: Text formatting
 setting_wiki_compression: Wiki history compression
diff --git a/lang/ja.yml b/lang/ja.yml
index 4e46212..588a289 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -552,6 +552,7 @@ notice_account_pending: アカウントは作成済みで、管理者の承認
 field_time_zone: タイムゾーン
 text_caracters_minimum: 最低%d文字の長さが必要です
 setting_bcc_recipients: ブラインドカーボンコピーで受信(bcc)
+setting_plain_only_mail: プレインテキストのみ(HTMLなし)
 button_annotate: 注釈
 label_issues_by: %s別のチケット
 field_searchable: Searchable