[TASK] Mark mails as sent when sent through backend, fixed a bug when sending through backend

Classes/Service/MailTemplateService.php

@@ -448,10 +448,25 @@ class MailTemplateService {
 			$this->mailMessage->setTo($mailToSend->getToAddress());
 			$this->mailMessage->setFrom($mailToSend->getFromAddress(), $mailToSend->getFromName());
 			$this->mailMessage->setSubject($mailToSend->getMailSubject());
-			$this->mailMessage->setBcc(GeneralUtility::trimExplode(',', $mailToSend->getBccAddresses()));
-			$this->mailMessage->setCc(GeneralUtility::trimExplode(',', $mailToSend->getCcAddresses()));
-			$this->mailMessage->setReplyTo($mailToSend->getReplyTo());
+
+			if ($mailToSend->getCcAddresses()) {
+				$this->mailMessage->setBcc(GeneralUtility::trimExplode(',', $mailToSend->getBccAddresses()));
+			}
+
+			if ($mailToSend->getBccAddresses()) {
+				$this->mailMessage->setCc(GeneralUtility::trimExplode(',', $mailToSend->getCcAddresses()));
+			}
+
+			if ($mailToSend->getReplyTo()) {
+				$this->mailMessage->setReplyTo($mailToSend->getReplyTo());
+			}
+
 			$this->mailMessage->send();
+
+			if (!$mailToSend->getSent()) {
+				$mailToSend->setSent(TRUE);
+				$mailRepository->update($mailToSend);
+			}
 		}
 	}