diff --git a/extension/Classes/Core/Delete.php b/extension/Classes/Core/Delete.php
index 039012eb347a4ddc2a4f879864f35cd7ab81c8bd..9cb687b8ae6550bdab912d2cbe679604228098d5 100644
--- a/extension/Classes/Core/Delete.php
+++ b/extension/Classes/Core/Delete.php
@@ -39,6 +39,7 @@ class Delete {
      */
     public function __construct($dbIndexData = false, $phpUnit = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->db = new Database($dbIndexData);
         $this->store = Store::getInstance('', $phpUnit);
     }
diff --git a/extension/Classes/Core/File.php b/extension/Classes/Core/File.php
index a902cab02142ce7f5f86e010585278c27cf5859c..d26b0826f4d410c142d8fdab7105dd93575b6170 100644
--- a/extension/Classes/Core/File.php
+++ b/extension/Classes/Core/File.php
@@ -42,6 +42,8 @@ class File {
      * @throws \UserReportException
      */
     public function __construct($phpUnit = false) {
+
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->session = Session::getInstance($phpUnit);
 
         $this->store = Store::getInstance('', $phpUnit);
diff --git a/extension/Classes/Core/Form/Dirty.php b/extension/Classes/Core/Form/Dirty.php
index df9baa88ae11e8a39961d8877084bdcf2118d1a0..5b903efe8d788587fbee4dc1b49c474e280f9351 100644
--- a/extension/Classes/Core/Form/Dirty.php
+++ b/extension/Classes/Core/Form/Dirty.php
@@ -61,6 +61,7 @@ class Dirty {
      */
     public function __construct($phpUnit = false, $dbIndexData = false, $dbIndexQfq = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->session = Session::getInstance($phpUnit);
         $this->client = Client::getParam();
         if (!isset($this->client[DIRTY_RECORD_HASH_MD5])) {
diff --git a/extension/Classes/Core/Form/DragAndDrop.php b/extension/Classes/Core/Form/DragAndDrop.php
index faf107d55797227348553aa7613ef03cfe90bbc1..4fb01ef6ae16e685c24d864d373efe3929b91370 100644
--- a/extension/Classes/Core/Form/DragAndDrop.php
+++ b/extension/Classes/Core/Form/DragAndDrop.php
@@ -51,6 +51,7 @@ class DragAndDrop {
      */
     public function __construct(array $formSpec = array(), $phpUnit = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->formSpec = $formSpec;
 
         $dbIndex = DB_INDEX_DEFAULT;  //Hier muss noch die aktuelle DB ermittelt werden (kann im Form angegeben sein) - Gerade im Formular FORM Editor genau testen!
diff --git a/extension/Classes/Core/Form/FormAction.php b/extension/Classes/Core/Form/FormAction.php
index b05dfefe94d01fa6c40902b6b7709912d775e104..286d8687d8f010f832f68b251530107ed91487bb 100644
--- a/extension/Classes/Core/Form/FormAction.php
+++ b/extension/Classes/Core/Form/FormAction.php
@@ -55,6 +55,8 @@ class FormAction {
      * @throws \UserReportException
      */
     public function __construct(array $formSpec, Database $db, $phpUnit = false) {
+
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->formSpec = $formSpec;
         $this->primaryTableName = Support::setIfNotSet($formSpec, F_TABLE_NAME);
 
diff --git a/extension/Classes/Core/Form/TypeAhead.php b/extension/Classes/Core/Form/TypeAhead.php
index 4ef88435f789c091a9f22e8106ae21a5e33827a2..2320b8678d451cbf481c0190716efa7a8d2c8c65 100644
--- a/extension/Classes/Core/Form/TypeAhead.php
+++ b/extension/Classes/Core/Form/TypeAhead.php
@@ -37,6 +37,7 @@ class TypeAhead {
      */
     public function __construct($phpUnit = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->vars[TYPEAHEAD_API_QUERY] = isset($_GET[TYPEAHEAD_API_QUERY]) ? $_GET[TYPEAHEAD_API_QUERY] : '';
         $this->vars[TYPEAHEAD_API_PREFETCH] = isset($_GET[TYPEAHEAD_API_PREFETCH]) ? $_GET[TYPEAHEAD_API_PREFETCH] : '';
         $this->vars[TYPEAHEAD_API_SIP] = isset($_GET[TYPEAHEAD_API_SIP]) ? $_GET[TYPEAHEAD_API_SIP] : '';
diff --git a/extension/Classes/Core/QuickFormQuery.php b/extension/Classes/Core/QuickFormQuery.php
index 4d2039d896c79502139b6f187545384e50cbc383..d25fbf5355037732ad1f676898aae203c2410612 100644
--- a/extension/Classes/Core/QuickFormQuery.php
+++ b/extension/Classes/Core/QuickFormQuery.php
@@ -117,6 +117,8 @@ class QuickFormQuery {
      * @throws \UserReportException
      */
     public function __construct(array $t3data = array(), $phpUnit = false, $inlineReport = true) {
+
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->phpUnit = $phpUnit;
         $this->inlineReport = $inlineReport;
 
diff --git a/extension/Classes/Core/Report/Download.php b/extension/Classes/Core/Report/Download.php
index 368643959a7eda39b4003f3bf0177c1635d87ed6..a55c0b86c6af9352d29a946bcdf2cbbd164d64d4 100644
--- a/extension/Classes/Core/Report/Download.php
+++ b/extension/Classes/Core/Report/Download.php
@@ -78,6 +78,7 @@ class Download {
      */
     public function __construct($phpUnit = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->session = Session::getInstance($phpUnit);
         $this->store = Store::getInstance('', $phpUnit);
         $this->db = new Database();
diff --git a/extension/Classes/Core/Report/Html2Pdf.php b/extension/Classes/Core/Report/Html2Pdf.php
index 919040746c25a5895f5443728e9dc07aa2aedbfc..048191ba7aeac93f5976797a2669445a76128c4b 100644
--- a/extension/Classes/Core/Report/Html2Pdf.php
+++ b/extension/Classes/Core/Report/Html2Pdf.php
@@ -67,6 +67,7 @@ class Html2Pdf {
      */
     public function __construct(array $config = array(), $phpUnit = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         if (count($config) == 0) {
             $config = Config::readConfig('');
         }
diff --git a/extension/Classes/Core/Report/Link.php b/extension/Classes/Core/Report/Link.php
index caceb5dad2a7a674f99450a0a0478bab959c6634..8bc91b4143f527d6137988aedc4c1573ea3dd553 100644
--- a/extension/Classes/Core/Report/Link.php
+++ b/extension/Classes/Core/Report/Link.php
@@ -221,6 +221,8 @@ class Link {
      * @throws \UserReportException
      */
     public function __construct(Sip $sip, $dbIndexData = DB_INDEX_DEFAULT, $phpUnit = false) {
+
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->phpUnit = $phpUnit;
 
         if ($phpUnit) {
diff --git a/extension/Classes/Core/Report/Monitor.php b/extension/Classes/Core/Report/Monitor.php
index ee402c3b446a0752f3c0b8ee103f5e6f1cba0555..0686d24b601d17aa7e2e83bfd321143e25b16b2a 100644
--- a/extension/Classes/Core/Report/Monitor.php
+++ b/extension/Classes/Core/Report/Monitor.php
@@ -38,6 +38,8 @@ class Monitor {
      * @throws \UserReportException
      */
     public function __construct($phpUnit = false) {
+
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->store = Store::getInstance();
         $this->session = Session::getInstance($phpUnit);
     }
diff --git a/extension/Classes/Core/Report/Report.php b/extension/Classes/Core/Report/Report.php
index 5864a97de68a99b2c3290119dcf79159316c7302..d644b182933ecb13a2b7a7058fbf4fab9bf4aa1a 100644
--- a/extension/Classes/Core/Report/Report.php
+++ b/extension/Classes/Core/Report/Report.php
@@ -125,6 +125,7 @@ class Report {
      */
     public function __construct(array $t3data, Evaluate $eval, $phpUnit = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->phpUnit = $phpUnit;
 
         Support::setIfNotSet($t3data, "uid", 0);
diff --git a/extension/Classes/Core/Report/SendMail.php b/extension/Classes/Core/Report/SendMail.php
index 5f8ecbf304a523cfa867e0d3cc15529187590ace..971cd0708dd470d5aa03e1187d206afd296a232b 100644
--- a/extension/Classes/Core/Report/SendMail.php
+++ b/extension/Classes/Core/Report/SendMail.php
@@ -66,6 +66,10 @@ class SendMail {
 
         if (!empty($redirectAllMail)) {
 
+            foreach ([SENDMAIL_TOKEN_RECEIVER, SENDMAIL_TOKEN_RECEIVER_CC, SENDMAIL_TOKEN_RECEIVER_BCC] as $key) {
+                $mailConfig[$key] = (strlen($mailConfig[$key]) > 1023) ? str_replace(',', ', ', $mailConfig[$key]) : $mailConfig[$key];
+            }
+
             $addBody = "All QFQ outgoing mails are caught and redirected to you." . PHP_EOL . "Original receiver(s) are ..." . PHP_EOL;
             $addBody .= 'TO: ' . ($mailConfig[SENDMAIL_TOKEN_RECEIVER] ?? '') . PHP_EOL;
             $addBody .= 'CC: ' . ($mailConfig[SENDMAIL_TOKEN_RECEIVER_CC] ?? '') . PHP_EOL;
diff --git a/extension/Classes/Core/Report/Thumbnail.php b/extension/Classes/Core/Report/Thumbnail.php
index 2de19d05525b1ba5814162615a7661a447ec15f3..2db178440971dcebc441ad367ec5a0a9033e882f 100644
--- a/extension/Classes/Core/Report/Thumbnail.php
+++ b/extension/Classes/Core/Report/Thumbnail.php
@@ -42,6 +42,8 @@ class Thumbnail {
      * @throws \UserReportException
      */
     public function __construct($phpUnit = false) {
+
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->store = Store::getInstance();
 
         $this->inkscape = $this->store->getVar(SYSTEM_CMD_INKSCAPE, STORE_SYSTEM);
diff --git a/extension/Classes/Core/Save.php b/extension/Classes/Core/Save.php
index 3d6ece9711f9d7a1b511bc61d9a25328b329aa51..5b465d293ecfe8dac615e08fd83b6f2fa378b012 100644
--- a/extension/Classes/Core/Save.php
+++ b/extension/Classes/Core/Save.php
@@ -50,6 +50,7 @@ class Save {
      * @throws \UserReportException
      */
     public function __construct(array $formSpec, array $feSpecAction, array $feSpecNative, array $feSpecNativeRaw) {
+
         $this->formSpec = $formSpec;
         $this->feSpecAction = $feSpecAction;
         $this->feSpecNative = $feSpecNative;
diff --git a/extension/Classes/Core/Store/Session.php b/extension/Classes/Core/Store/Session.php
index fe4e759e103020283a4d27878eb67155786304e4..ff0dc5ca97d5a5c9de8211399c7b57d58c26d237 100644
--- a/extension/Classes/Core/Store/Session.php
+++ b/extension/Classes/Core/Store/Session.php
@@ -34,6 +34,7 @@ class Session
      */
     private function __construct($phpUnit = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         if (self::$phpUnit !== null) {
             throw new \CodeException("Try to set flag phpunit again - that should not happen.", ERROR_CODE_SHOULD_NOT_HAPPEN);
         }
diff --git a/extension/Classes/Core/Store/Sip.php b/extension/Classes/Core/Store/Sip.php
index 492beb96e002864c60a42f611b49263e3a4d6cd2..61acddd5169600dac3f0634d4ef8e437a2b36643 100644
--- a/extension/Classes/Core/Store/Sip.php
+++ b/extension/Classes/Core/Store/Sip.php
@@ -27,6 +27,7 @@ class Sip {
      */
     public function __construct($phpUnit = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->phpUnit = $phpUnit;
     }
 
diff --git a/extension/Classes/External/AutoCron.php b/extension/Classes/External/AutoCron.php
index bf586f6b0249eff97069fc775baa2b5b190dc6ac..aacce788c874bbd62c6492b50c21b5d9d127eb8d 100644
--- a/extension/Classes/External/AutoCron.php
+++ b/extension/Classes/External/AutoCron.php
@@ -59,6 +59,7 @@ class AutoCron {
      */
     public function __construct($verbose = false, $phpUnit = false) {
 
+        #TODO: rewrite $phpUnit to: "if (!defined('PHPUNIT_QFQ')) {...}"
         $this->verbose = $verbose;
         $this->phpUnit = $phpUnit;