diff --git a/lib/redmine_per_project_formatting.rb b/lib/redmine_per_project_formatting.rb
index e2dfdc8..2d9b46e 100644
--- a/lib/redmine_per_project_formatting.rb
+++ b/lib/redmine_per_project_formatting.rb
@@ -10,7 +10,10 @@ def self.apply_patch
     ::Setting.singleton_class.prepend SettingPatch
     if defined?(RedmineCkeditor)
       require 'redmine_per_project_formatting/mail_handler_patch'
+      require 'redmine_per_project_formatting/mailer_patch'
       ::MailHandler.prepend MailHandlerPatch
+      ::Mailer.prepend MailerPatch
     end
   end
 end
+
diff --git a/lib/redmine_per_project_formatting/mailer_patch.rb b/lib/redmine_per_project_formatting/mailer_patch.rb
new file mode 100644
index 0000000..299ba6e
--- /dev/null
+++ b/lib/redmine_per_project_formatting/mailer_patch.rb
@@ -0,0 +1,22 @@
+module RedminePerProjectFormatting
+  module MailerPatch
+    def issue_add(user, issue)
+      if p = Issue.where(:id => issue.id).first.try(:project)
+        Setting.within_text_formatting(p.text_formatting_for(:issue_tracking)) do
+          super
+        end
+      end
+    end
+
+    def issue_edit(user, journal)
+      issue = journal.journalized
+      if p = Issue.where(:id => issue.id).first.try(:project)
+        Setting.within_text_formatting(p.text_formatting_for(:issue_tracking)) do
+          super
+        end
+      end
+    end
+
+  end
+end
+