diff --git a/Classes/Service/MailTemplateService.php b/Classes/Service/MailTemplateService.php
index 31f07f344ee99310b13a4b075a1cbf7701f481e3..baee748594af050beb81c484769f5016e3be2767 100644
--- a/Classes/Service/MailTemplateService.php
+++ b/Classes/Service/MailTemplateService.php
@@ -389,16 +389,21 @@ class MailTemplateService {
 			$this->mailMessage->send();
 			$dateTime = new DateTime();
 			$currentTimestamp = $dateTime->getTimestamp();
-			$this->addMailToMailQueue(
-				$this->extensionKey, $this->templateName, $subject, $emailBody, $this->priority,
-				$currentTimestamp, TRUE, $currentTimestamp, $this->language, $siteRootId
-			);
+
+			if (!$isPreview) {
+				$this->addMailToMailQueue(
+					$this->extensionKey, $this->templateName, $subject, $emailBody, $this->priority,
+					$currentTimestamp, TRUE, $currentTimestamp, $this->language, $siteRootId
+				);
+			}
 
 		} else {
-			$this->addMailToMailQueue(
-				$this->extensionKey, $this->templateName, $subject, $emailBody, $this->priority, 0, FALSE, 0,
-				$this->language, $siteRootId
-			);
+			if (!$isPreview) {
+				$this->addMailToMailQueue(
+					$this->extensionKey, $this->templateName, $subject, $emailBody, $this->priority, 0, FALSE, 0,
+					$this->language, $siteRootId
+				);
+			}
 		}
 
 		return TRUE;