diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 2be9de70..cfeab4ed 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -396,8 +396,8 @@ class Mailer < ActionMailer::Base
     # if he doesn't want to receive notifications about what he does
     @author ||= User.current
     if @author.pref[:no_self_notified]
-      recipients.delete(@author.mail) if recipients
-      cc.delete(@author.mail) if cc
+      recipients((recipients.is_a?(Array) ? recipients : [recipients]) - [@author.mail]) if recipients
+      cc((cc.is_a?(Array) ? cc : [cc]) - [@author.mail]) if cc
     end
 
     notified_users = [recipients, cc].flatten.compact.uniq