8 files changed, 9 insertions, 9 deletions
diff --git a/app/models/comment_observer.rb b/app/models/comment_observer.rb
index 07823e44c..e85f3b6c9 100644
--- a/app/models/comment_observer.rb
+++ b/app/models/comment_observer.rb
@@ -18,7 +18,7 @@
 class CommentObserver < ActiveRecord::Observer
   def after_create(comment)
     if comment.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added')
-      Mailer.deliver_news_comment_added(comment)
+      Mailer.news_comment_added(comment).deliver
     end
   end
 end
diff --git a/app/models/document_observer.rb b/app/models/document_observer.rb
index a5db33e5e..cd0db3d26 100644
--- a/app/models/document_observer.rb
+++ b/app/models/document_observer.rb
@@ -17,6 +17,6 @@
 
 class DocumentObserver < ActiveRecord::Observer
   def after_create(document)
-    Mailer.deliver_document_added(document) if Setting.notified_events.include?('document_added')
+    Mailer.document_added(document).deliver if Setting.notified_events.include?('document_added')
   end
 end
diff --git a/app/models/issue_observer.rb b/app/models/issue_observer.rb
index 8c42e692e..86f5e0c8e 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.issue_add(issue).deliver if Setting.notified_events.include?('issue_added')
   end
 end
diff --git a/app/models/journal_observer.rb b/app/models/journal_observer.rb
index 8bd0d3315..f94e5f7c3 100644
--- a/app/models/journal_observer.rb
+++ b/app/models/journal_observer.rb
@@ -23,7 +23,7 @@ class JournalObserver < ActiveRecord::Observer
           (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) ||
           (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
         )
-      Mailer.deliver_issue_edit(journal)
+      Mailer.issue_edit(journal).deliver
     end
   end
 end
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index a63ee1dac..9e7e3aade 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -94,7 +94,7 @@ class MailHandler < ActionMailer::Base
           if logger && logger.info
             logger.info "MailHandler: [#{@user.login}] account created"
           end
-          Mailer.deliver_account_information(@user, @user.password)
+          Mailer.account_information(@user, @user.password).deliver
         else
           if logger && logger.error
             logger.error "MailHandler: could not create account for [#{sender_email}]"
diff --git a/app/models/message_observer.rb b/app/models/message_observer.rb
index 6a0f05931..62c564361 100644
--- a/app/models/message_observer.rb
+++ b/app/models/message_observer.rb
@@ -17,6 +17,6 @@
 
 class MessageObserver < ActiveRecord::Observer
   def after_create(message)
-    Mailer.deliver_message_posted(message) if Setting.notified_events.include?('message_posted')
+    Mailer.message_posted(message).deliver if Setting.notified_events.include?('message_posted')
   end
 end
diff --git a/app/models/news_observer.rb b/app/models/news_observer.rb
index 0fdfe0bac..3dd2da2bb 100644
--- a/app/models/news_observer.rb
+++ b/app/models/news_observer.rb
@@ -17,6 +17,6 @@
 
 class NewsObserver < ActiveRecord::Observer
   def after_create(news)
-    Mailer.deliver_news_added(news) if Setting.notified_events.include?('news_added')
+    Mailer.news_added(news).deliver if Setting.notified_events.include?('news_added')
   end
 end
diff --git a/app/models/wiki_content_observer.rb b/app/models/wiki_content_observer.rb
index 9f3742291..f423044cd 100644
--- a/app/models/wiki_content_observer.rb
+++ b/app/models/wiki_content_observer.rb
@@ -17,12 +17,12 @@
 
 class WikiContentObserver < ActiveRecord::Observer
   def after_create(wiki_content)
-    Mailer.deliver_wiki_content_added(wiki_content) if Setting.notified_events.include?('wiki_content_added')
+    Mailer.wiki_content_added(wiki_content).deliver if Setting.notified_events.include?('wiki_content_added')
   end
 
   def after_update(wiki_content)
     if wiki_content.text_changed?
-      Mailer.deliver_wiki_content_updated(wiki_content) if Setting.notified_events.include?('wiki_content_updated')
+      Mailer.wiki_content_updated(wiki_content).deliver if Setting.notified_events.include?('wiki_content_updated')
     end
   end
 end