diff --git a/Classes/Service/AbstractMailerService.php b/Classes/Service/AbstractMailerService.php
index 034f0e8..d58e941 100644
--- a/Classes/Service/AbstractMailerService.php
+++ b/Classes/Service/AbstractMailerService.php
@@ -130,6 +130,10 @@ public function attachHtmlInlineImage($match) {
             }
         }
 
+	    if ($this->mailSettings['attachEmbeddedImages']) {
+		    $this->processedMessage->attach(\Swift_Attachment::fromPath(urldecode($path)));
+	    }
+
         return $imgTagStart.$this->processedMessage->embed(\Swift_Image::fromPath(urldecode($path))).'"'.$imgTagEnd;
     }
 
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
index e00185c..8630952 100644
--- a/Configuration/Settings.yaml
+++ b/Configuration/Settings.yaml
@@ -2,6 +2,7 @@
 FormatD:
   Mailer:
     localEmbed: false
+    attachEmbeddedImages: false
     interceptAll:
       active: false
       recipients: []