diff --git a/includes/HTMLMailSystem__SmtpMailSystem.mail.inc b/includes/HTMLMailSystem__SmtpMailSystem.mail.inc
new file mode 100644
index 0000000..e2b212c
--- /dev/null
+++ b/includes/HTMLMailSystem__SmtpMailSystem.mail.inc
@@ -0,0 +1,25 @@
+<?php
+class HTMLMailSystem__SmtpMailSystem implements MailSystemInterface {
+  protected $formatClass;
+  protected $mailClass;
+  public function __construct() {
+    if (drupal_autoload_class('HTMLMailSystem')) {
+      $this->formatClass = new HTMLMailSystem;
+    }
+    else {
+      $this->formatClass = new DefaultMailSystem;
+    }
+    if (drupal_autoload_class('SmtpMailSystem')) {
+      $this->mailClass = new SmtpMailSystem;
+    }
+    else {
+      $this->mailClass = new DefaultMailSystem;
+    }
+  }
+  public function format(array $message) {
+    return $this->formatClass->format($message);
+  }
+  public function mail(array $message) {
+    return $this->mailClass->mail($message);
+  }
+}
diff --git a/mailsystem.info b/mailsystem.info
index 7d4956f..0ca05b1 100644
--- a/mailsystem.info
+++ b/mailsystem.info
@@ -5,6 +5,7 @@ php = 5.0
 core = 7.x
 configure = admin/config/system/mailsystem
 dependencies[] = filter
+files[] = includes/HTMLMailSystem__SmtpMailSystem.mail.inc
 
 ; Information added by drupal.org packaging script on 2012-04-10
 version = "7.x-2.34"