From 84244b1450380ce1fe8d06b9a5ac9693e0ed2391 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 23 Nov 2019 12:54:39 +0000
Subject: [PATCH] Now it works

---
 src/Protocol/Email.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 76797eb6e8..09b9df0506 100644
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -129,12 +129,14 @@ class Email
 			if (trim($ret['body']) == '') {
 				$ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'plain');
 
-				$message = ['text' => $ret['body'], 'html' => ''];
-				Hook::callAll('email_getmessage', $message, $ret);
+				$message = ['text' => $ret['body'], 'html' => '', 'item' => $ret];
+				Hook::callAll('email_getmessage', $message);
+				$ret = $message['item'];
 				$ret['body'] = $message['text'];
 			} else {
-				$message = ['text' => '', 'html' => $ret['body']];
-				Hook::callAll('email_getmessage', $message, $ret);
+				$message = ['text' => '', 'html' => $ret['body'], 'item' => $ret];
+				Hook::callAll('email_getmessage', $message);
+				$ret = $message['item'];
 				$ret['body'] = $message['html'];
 
 				$ret['body'] = HTML::toBBCode($ret['body']);
@@ -154,8 +156,9 @@ class Email
 				}
 			}
 
-			$message = ['text' => trim($text), 'html' => trim($html)];
-			Hook::callAll('email_getmessage', $message, $ret);
+			$message = ['text' => trim($text), 'html' => trim($html), 'item' => $ret];
+			Hook::callAll('email_getmessage', $message);
+			$ret = $message['item'];
 			$html = $message['html'];
 			$text = $message['text'];