diff --git a/gears/carto_gears_api/README.md b/gears/carto_gears_api/README.md
index d7fada55cb..d9734c7489 100644
--- a/gears/carto_gears_api/README.md
+++ b/gears/carto_gears_api/README.md
@@ -168,7 +168,7 @@ Sending your own email:
 ```ruby
 class MyMail < ActionMailer::Base
   def a_mail(to)
-    mail(to: to, from: 'contact@carto.com', subject: 'the subject').deliver
+    mail(to: to, from: 'contact@carto.com', subject: 'the subject').deliver_now
   end
 end
 
@@ -181,7 +181,7 @@ Usage example:
 ```ruby
 class MyMail < CartoGearsApi::Mailers::BaseMail
   def a_mail(to)
-    mail(to: to, subject: 'the subject').deliver
+    mail(to: to, subject: 'the subject').deliver_now
   end
 end
 ```
diff --git a/gears/carto_gears_api/app/mailers/carto_gears_api/test_mail.rb b/gears/carto_gears_api/app/mailers/carto_gears_api/test_mail.rb
index 6da0c4cecc..b08c85fafd 100644
--- a/gears/carto_gears_api/app/mailers/carto_gears_api/test_mail.rb
+++ b/gears/carto_gears_api/app/mailers/carto_gears_api/test_mail.rb
@@ -7,7 +7,7 @@ module CartoGearsApi
         @from = from
         @to = to
         @subject = subject
-        mail(to: to, from: from, subject: subject).deliver
+        mail(to: to, from: from, subject: subject).deliver_now
       end
     end
   end
diff --git a/lib/resque/reporter_jobs.rb b/lib/resque/reporter_jobs.rb
index 981a7629c4..59ea1dc629 100644
--- a/lib/resque/reporter_jobs.rb
+++ b/lib/resque/reporter_jobs.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require_relative './base_job'
 
 module Resque
@@ -8,7 +9,7 @@ module Resque
         @queue = :users
 
         def self.perform(mail_to, trending_visualizations)
-          ReporterMailer.trending_maps_report(mail_to, trending_visualizations).deliver
+          ReporterMailer.trending_maps_report(mail_to, trending_visualizations).deliver_now
         end
       end
     end
diff --git a/lib/resque/user_jobs.rb b/lib/resque/user_jobs.rb
index b6761fa687..b7bf4b263e 100644
--- a/lib/resque/user_jobs.rb
+++ b/lib/resque/user_jobs.rb
@@ -1,20 +1,18 @@
 # encoding: utf-8
+
 require_relative './base_job'
 require 'resque-metrics'
 require_relative '../cartodb/metrics'
 
 module Resque
-
   module OrganizationJobs
-
     module Mail
-
       module DiskQuotaLimitReached
         extend ::Resque::Metrics
         @queue = :users
 
         def self.perform(organization_id)
-          OrganizationMailer.quota_limit_reached(Organization.where(id: organization_id).first).deliver
+          OrganizationMailer.quota_limit_reached(Organization.where(id: organization_id).first).deliver_now
         end
       end
 
@@ -24,7 +22,7 @@ module Resque
         def self.perform(invitation_id)
           invitation = Carto::Invitation.find(invitation_id)
           invitation.users_emails.each do |email|
-            OrganizationMailer.invitation(invitation, email).deliver
+            OrganizationMailer.invitation(invitation, email).deliver_now
           end
         end
       end
@@ -34,7 +32,7 @@ module Resque
         @queue = :users
 
         def self.perform(organization_id)
-          OrganizationMailer.seat_limit_reached(Organization.where(id: organization_id).first).deliver
+          OrganizationMailer.seat_limit_reached(Organization.where(id: organization_id).first).deliver_now
         end
       end
     end
@@ -45,7 +43,7 @@ module Resque
       module NewUser
         @queue = :users
 
-        def self.perform(user_creation_id, common_data_url=nil, organization_owner_promotion=false)
+        def self.perform(user_creation_id, common_data_url = nil, organization_owner_promotion = false)
           user_creation = Carto::UserCreation.where(id: user_creation_id).first
           user_creation.set_common_data_url(common_data_url) unless common_data_url.nil?
           user_creation.set_owner_promotion(organization_owner_promotion)
@@ -65,7 +63,7 @@ module Resque
             next unless user.has_feature_flag?('limits_v2')
             rate_limit.save_to_redis(user)
           end
-        rescue => e
+        rescue StandardError => e
           CartoDB::Logger.error(exception: e, message: 'Error syncing rate limits to redis', account_type: account_type)
           raise e
         end
@@ -73,14 +71,13 @@ module Resque
     end
 
     module Mail
-
       module NewOrganizationUser
         extend ::Resque::Metrics
         @queue = :users
 
         def self.perform(user_id)
           u = ::User.where(id: user_id).first
-          UserMailer.new_organization_user(u).deliver
+          UserMailer.new_organization_user(u).deliver_now
         end
       end
 
@@ -91,7 +88,7 @@ module Resque
         def self.perform(visualization_id, user_id)
           v = Carto::Visualization.find(visualization_id)
           u = ::User.where(id: user_id).first
-          UserMailer.share_visualization(v, u).deliver
+          UserMailer.share_visualization(v, u).deliver_now
         end
       end
 
@@ -102,7 +99,7 @@ module Resque
         def self.perform(table_id, user_id)
           t = Carto::Visualization.find(table_id)
           u = ::User.where(id: user_id).first
-          UserMailer.share_table(t, u).deliver
+          UserMailer.share_table(t, u).deliver_now
         end
       end
 
@@ -112,7 +109,7 @@ module Resque
 
         def self.perform(visualization_name, visualization_owner_name, user_id)
           u = ::User.where(id: user_id).first
-          UserMailer.unshare_visualization(visualization_name, visualization_owner_name, u).deliver
+          UserMailer.unshare_visualization(visualization_name, visualization_owner_name, u).deliver_now
         end
       end
 
@@ -122,7 +119,7 @@ module Resque
 
         def self.perform(table_name, table_owner_name, user_id)
           u = ::User.where(id: user_id).first
-          UserMailer.unshare_table(table_name, table_owner_name, u).deliver
+          UserMailer.unshare_table(table_name, table_owner_name, u).deliver_now
         end
       end
 
@@ -133,7 +130,7 @@ module Resque
         def self.perform(visualization_id, viewer_user_id, vis_preview_image)
           viz = Carto::Visualization.find(visualization_id)
           viewer_user = Carto::User.find(viewer_user_id)
-          UserMailer.map_liked(viz, viewer_user, vis_preview_image).deliver
+          UserMailer.map_liked(viz, viewer_user, vis_preview_image).deliver_now
         end
       end
 
@@ -144,7 +141,7 @@ module Resque
         def self.perform(visualization_id, viewer_user_id, vis_preview_image)
           viz = Carto::Visualization.find(visualization_id)
           viewer_user = Carto::User.find(viewer_user_id)
-          UserMailer.table_liked(viz, viewer_user, vis_preview_image).deliver
+          UserMailer.table_liked(viz, viewer_user, vis_preview_image).deliver_now
         end
       end
 
@@ -154,7 +151,7 @@ module Resque
 
         def self.perform(user_id, imported_tables, total_tables, first_imported_table, first_table, errors, filenames)
           u = ::User.where(id: user_id).first
-          ImportMailer.data_import_finished(u, imported_tables, total_tables, first_imported_table, first_table, errors, filenames).deliver
+          ImportMailer.data_import_finished(u, imported_tables, total_tables, first_imported_table, first_table, errors, filenames).deliver_now
         end
       end
 
@@ -164,7 +161,7 @@ module Resque
 
         def self.perform(user_id, state, table_name, error_code, processable_rows, number_geocoded_rows)
           user = ::User.where(id: user_id).first
-          GeocoderMailer.geocoding_finished(user, state, table_name, error_code, processable_rows, number_geocoded_rows).deliver
+          GeocoderMailer.geocoding_finished(user, state, table_name, error_code, processable_rows, number_geocoded_rows).deliver_now
         end
       end
 
@@ -175,7 +172,7 @@ module Resque
 
           def self.perform(user_id, visualization_id, dataset_name, error_code, error_message)
             user = ::User.where(id: user_id).first
-            SyncMailer.max_retries_reached(user, visualization_id, dataset_name, error_code, error_message).deliver
+            SyncMailer.max_retries_reached(user, visualization_id, dataset_name, error_code, error_message).deliver_now
           end
         end
       end
@@ -186,7 +183,7 @@ module Resque
 
         def self.perform(visualization_id, mapviews, vis_preview_image)
           visualization = Carto::Visualization.find(visualization_id)
-          UserMailer.trending_map(visualization, mapviews, vis_preview_image).deliver
+          UserMailer.trending_map(visualization, mapviews, vis_preview_image).deliver_now
         end
       end
 
@@ -196,7 +193,7 @@ module Resque
 
         def self.perform(user_id)
           user = Carto::User.find(user_id)
-          UserMailer.password_reset(user).deliver
+          UserMailer.password_reset(user).deliver_now
         end
       end
     end