diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index cbc6bae04..d51d05bee 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -121,7 +121,10 @@ return [
         'mailgun_domain' => 'Mailgun Domain',
         'mailgun_domain_comment' => 'Please specify the Mailgun domain name.',
         'mailgun_secret' => 'Mailgun Secret',
-        'mailgun_domain_secret' => 'Enter your Mailgun API key.'
+        'mailgun_domain_secret' => 'Enter your Mailgun API key.',
+        'mandrill' => 'Mandrill',
+        'mandrill_secret' => 'Mandrill Secret',
+        'mandrill_secret_comment' => 'Enter your Mandrill API key.'
     ],
     'mail_templates' => [
         'menu_label' => 'Mail templates',
diff --git a/modules/system/models/MailSettings.php b/modules/system/models/MailSettings.php
index d53c91be4..6d17b22dd 100644
--- a/modules/system/models/MailSettings.php
+++ b/modules/system/models/MailSettings.php
@@ -21,6 +21,7 @@ class MailSettings extends Model
     const MODE_SENDMAIL = 'sendmail';
     const MODE_SMTP     = 'smtp';
     const MODE_MAILGUN  = 'mailgun';
+    const MODE_MANDRILL = 'mandrill';
 
     public function initSettingsData()
     {
@@ -44,6 +45,7 @@ class MailSettings extends Model
             static::MODE_SENDMAIL => 'system::lang.mail.sendmail',
             static::MODE_SMTP     => 'system::lang.mail.smtp',
             static::MODE_MAILGUN  => 'system::lang.mail.mailgun',
+            static::MODE_MANDRILL => 'system::lang.mail.mandrill',
         ];
     }
 
@@ -78,6 +80,10 @@ class MailSettings extends Model
                 $config->set('services.mailgun.domain', $settings->mailgun_domain);
                 $config->set('services.mailgun.secret', $settings->mailgun_secret);
                 break;
+
+            case self::MODE_MANDRILL:
+                $config->set('services.mandrill.secret', $settings->mandrill_secret);
+                break;
         }
 
     }
diff --git a/modules/system/models/mailsettings/fields.yaml b/modules/system/models/mailsettings/fields.yaml
index 318951fb9..7d884610a 100644
--- a/modules/system/models/mailsettings/fields.yaml
+++ b/modules/system/models/mailsettings/fields.yaml
@@ -62,4 +62,9 @@ tabs:
     mailgun_secret:
       label: system::lang.mail.mailgun_secret
       commentAbove: system::lang.mail.mailgun_domain_secret
-      tab: system::lang.mail.mailgun
\ No newline at end of file
+      tab: system::lang.mail.mailgun
+      
+    mandrill_secret:
+      label: system::lang.mail.mandrill_secret
+      commentAbove: system::lang.mail.mandrill_secret_comment
+      tab: system::lang.mail.mandrill