placed all mail jobs in the Job::Mail:: namespace & added into appropriate folders

app/models/jobs/mail/also_commented.rb

+module Job
+  module Mail
+    class AlsoCommented < Base
+      @queue = :mail
+      def self.perform(recipient_id, sender_id, comment_id)
+        Notifier.also_commented(recipient_id, sender_id, comment_id).deliver
+      end
+    end
+  end
+end
+

app/models/jobs/mail/comment_on_post.rb

+module Job
+  module Mail
+    class CommentOnPost < Base
+      @queue = :mail
+      def self.perform(recipient_id, sender_id, comment_id)
+        Notifier.comment_on_post(recipient_id, sender_id, comment_id).deliver
+      end
+    end
+  end
+end
+

app/models/jobs/mail/confirm_email.rb

+module Job
+  module Mail
+    class ConfirmEmail < Base
+      @queue = :mail
+      def self.perform(user_id)
+        Notifier.confirm_email(user_id).deliver
+      end
+    end
+  end
+end

app/models/jobs/mail/liked.rb

+module Job
+  module Mail
+    class Liked < Base
+      @queue = :mail
+      def self.perform(recipient_id, sender_id, like_id)
+        Notifier.liked(recipient_id, sender_id, like_id).deliver
+      end
+    end
+  end
+end
+

app/models/jobs/mail_private_message.rb → app/models/jobs/mail/mentioned.rb

@@ -4,10 +4,12 @@
 
 
 module Job
-  class MailPrivateMessage < Base
-    @queue = :mail
-    def self.perform(recipient_id, actor_id, target_id)
-      Notifier.private_message( recipient_id, actor_id, target_id).deliver
+  module Mail
+    class Mentioned < Base
+      @queue = :mail
+      def self.perform(recipient_id, actor_id, target_id)
+        Notifier.mentioned( recipient_id, actor_id, target_id).deliver
+      end
     end
   end
 end

app/models/jobs/mail_mentioned.rb → app/models/jobs/mail/private_message.rb

@@ -4,12 +4,12 @@
 
 
 module Job
-  class MailMentioned < Base
-    @queue = :mail
-    def self.perform(recipient_id, actor_id, target_id)
-      
-      Notifier.mentioned( recipient_id, actor_id, target_id).deliver
-
+  module Mail
+    class PrivateMessage < Base
+      @queue = :mail
+      def self.perform(recipient_id, actor_id, target_id)
+        Notifier.private_message( recipient_id, actor_id, target_id).deliver
+      end
     end
   end
 end

app/models/jobs/mail_started_sharing.rb → app/models/jobs/mail/started_sharing.rb

@@ -4,10 +4,12 @@
 
 
 module Job
-  class MailStartedSharing < Base
-    @queue = :mail
-    def self.perform(recipient_id, sender_id, target_id)
-      Notifier.started_sharing(recipient_id, sender_id).deliver
+  module Mail
+    class StartedSharing < Base
+      @queue = :mail
+      def self.perform(recipient_id, sender_id, target_id)
+        Notifier.started_sharing(recipient_id, sender_id).deliver
+      end
     end
   end
 end

app/models/jobs/mail_also_commented.rb

-module Job
-  class MailAlsoCommented < Base
-    @queue = :mail
-    def self.perform(recipient_id, sender_id, comment_id)
-      Notifier.also_commented(recipient_id, sender_id, comment_id).deliver
-    end
-  end
-end
-

app/models/jobs/mail_comment_on_post.rb

-module Job
-  class MailCommentOnPost < Base
-    @queue = :mail
-    def self.perform(recipient_id, sender_id, comment_id)
-      Notifier.comment_on_post(recipient_id, sender_id, comment_id).deliver
-    end
-  end
-end
-

app/models/jobs/mail_confirm_email.rb

-module Job
-  class MailConfirmEmail < Base
-    @queue = :mail
-    def self.perform(user_id)
-      Notifier.confirm_email(user_id).deliver
-    end
-  end
-end

app/models/jobs/mail_liked.rb

-module Job
-  class MailLiked < Base
-    @queue = :mail
-    def self.perform(recipient_id, sender_id, like_id)
-      Notifier.liked(recipient_id, sender_id, like_id).deliver
-    end
-  end
-end
-

app/models/notifications/also_commented.rb

 class Notifications::AlsoCommented < Notification
   def mail_job
-    Job::MailAlsoCommented
+    Job::Mail::AlsoCommented
   end
   def popup_translation_key
     'notifications.also_commented'

app/models/notifications/comment_on_post.rb

 class Notifications::CommentOnPost < Notification
   def mail_job
-    Job::MailCommentOnPost
+    Job::Mail::CommentOnPost
   end
   def popup_translation_key
     'notifications.comment_on_post'

app/models/notifications/liked.rb

 class Notifications::Liked < Notification
   def mail_job
-    Job::MailLiked
+    Job::Mail::Liked
   end
   def popup_translation_key
     'notifications.liked'

app/models/notifications/mentioned.rb

 class Notifications::Mentioned < Notification
   def mail_job
-    Job::MailMentioned
+    Job::Mail::Mentioned
   end
   def popup_translation_key
     'notifications.mentioned'

app/models/notifications/private_message.rb

 class Notifications::PrivateMessage < Notification
   def mail_job
-    Job::MailPrivateMessage
+    Job::Mail::PrivateMessage
   end
   def popup_translation_key
     'notifications.private_message'

app/models/notifications/request_accepted.rb

 class Notifications::RequestAccepted < Notification
   def mail_job
-    Job::MailRequestAcceptance
+    Job::Mail::RequestAcceptance
   end
   def popup_translation_key
     'notifications.request_accepted'

app/models/notifications/started_sharing.rb

 class Notifications::StartedSharing < Notification
   def mail_job
-    Job::MailStartedSharing
+    Job::Mail::StartedSharing
   end
 
   def popup_translation_key

app/models/user.rb

@@ -217,7 +217,7 @@ class User < ActiveRecord::Base
 
   ######### Mailer #######################
   def mail(job, *args)
-    pref = job.to_s.gsub('Job::Mail', '').underscore
+    pref = job.to_s.gsub('Job::Mail::', '').underscore
     if(self.disable_mail == false && !self.user_preferences.exists?(:email_type => pref))
       Resque.enqueue(job, *args)
     end
@@ -225,7 +225,7 @@ class User < ActiveRecord::Base
 
   def mail_confirm_email
     return false if unconfirmed_email.blank?
-    Resque.enqueue(Job::MailConfirmEmail, id)
+    Resque.enqueue(Job::Mail::ConfirmEmail, id)
     true
   end
 

spec/controllers/users_controller_spec.rb

@@ -124,7 +124,7 @@ describe UsersController do
       end
 
       it 'sends out activation email on success' do
-        Resque.should_receive(:enqueue).with(Job::MailConfirmEmail, @user.id).once
+        Resque.should_receive(:enqueue).with(Job::Mail::ConfirmEmail, @user.id).once
         put(:update, :id => @user.id, :user => { :email => "my@newemail.com"})
       end
     end