diff --git a/lib/action_mailer_configs_interceptor.rb b/lib/action_mailer_configs_interceptor.rb
index b868fc27..f4af2002 100644
--- a/lib/action_mailer_configs_interceptor.rb
+++ b/lib/action_mailer_configs_interceptor.rb
@@ -16,7 +16,11 @@ module ActionMailerConfigsInterceptor
     end
 
     if Rails.env.production? && Rails.application.config.action_mailer.delivery_method
-      message.from = ENV.fetch('SMTP_FROM')
+      message.from = ENV.fetch('SMTP_FROM').to_s.split(',').sample
+
+      if message.from == 'DocuSeal <info@docuseal.com>'
+        message.body.raw_source.gsub!('https://docuseal.co/', 'https://docuseal.com/')
+      end
 
       return message
     end
diff --git a/lib/action_mailer_events_observer.rb b/lib/action_mailer_events_observer.rb
index c7786bda..273564ac 100644
--- a/lib/action_mailer_events_observer.rb
+++ b/lib/action_mailer_events_observer.rb
@@ -22,7 +22,7 @@ module ActionMailerEventsObserver
         emailable_type:,
         event_type: :send,
         email:,
-        data: { method: mail.delivery_method.class.name.underscore },
+        data: { from: mail.from, method: mail.delivery_method.class.name.underscore },
         event_datetime: Time.current
       )
     end