From 6139de868021f2c6626230a69628de74dc8f03d7 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dhensby@silverstripe.com>
Date: Wed, 8 Nov 2017 15:32:51 +0000
Subject: [PATCH] FIX Make sure plain parts are rendered when re-rendering
 emails

---
 src/Control/Email/Email.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Control/Email/Email.php b/src/Control/Email/Email.php
index ffa0dbfd6..230af870f 100644
--- a/src/Control/Email/Email.php
+++ b/src/Control/Email/Email.php
@@ -621,6 +621,12 @@ class Email extends ViewableData
      */
     public function setBody($body)
     {
+        $plainPart = $this->findPlainPart();
+        if ($plainPart) {
+            $this->getSwiftMessage()->detach($plainPart);
+        }
+        unset($plainPart);
+
         $body = HTTP::absoluteURLs($body);
         $this->getSwiftMessage()->setBody($body);
 
@@ -856,6 +862,12 @@ class Email extends ViewableData
      */
     public function generatePlainPartFromBody()
     {
+        $plainPart = $this->findPlainPart();
+        if ($plainPart) {
+            $this->getSwiftMessage()->detach($plainPart);
+        }
+        unset($plainPart);
+
         $this->getSwiftMessage()->addPart(
             Convert::xml2raw($this->getBody()),
             'text/plain',