diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index cffb69b..f5621cc 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -146,6 +146,7 @@ class IssuesController < ApplicationController
     call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
     @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
     if @issue.save
+      Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
       call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
       respond_to do |format|
         format.html {
diff --git a/app/models/issue_observer.rb b/app/models/issue_observer.rb
index 3395193..5ab0f20 100644
--- a/app/models/issue_observer.rb
+++ b/app/models/issue_observer.rb
@@ -17,6 +17,6 @@
 
 class IssueObserver < ActiveRecord::Observer
   def after_create(issue)
-    Mailer.deliver_issue_add(issue) if Setting.notified_events.include?('issue_added')
+    #Mailer.deliver_issue_add(issue) if Setting.notified_events.include?('issue_added')
   end
 end
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 148a3e1..f0a4ba2 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -167,6 +167,7 @@ class MailHandler < ActionMailer::Base
     add_watchers(issue)
     issue.save!
     add_attachments(issue)
+    Mailer.deliver_issue_add(issue) if Setting.notified_events.include?('issue_added')
     logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger && logger.info
     issue
   end