diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 737f071..b947043 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -1,4 +1,4 @@
-class User::Mailer < ActionMailer::Base
+class UserMailer < ActionMailer::Base
   def activation_email_notify(user)
     user_email = "#{user.login}@#{user.email_domain}"
     @name = user.name
diff --git a/app/models/email_activation.rb b/app/models/email_activation.rb
index 4b2ab59..fc9e06a 100644
--- a/app/models/email_activation.rb
+++ b/app/models/email_activation.rb
@@ -34,7 +34,7 @@ class EmailActivation < Task
 
   # :nodoc:
   def after_finish
-    User::Mailer.activation_email_notify(person.user).deliver
+    UserMailer.activation_email_notify(person.user).deliver
   end
 
   def sends_email?
diff --git a/app/models/user.rb b/app/models/user.rb
index 7a10618..c60e30a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -112,7 +112,7 @@ class User < ActiveRecord::Base
       false
     else
       if environment.enabled?('send_welcome_email_to_new_users') && environment.has_signup_welcome_text?
-        User::Mailer.delay.signup_welcome_email(self)
+        UserMailer.delay.signup_welcome_email(self)
       end
       true
     end
@@ -323,7 +323,7 @@ class User < ActiveRecord::Base
 
     def deliver_activation_code
       return if person.is_template?
-      User::Mailer.activation_code(self).deliver unless self.activation_code.blank?
+      UserMailer.activation_code(self).deliver unless self.activation_code.blank?
     end
 
     def delay_activation_check
--
libgit2 0.21.2