diff --git a/Model/Transport.php b/Model/Transport.php
index aba33c0..7ecdf3d 100644
--- a/Model/Transport.php
+++ b/Model/Transport.php
@@ -65,4 +65,12 @@ public function sendMessage()
             throw new \Magento\Framework\Exception\MailException(new \Magento\Framework\Phrase($e->getMessage()), $e);
         }
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMessage()
+    {
+        return $this->_message;
+    }
 }
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 1da3173..35de976 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,7 @@
 {
   "name": "codepeak/magento2-mailtrap",
   "description": "Enable mail testing through Mailtrap.io",
+  "version": "1.1.0",
   "license": "proprietary",
   "authors": [
     {
@@ -9,7 +10,9 @@
     }
   ],
   "minimum-stability": "dev",
-  "require": {},
+  "require": {
+    "magento/module-email": "*"
+  },
   "autoload": {
     "files": [
       "registration.php"
diff --git a/etc/di.xml b/etc/di.xml
index 4deb112..be84524 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="\Magento\Framework\Mail\Transport" type="Codepeak\Mailtrap\Model\Transport"/>
+    <preference for="Magento\Framework\Mail\TransportInterface" type="Codepeak\Mailtrap\Model\Transport"/>
 </config>
\ No newline at end of file
diff --git a/etc/module.xml b/etc/module.xml
index 486be28..cfc84e2 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="Codepeak_Mailtrap" setup_version="1.0.0"/>
+	<module name="Codepeak_Mailtrap" setup_version="1.1.0">
+		<sequence>
+			<module name="Magento_Email"/>
+		</sequence>
+	</module>
 </config>