diff --git a/Classes/Container.php b/Classes/Container.php
index 9e587d006..c9e133329 100644
--- a/Classes/Container.php
+++ b/Classes/Container.php
@@ -28,7 +28,6 @@
  */
 class Container
 {
-
     public $boundaryStartWrap = '<!--DMAILER_SECTION_BOUNDARY_ | -->';
     public $boundaryEnd = '<!--DMAILER_SECTION_BOUNDARY_END-->';
 
@@ -79,14 +78,15 @@ public function insert_dMailer_boundaries($content, $conf = array())
                         $foreignTable,
                         $whereClause,
                         '',
-                        $orderBy);
+                        $orderBy
+                    );
 
                     if ($GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
                         while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                             $categoryList .= $row['uid'] . ',';
                         }
                         $GLOBALS['TYPO3_DB']->sql_free_result($res);
-                        $categoryList = rtrim($categoryList, ",");
+                        $categoryList = rtrim($categoryList, ',');
                     }
                 }
                 // wrap boundaries around content
diff --git a/Classes/DirectMailUtility.php b/Classes/DirectMailUtility.php
index 07d50e584..2d3b6351b 100644
--- a/Classes/DirectMailUtility.php
+++ b/Classes/DirectMailUtility.php
@@ -14,12 +14,13 @@
  * The TYPO3 project - inspiring people to share!
  */
 
+use DirectMailTeam\DirectMail\Utility\FlashMessageRenderer;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Backend\Utility\IconUtility;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Backend\Utility\IconUtility;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 
 /**
@@ -111,7 +112,7 @@ public static function cleanPlainList(array $plainlist)
          *
          * );
          */
-        $plainlist = array_map("unserialize", array_unique(array_map("serialize", $plainlist)));
+        $plainlist = array_map('unserialize', array_unique(array_map('serialize', $plainlist)));
 
         return $plainlist;
     }
@@ -203,16 +204,16 @@ public static function getIdList($table, $pidList, $groupUid, $cat)
         // Direct Mail needs an email address!
         $emailIsNotNull = ' AND ' . $switchTable . '.email !=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('', $switchTable);
 
-            // fe user group uid should be in list of fe users list of user groups
-//		$field = $switchTable.'.usergroup';
-//		$command = $table.'.uid';
+        // fe user group uid should be in list of fe users list of user groups
+        //		$field = $switchTable.'.usergroup';
+        //		$command = $table.'.uid';
         // This approach, using standard SQL, does not work,
         // even when fe_users.usergroup is defined as varchar(255) instead of tinyblob
         // $usergroupInList = ' AND ('.$field.' LIKE \'%,\'||'.$command.'||\',%\' OR '.$field.' LIKE '.$command.'||\',%\' OR '.$field.' LIKE \'%,\'||'.$command.' OR '.$field.'='.$command.')';
         // The following will work but INSTR and CONCAT are available only in mySQL
         $usergroupInList = ' AND INSTR( CONCAT(\',\',fe_users.usergroup,\',\'),CONCAT(\',\',fe_groups.uid ,\',\') )';
 
-        $mmTable = $GLOBALS["TCA"][$switchTable]['columns']['module_sys_dmail_category']['config']['MM'];
+        $mmTable = $GLOBALS['TCA'][$switchTable]['columns']['module_sys_dmail_category']['config']['MM'];
         $cat = intval($cat);
         if ($cat < 1) {
             if ($table == 'fe_groups') {
@@ -227,7 +228,7 @@ public static function getIdList($table, $pidList, $groupUid, $cat)
                         BackendUtility::BEenableFields($table) .
                         BackendUtility::deleteClause($table) .
                         $addWhere,
-                    $switchTable . '.email'
+                    $switchTable . '.uid, ' . $switchTable . '.email'
                 );
             } else {
                 $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -238,7 +239,7 @@ public static function getIdList($table, $pidList, $groupUid, $cat)
                         BackendUtility::BEenableFields($switchTable) .
                         BackendUtility::deleteClause($switchTable) .
                         $addWhere,
-                    $switchTable . '.email'
+                    $switchTable . '.uid, ' . $switchTable . '.email'
                 );
             }
         } else {
@@ -258,7 +259,7 @@ public static function getIdList($table, $pidList, $groupUid, $cat)
                         BackendUtility::deleteClause($table) .
                         BackendUtility::deleteClause('sys_dmail_group') .
                         $addWhere,
-                    $switchTable . '.email'
+                    $switchTable . '.uid, ' . $switchTable . '.email'
                 );
             } else {
                 $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -273,7 +274,7 @@ public static function getIdList($table, $pidList, $groupUid, $cat)
                         BackendUtility::deleteClause($switchTable) .
                         BackendUtility::deleteClause('sys_dmail_group') .
                         $addWhere,
-                    $switchTable . '.email'
+                    $switchTable . '.uid, ' . $switchTable . '.email'
                 );
             }
         }
@@ -281,7 +282,7 @@ public static function getIdList($table, $pidList, $groupUid, $cat)
         while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
             $outArr[] = $row['uid'];
         }
-        $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+        $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
         return $outArr;
     }
@@ -311,8 +312,8 @@ public static function getStaticIdList($table, $uid)
         // $usergroupInList = ' AND ('.$field.' LIKE \'%,\'||'.$command.'||\',%\' OR '.$field.' LIKE '.$command.'||\',%\' OR '.$field.' LIKE \'%,\'||'.$command.' OR '.$field.'='.$command.')';
 
         // for fe_users and fe_group, only activated modulde_sys_dmail_newsletter
-        if ($switchTable == "fe_users") {
-            $addWhere = ' AND ' . $switchTable . ".module_sys_dmail_newsletter = 1";
+        if ($switchTable == 'fe_users') {
+            $addWhere = ' AND ' . $switchTable . '.module_sys_dmail_newsletter = 1';
         }
 
         $usergroupInList = ' AND INSTR( CONCAT(\',\',fe_users.usergroup,\',\'),CONCAT(\',\',fe_groups.uid ,\',\') )';
@@ -332,7 +333,7 @@ public static function getStaticIdList($table, $uid)
                     BackendUtility::deleteClause($table) .
                     BackendUtility::deleteClause('sys_dmail_group') .
                     $addWhere,
-                $switchTable . '.email'
+                $switchTable . '.uid, ' . $switchTable . '.email'
             );
         } else {
             $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -346,7 +347,7 @@ public static function getStaticIdList($table, $uid)
                     BackendUtility::deleteClause($switchTable) .
                     BackendUtility::deleteClause('sys_dmail_group') .
                     $addWhere,
-                $switchTable . '.email'
+                $switchTable . '.uid, ' . $switchTable . '.email'
             );
         }
 
@@ -366,7 +367,7 @@ public static function getStaticIdList($table, $uid)
                     ' AND sys_dmail_group_mm.tablenames=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($table, $table) .
                     BackendUtility::BEenableFields($table) .
                     BackendUtility::deleteClause($table)
-                );
+            );
             list($groupId) = $GLOBALS['TYPO3_DB']->sql_fetch_row($res);
             $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
@@ -390,8 +391,8 @@ public static function getStaticIdList($table, $uid)
                         BackendUtility::deleteClause($switchTable) .
                         BackendUtility::BEenableFields($table) .
                         BackendUtility::deleteClause($table) .
-                        $addWhere,
-                        $switchTable . '.email'
+                    $addWhere,
+                    $switchTable . '.uid, ' . $switchTable . '.email'
                 );
 
                 while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
@@ -446,7 +447,7 @@ public static function getSpecialQueryIdList(MailSelect &$queryGenerator, $table
      */
     public static function getMailGroups($list, array $parsedGroups, $perms_clause)
     {
-        $groupIdList = GeneralUtility::intExplode(",", $list);
+        $groupIdList = GeneralUtility::intExplode(',', $list);
         $groups = array();
 
         $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -498,8 +499,8 @@ public static function rearrangeCsvValues(array $lines, $fieldList)
             // overrides any existing value in the field
             $first = $lines[0];
             $fieldListArr = explode(',', $fieldList);
-            if ($GLOBALS["TYPO3_CONF_VARS"]['EXTCONF']['direct_mail']['addRecipFields']) {
-                $fieldListArr = array_merge($fieldListArr, explode(',', $GLOBALS["TYPO3_CONF_VARS"]['EXTCONF']['direct_mail']['addRecipFields']));
+            if ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['addRecipFields']) {
+                $fieldListArr = array_merge($fieldListArr, explode(',', $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['addRecipFields']));
             }
             $fieldName = 1;
             $fieldOrder = array();
@@ -514,11 +515,11 @@ public static function rearrangeCsvValues(array $lines, $fieldList)
                     break;
                 }
             }
-                // If not field list, then:
+            // If not field list, then:
             if (!$fieldName) {
                 $fieldOrder = array(array('name'),array('email'));
             }
-                // Re-map values
+            // Re-map values
             reset($lines);
             if ($fieldName) {
                 // Advance pointer if the first line was field names
@@ -601,7 +602,7 @@ public static function makeCategories($table, array $row, $sysLanguageUid)
                 $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     '*',
                     'sys_dmail_category',
-                    'sys_dmail_category.pid IN (' . str_replace(",", "','", $GLOBALS['TYPO3_DB']->fullQuoteStr($pidList, 'sys_dmail_category')) . ')' .
+                    'sys_dmail_category.pid IN (' . str_replace(',', "','", $GLOBALS['TYPO3_DB']->fullQuoteStr($pidList, 'sys_dmail_category')) . ')' .
                         ' AND l18n_parent=0' .
                         BackendUtility::BEenableFields('sys_dmail_category') .
                         BackendUtility::deleteClause('sys_dmail_category')
@@ -611,7 +612,7 @@ public static function makeCategories($table, array $row, $sysLanguageUid)
                         $categories[$localizedRowCat['uid']] = htmlspecialchars($localizedRowCat['category']);
                     }
                 }
-                $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+                $GLOBALS['TYPO3_DB']->sql_free_result($res);
             }
         }
         return $categories;
@@ -632,20 +633,20 @@ public static function makeCategories($table, array $row, $sysLanguageUid)
     public static function getRecordOverlay($table, array $row, $sys_language_content, $OLmode = '')
     {
         if ($row['uid']>0 && $row['pid']>0) {
-            if ($GLOBALS["TCA"][$table] && $GLOBALS["TCA"][$table]['ctrl']['languageField'] && $GLOBALS["TCA"][$table]['ctrl']['transOrigPointerField']) {
-                if (!$GLOBALS["TCA"][$table]['ctrl']['transOrigPointerTable']) {
+            if ($GLOBALS['TCA'][$table] && $GLOBALS['TCA'][$table]['ctrl']['languageField'] && $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']) {
+                if (!$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerTable']) {
                     // Will try to overlay a record only
                     // if the sys_language_content value is larger that zero.
                     if ($sys_language_content > 0) {
                         // Must be default language or [All], otherwise no overlaying:
-                        if ($row[$GLOBALS["TCA"][$table]['ctrl']['languageField']]<=0) {
+                        if ($row[$GLOBALS['TCA'][$table]['ctrl']['languageField']]<=0) {
                             // Select overlay record:
                             $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                                 '*',
                                 $table,
                                 'pid=' . intval($row['pid']) .
-                                    ' AND ' . $GLOBALS["TCA"][$table]['ctrl']['languageField'] . '=' . intval($sys_language_content) .
-                                    ' AND ' . $GLOBALS["TCA"][$table]['ctrl']['transOrigPointerField'] . '=' . intval($row['uid']) .
+                                    ' AND ' . $GLOBALS['TCA'][$table]['ctrl']['languageField'] . '=' . intval($sys_language_content) .
+                                    ' AND ' . $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] . '=' . intval($row['uid']) .
                                     BackendUtility::BEenableFields($table) .
                                     BackendUtility::deleteClause($table),
                                 '',
@@ -653,18 +654,18 @@ public static function getRecordOverlay($table, array $row, $sys_language_conten
                                 '1'
                                 );
                             $olrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-                            $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+                            $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
-                                // Merge record content by traversing all fields:
+                            // Merge record content by traversing all fields:
                             if (is_array($olrow)) {
                                 foreach ($row as $fN => $fV) {
                                     if ($fN!='uid' && $fN!='pid' && isset($olrow[$fN])) {
-                                        if ($GLOBALS["TCA"][$table]['l10n_mode'][$fN]!='exclude' && ($GLOBALS["TCA"][$table]['l10n_mode'][$fN]!='mergeIfNotBlank' || strcmp(trim($olrow[$fN]), ''))) {
+                                        if ($GLOBALS['TCA'][$table]['l10n_mode'][$fN]!='exclude' && ($GLOBALS['TCA'][$table]['l10n_mode'][$fN]!='mergeIfNotBlank' || strcmp(trim($olrow[$fN]), ''))) {
                                             $row[$fN] = $olrow[$fN];
                                         }
                                     }
                                 }
-                            } elseif ($OLmode === 'hideNonTranslated' && $row[$GLOBALS["TCA"][$table]['ctrl']['languageField']] == 0) {
+                            } elseif ($OLmode === 'hideNonTranslated' && $row[$GLOBALS['TCA'][$table]['ctrl']['languageField']] == 0) {
                                 // Unset, if non-translated records should be hidden.
                                 // ONLY done if the source record really is default language and not [All] in which case it is allowed.
                                 unset($row);
@@ -672,13 +673,13 @@ public static function getRecordOverlay($table, array $row, $sys_language_conten
 
                             // Otherwise, check if sys_language_content is different from the value of the record
                             // that means a japanese site might try to display french content.
-                        } elseif ($sys_language_content!=$row[$GLOBALS["TCA"][$table]['ctrl']['languageField']]) {
+                        } elseif ($sys_language_content!=$row[$GLOBALS['TCA'][$table]['ctrl']['languageField']]) {
                             unset($row);
                         }
                     } else {
                         // When default language is displayed,
                         // we never want to return a record carrying another language!:
-                        if ($row[$GLOBALS["TCA"][$table]['ctrl']['languageField']]>0) {
+                        if ($row[$GLOBALS['TCA'][$table]['ctrl']['languageField']]>0) {
                             unset($row);
                         }
                     }
@@ -713,11 +714,11 @@ public static function formatTable(array $tableLines, array $cellParams, $header
             $rowA = array();
             for ($k=0; $k<$cols; $k++) {
                 $v = $r[$k];
-                $v = strlen($v) ? ($cellcmd[$k]?$v:htmlspecialchars($v)) : "&nbsp;";
+                $v = strlen($v) ? ($cellcmd[$k]?$v:htmlspecialchars($v)) : '&nbsp;';
                 if ($first) {
                     $rowA[] = '<td>' . $v . '</td>';
                 } else {
-                    $rowA[] = '<td' . ($cellParams[$k]?" " . $cellParams[$k]:"") . '>' . $v . '</td>';
+                    $rowA[] = '<td' . ($cellParams[$k]?' ' . $cellParams[$k]:'') . '>' . $v . '</td>';
                 }
             }
             $lines[] = '<tr class="' . ($first ? 't3-row-header' : 'db_list_normal') . '">' . implode('', $rowA) . '</tr>';
@@ -818,6 +819,10 @@ public static function getRecordList(array $listArr, $table, $pageId, $editLinkF
         // init iconFactory
         $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
 
+        $isAllowedDisplayTable = $GLOBALS['BE_USER']->check('tables_select', $table);
+        $isAllowedEditTable = $GLOBALS['BE_USER']->check('tables_modify', $table);
+        $notAllowedPlaceholder = $GLOBALS['LANG']->getLL('mailgroup_table_disallowed_placeholder');
+
         if (is_array($listArr)) {
             $count = count($listArr);
             $returnUrl = GeneralUtility::getIndpEnv('REQUEST_URI');
@@ -826,7 +831,7 @@ public static function getRecordList(array $listArr, $table, $pageId, $editLinkF
                 $editLink = '';
                 if ($row['uid']) {
                     $tableIcon = '<td>' . $iconFactory->getIconForRecord($table, array()) . '</td>';
-                    if ($editLinkFlag) {
+                    if ($editLinkFlag && $isAllowedEditTable) {
                         $urlParameters = [
                             'edit' => [
                                 $table => [
@@ -835,22 +840,28 @@ public static function getRecordList(array $listArr, $table, $pageId, $editLinkF
                             ],
                             'returnUrl' => $returnUrl
                         ];
-                        $editLink = '<td><a class="t3-link" href="' . BackendUtility::getModuleUrl('record_edit', $urlParameters) . '" title="' . $GLOBALS['LANG']->getLL("dmail_edit") . '">' .
+                        $editLink = '<td><a class="t3-link" href="' . BackendUtility::getModuleUrl('record_edit', $urlParameters) . '" title="' . $GLOBALS['LANG']->getLL('dmail_edit') . '">' .
                             $iconFactory->getIcon('actions-open', Icon::SIZE_SMALL) .
                             '</a></td>';
                     }
                 }
 
+                if ($isAllowedDisplayTable) {
+                    $exampleData = '<td nowrap> ' . htmlspecialchars($row['email']) . ' </td>
+				<td nowrap> ' . htmlspecialchars($row['name']) . ' </td>';
+                } else {
+                    $exampleData = '<td nowrap>' . $notAllowedPlaceholder . '</td>';
+                }
+
                 $lines[]='<tr class="db_list_normal">
 				' . $tableIcon . '
 				' . $editLink . '
-				<td nowrap> ' . htmlspecialchars($row['email']) . ' </td>
-				<td nowrap> ' . htmlspecialchars($row['name']) . ' </td>
+				' . $exampleData . '
 				</tr>';
             }
         }
         if (count($lines)) {
-            $out = $GLOBALS["LANG"]->getLL('dmail_number_records') . '<strong> ' . $count . '</strong><br />';
+            $out = $GLOBALS['LANG']->getLL('dmail_number_records') . '<strong> ' . $count . '</strong><br />';
             $out .= '<table class="table table-striped table-hover">' . implode(LF, $lines) . '</table>';
         }
         return $out;
@@ -863,15 +874,15 @@ public static function getRecordList(array $listArr, $table, $pageId, $editLinkF
      *
      * @return array The all id of fe_groups
      */
-    public function getFEgroupSubgroups($groupId)
+    public static function getFEgroupSubgroups($groupId)
     {
         // get all subgroups of this fe_group
         // fe_groups having this id in their subgroup field
-        $res = $GLOBALS["TYPO3_DB"]->exec_SELECT_mm_query(
-            "DISTINCT fe_groups.uid",
-            "fe_groups",
-            "sys_dmail_group_mm",
-            "sys_dmail_group",
+        $res = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
+            'DISTINCT fe_groups.uid',
+            'fe_groups',
+            'sys_dmail_group_mm',
+            'sys_dmail_group',
             ' AND INSTR( CONCAT(\',\',fe_groups.subgroup,\',\'),\',' . intval($groupId) . ',\' )' .
                 BackendUtility::BEenableFields('fe_groups') .
                 BackendUtility::deleteClause('fe_groups')
@@ -967,7 +978,9 @@ public static function createDirectMailRecordFromPage($pageUid, array $parameter
             'authcode_fieldList'    => $parameters['authcode_fieldList'],
             'sendOptions'            => $GLOBALS['TCA']['sys_dmail']['columns']['sendOptions']['config']['default'],
             'long_link_rdct_url'    => self::getUrlBase($parameters['use_domain']),
-            'sys_language_uid' => (int)$sysLanguageUid
+            'sys_language_uid' => (int)$sysLanguageUid,
+            'attachment' => '',
+            'mailContent' => ''
         );
 
         if ($newRecord['sys_language_uid'] > 0) {
@@ -977,7 +990,7 @@ public static function createDirectMailRecordFromPage($pageUid, array $parameter
         }
 
 
-            // If params set, set default values:
+        // If params set, set default values:
         $paramsToOverride = array('sendOptions', 'includeMedia', 'flowedFormat', 'HTMLParams', 'plainParams');
         foreach ($paramsToOverride as $param) {
             if (isset($parameters[$param])) {
@@ -1009,7 +1022,7 @@ public static function createDirectMailRecordFromPage($pageUid, array $parameter
             $newRecord['charset'] = self::getCharacterSetOfPage($pageRecord['uid']);
         }
 
-            // save to database
+        // save to database
         if ($newRecord['page'] && $newRecord['sendOptions']) {
             $tcemainData = array(
                 'sys_dmail' => array(
@@ -1043,7 +1056,7 @@ public static function getLanguageParam($sysLanguageUid, array $params)
 
             // fallback: L == sys_language_uid
         } else {
-            $param = "&L=" . $sysLanguageUid;
+            $param = '&L=' . $sysLanguageUid;
         }
 
         return $param;
@@ -1085,7 +1098,7 @@ public static function createDirectMailRecordFromExternalURL($subject, $external
         );
 
 
-            // If params set, set default values:
+        // If params set, set default values:
         $paramsToOverride = array('sendOptions', 'includeMedia', 'flowedFormat', 'HTMLParams', 'plainParams');
         foreach ($paramsToOverride as $param) {
             if (isset($parameters[$param])) {
@@ -1097,7 +1110,7 @@ public static function createDirectMailRecordFromExternalURL($subject, $external
         }
 
         $urlParts = @parse_url($externalUrlPlain);
-            // No plain text url
+        // No plain text url
         if (!$externalUrlPlain || $urlParts === false || !$urlParts['host']) {
             $newRecord['plainParams'] = '';
             $newRecord['sendOptions']&=254;
@@ -1105,7 +1118,7 @@ public static function createDirectMailRecordFromExternalURL($subject, $external
             $newRecord['plainParams'] = $externalUrlPlain;
         }
 
-            // No html url
+        // No html url
         $urlParts = @parse_url($externalUrlHtml);
         if (!$externalUrlHtml || $urlParts === false || !$urlParts['host']) {
             $newRecord['sendOptions']&=253;
@@ -1113,7 +1126,7 @@ public static function createDirectMailRecordFromExternalURL($subject, $external
             $newRecord['HTMLParams'] = $externalUrlHtml;
         }
 
-            // save to database
+        // save to database
         if ($newRecord['pid'] && $newRecord['sendOptions']) {
             $tcemainData = array(
                 'sys_dmail' => array(
@@ -1139,10 +1152,11 @@ public static function createDirectMailRecordFromExternalURL($subject, $external
      *
      * @param array $row Directmail DB record
      * @param array $params Any default parameters (usually the ones from pageTSconfig)
+     * @param bool $returnArray Return error or warning message as array instead of string
      *
      * @return string Error or warning message during fetching the content
      */
-    public static function fetchUrlContentsForDirectMailRecord(array $row, array $params)
+    public static function fetchUrlContentsForDirectMailRecord(array $row, array $params, $returnArray = false)
     {
         $theOutput = '';
         $errorMsg = array();
@@ -1152,10 +1166,10 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
         $htmlUrl = $urls['htmlUrl'];
         $urlBase = $urls['baseUrl'];
 
-            // Make sure long_link_rdct_url is consistent with use_domain.
+        // Make sure long_link_rdct_url is consistent with use_domain.
         $row['long_link_rdct_url'] = $urlBase;
 
-            // Compile the mail
+        // Compile the mail
         /* @var $htmlmail Dmailer */
         $htmlmail = GeneralUtility::makeInstance('DirectMailTeam\\DirectMail\\Dmailer');
         if ($params['enable_jump_url']) {
@@ -1179,20 +1193,20 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
         $htmlmail->includeMedia = $row['includeMedia'];
 
         if ($plainTextUrl) {
-            $mailContent = GeneralUtility::getURL(self::addUserPass($plainTextUrl, $params));
+            $mailContent = GeneralUtility::getURL(self::addUserPass($plainTextUrl, $params), 0, array('User-Agent: Direct Mail'));
             $htmlmail->addPlain($mailContent);
             if (!$mailContent || !$htmlmail->theParts['plain']['content']) {
-                $errorMsg[] = $GLOBALS["LANG"]->getLL('dmail_no_plain_content');
+                $errorMsg[] = $GLOBALS['LANG']->getLL('dmail_no_plain_content');
             } elseif (!strstr($htmlmail->theParts['plain']['content'], '<!--DMAILER_SECTION_BOUNDARY')) {
-                $warningMsg[] = $GLOBALS["LANG"]->getLL('dmail_no_plain_boundaries');
+                $warningMsg[] = $GLOBALS['LANG']->getLL('dmail_no_plain_boundaries');
             }
         }
 
-            // fetch the HTML url
+        // fetch the HTML url
         if ($htmlUrl) {
             // Username and password is added in htmlmail object
             $success = $htmlmail->addHTML(self::addUserPass($htmlUrl, $params));
-                // If type = 1, we have an external page.
+            // If type = 1, we have an external page.
             if ($row['type'] == 1) {
                 // Try to auto-detect the charset of the message
                 $matches = array();
@@ -1200,17 +1214,17 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
                 if ($res == 1) {
                     $htmlmail->charset = $matches[1];
                 } elseif (isset($params['direct_mail_charset'])) {
-                    $htmlmail->charset = $GLOBALS["LANG"]->csConvObj->parse_charset($params['direct_mail_charset']);
+                    $htmlmail->charset = $GLOBALS['LANG']->csConvObj->parse_charset($params['direct_mail_charset']);
                 } else {
                     $htmlmail->charset = 'iso-8859-1';
                 }
             }
             if ($htmlmail->extractFramesInfo()) {
-                $errorMsg[] = $GLOBALS["LANG"]->getLL('dmail_frames_not allowed');
+                $errorMsg[] = $GLOBALS['LANG']->getLL('dmail_frames_not allowed');
             } elseif (!$success || !$htmlmail->theParts['html']['content']) {
-                $errorMsg[] = $GLOBALS["LANG"]->getLL('dmail_no_html_content');
+                $errorMsg[] = $GLOBALS['LANG']->getLL('dmail_no_html_content');
             } elseif (!strstr($htmlmail->theParts['html']['content'], '<!--DMAILER_SECTION_BOUNDARY')) {
-                $warningMsg[] = $GLOBALS["LANG"]->getLL('dmail_no_html_boundaries');
+                $warningMsg[] = $GLOBALS['LANG']->getLL('dmail_no_html_boundaries');
             }
         }
 
@@ -1218,6 +1232,10 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
             // Update the record:
             $htmlmail->theParts['messageid'] = $htmlmail->messageid;
             $mailContent = base64_encode(serialize($htmlmail->theParts));
+
+            // !ian save last dmail source in tmp for debug
+            file_put_contents('/tmp/dmail.php', var_export($htmlmail->theParts, true));
+
             $updateData = array(
                 'issent'             => 0,
                 'charset'            => $htmlmail->charset,
@@ -1233,24 +1251,29 @@ public static function fetchUrlContentsForDirectMailRecord(array $row, array $pa
 
             if (count($warningMsg)) {
                 /* @var $flashMessage FlashMessage */
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     implode('<br />', $warningMsg),
                     $GLOBALS['LANG']->getLL('dmail_warning'),
                     FlashMessage::WARNING
                 );
-                $theOutput .= $flashMessage->render();
+                $theOutput .= GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
             }
         } else {
             /* @var $flashMessage FlashMessage */
-            $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+            $flashMessage = GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                 implode('<br />', $errorMsg),
                 $GLOBALS['LANG']->getLL('dmail_error'),
                 FlashMessage::ERROR
             );
-            $theOutput .= $flashMessage->render();
+            $theOutput .= GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
+        }
+        if ($returnArray) {
+            return array('errors' => $errorMsg, 'warnings' => $warningMsg);
+        } else {
+            return $theOutput;
         }
-
-        return $theOutput;
     }
 
 
@@ -1271,6 +1294,9 @@ protected static function addUserPass($url, array $params)
         if ($user && $pass && substr($url, 0, 7) == 'http://') {
             $url = 'http://' . $user . ':' . $pass . '@' . substr($url, 7);
         }
+        if ($user && $pass && substr($url, 0, 8) == 'https://') {
+            $url = 'https://' . $user . ':' . $pass . '@' . substr($url, 8);
+        }
         if ($params['simulate_usergroup'] && MathUtility::canBeInterpretedAsInteger($params['simulate_usergroup'])) {
             $url = $url . '&dmail_fe_group=' . (int)$params['simulate_usergroup'] . '&access_token=' . self::createAndGetAccessToken();
         }
@@ -1328,7 +1354,7 @@ public static function getFullUrlsForDirectMailRecord(array $row)
             'plainTextUrl' => ''
         );
 
-            // Finding the url to fetch content from
+        // Finding the url to fetch content from
         switch ((string) $row['type']) {
             case 1:
                 $result['htmlUrl'] = $row['HTMLParams'];
@@ -1339,7 +1365,7 @@ public static function getFullUrlsForDirectMailRecord(array $row)
                 $result['plainTextUrl'] = $result['baseUrl'] . '?id=' . $row['page'] . $row['plainParams'];
         }
 
-            // plain
+        // plain
         if ($result['plainTextUrl']) {
             if (!($row['sendOptions']&1)) {
                 $result['plainTextUrl'] = '';
@@ -1350,7 +1376,7 @@ public static function getFullUrlsForDirectMailRecord(array $row)
                 }
             }
         }
-            // html
+        // html
         if ($result['htmlUrl']) {
             if (!($row['sendOptions']&2)) {
                 $result['htmlUrl'] = '';
@@ -1560,4 +1586,44 @@ public static function implodeTSParams(array $p, $k = '')
         }
         return $implodeParams;
     }
+
+    /**
+     * Takes a clear-text message body for a plain text email, finds all 'http://' links and if they are longer than 76 chars they are converted to a shorter URL with a hash parameter. The real parameter is stored in the database and the hash-parameter/URL will be redirected to the real parameter when the link is clicked.
+     * This function is about preserving long links in messages.
+     *
+     * @param string $message Message content
+     * @param string $urlmode URL mode; "76" or "all
+     * @param string $index_script_url URL of index script (see makeRedirectUrl())
+     * @return string Processed message content
+     * @see makeRedirectUrl()
+     * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8. Use mailer API instead
+     */
+    public static function substUrlsInPlainText($message, $urlmode = '76', $index_script_url = '')
+    {
+        switch ((string)$urlmode) {
+            case '':
+                $lengthLimit = false;
+                break;
+            case 'all':
+                $lengthLimit = 0;
+                break;
+            case '76':
+
+            default:
+                $lengthLimit = (int)$urlmode;
+        }
+        if ($lengthLimit === false) {
+            // No processing
+            $messageSubstituted = $message;
+        } else {
+            $messageSubstituted = preg_replace_callback(
+                '/(http|https):\\/\\/.+(?=[\\]\\.\\?]*([\\! \'"()<>]+|$))/iU',
+                function (array $matches) use ($lengthLimit, $index_script_url) {
+                    return GeneralUtility::makeRedirectUrl($matches[0], $lengthLimit, $index_script_url);
+                },
+                $message
+            );
+        }
+        return $messageSubstituted;
+    }
 }
diff --git a/Classes/Dmailer.php b/Classes/Dmailer.php
index 040e30322..6f55c7398 100755
--- a/Classes/Dmailer.php
+++ b/Classes/Dmailer.php
@@ -15,7 +15,7 @@
  */
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Html\HtmlParser;
+use TYPO3\CMS\Core\Service\MarkerBasedTemplateService;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 
@@ -112,6 +112,11 @@ class Dmailer
      */
     public $simulateUsergroup;
 
+    /**
+     * @var MarkerBasedTemplateService
+     */
+    protected $templateService;
+
     /**
      * Preparing the Email. Headers are set in global variables
      *
@@ -129,7 +134,7 @@ public function dmailer_prepare(array $row)
         }
         if ($row['charset']) {
             if ($row['type'] == 0) {
-                $this->charset = "utf-8";
+                $this->charset = 'utf-8';
             } else {
                 $this->charset = $row['charset'];
             }
@@ -165,12 +170,12 @@ public function dmailer_prepare(array $row)
         foreach ($this->dmailer['boundaryParts_html'] as $bKey => $bContent) {
             $this->dmailer['boundaryParts_html'][$bKey] = explode('-->', $bContent, 2);
 
-                // Remove useless HTML comments
+            // Remove useless HTML comments
             if (substr($this->dmailer['boundaryParts_html'][$bKey][0], 1) == 'END') {
                 $this->dmailer['boundaryParts_html'][$bKey][1] = $this->removeHTMLComments($this->dmailer['boundaryParts_html'][$bKey][1]);
             }
 
-                // Now, analyzing which media files are used in this part of the mail:
+            // Now, analyzing which media files are used in this part of the mail:
             $mediaParts = explode('cid:part', $this->dmailer['boundaryParts_html'][$bKey][1]);
             reset($mediaParts);
             next($mediaParts);
@@ -227,14 +232,14 @@ public function replaceMailMarkers($content, array $recipRow, array $markers)
             $markers['###USER_' . $substField . '###'] = $subst;
         }
 
-            // uppercase fields with uppercased values
+        // uppercase fields with uppercased values
         $uppercaseFieldsArray = array('name', 'firstname');
         foreach ($uppercaseFieldsArray as $substField) {
             $subst = $this->getLanguageService()->csConvObj->conv($recipRow[$substField], $this->getLanguageService()->charSet, $this->charset);
             $markers['###USER_' . strtoupper($substField) . '###'] = strtoupper($subst);
         }
 
-            // Hook allows to manipulate the markers to add salutation etc.
+        // Hook allows to manipulate the markers to add salutation etc.
         if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/direct_mail']['res/scripts/class.dmailer.php']['mailMarkersHook'])) {
             $mailMarkersHook =& $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/direct_mail']['res/scripts/class.dmailer.php']['mailMarkersHook'];
             if (is_array($mailMarkersHook)) {
@@ -249,7 +254,9 @@ public function replaceMailMarkers($content, array $recipRow, array $markers)
             }
         }
 
-        return HtmlParser::substituteMarkerArray($content, $markers);
+        // initialize Marker Support
+        $this->templateService = GeneralUtility::makeInstance(MarkerBasedTemplateService::class);
+        return $this->templateService->substituteMarkerArray($content, $markers);
     }
 
 
@@ -303,14 +310,14 @@ public function dmailer_sendAdvanced(array $recipRow, $tableNameChar)
                 }
             }
 
-                // Plain
+            // Plain
             $this->theParts['plain']['content'] = '';
             if ($this->flag_plain) {
                 $tempContent_Plain = $this->dmailer_getBoundaryParts($this->dmailer['boundaryParts_plain'], $recipRow['sys_dmail_categories_list']);
                 if ($this->mailHasContent) {
                     $tempContent_Plain = $this->replaceMailMarkers($tempContent_Plain, $recipRow, $additionalMarkers);
                     if (trim($this->dmailer['sys_dmail_rec']['use_rdct']) || trim($this->dmailer['sys_dmail_rec']['long_link_mode'])) {
-                        $tempContent_Plain = GeneralUtility::substUrlsInPlainText($tempContent_Plain, $this->dmailer['sys_dmail_rec']['long_link_mode']?'all':'76', $this->dmailer['sys_dmail_rec']['long_link_rdct_url']);
+                        $tempContent_Plain = DirectMailUtility::substUrlsInPlainText($tempContent_Plain, $this->dmailer['sys_dmail_rec']['long_link_mode']?'all':'76', $this->dmailer['sys_dmail_rec']['long_link_rdct_url']);
                     }
                     $this->theParts['plain']['content'] = $this->encodeMsg($tempContent_Plain);
                     $returnCode|=2;
@@ -365,7 +372,7 @@ public function dmailer_sendSimple($addressList)
             $this->theParts['plain']['content'] = '';
         }
 
-        $recipients = explode(",", $addressList);
+        $recipients = explode(',', $addressList);
         foreach ($recipients as $recipient) {
             $this->sendTheMail($recipient);
         }
@@ -401,7 +408,7 @@ public function dmailer_getBoundaryParts($cArray, $userCategories)
             } elseif ($key == 'END') {
                 $returnVal .= $cP[1];
                 $this->mediaList .= $cP['mediaList'];
-                    // There is content and it is not just the header and footer content, or it is the only content because we have no direct mail boundaries.
+                // There is content and it is not just the header and footer content, or it is the only content because we have no direct mail boundaries.
                 if (($cP[1] && !($bKey == 0 || $bKey == $boundaryMax)) || count($cArray) == 1) {
                     $this->mailHasContent = true;
                 }
@@ -472,7 +479,7 @@ public function dmailer_masssend_list(array $query_info, $mid)
             foreach ($query_info['id_lists'] as $table => $listArr) {
                 if (is_array($listArr)) {
                     $ct = 0;
-                        // Find tKey
+                    // Find tKey
                     if ($table=='tt_address' || $table=='fe_users') {
                         $tKey = substr($table, 0, 1);
                     } elseif ($table=='PLAINLIST') {
@@ -481,7 +488,7 @@ public function dmailer_masssend_list(array $query_info, $mid)
                         $tKey='u';
                     }
 
-                        // Send mails
+                    // Send mails
                     $sendIds = $this->dmailer_getSentMails($mid, $tKey);
                     if ($table == 'PLAINLIST') {
                         $sendIdsArr = explode(',', $sendIds);
@@ -520,7 +527,7 @@ public function dmailer_masssend_list(array $query_info, $mid)
                                     $returnVal = false;
                                     break;
                                 }
-                                    // We are NOT finished!
+                                // We are NOT finished!
                                 $this->shipOfMail($mid, $recipRow, $tKey);
                                 $ct++;
                                 $c++;
@@ -603,7 +610,7 @@ public static function convertFields(array $recipRow)
             $recipRow['phone'] = $recipRow['telephone'];
         }
 
-            // Firstname must be more that 1 character
+        // Firstname must be more that 1 character
         $recipRow['firstname'] = trim(strtok(trim($recipRow['name']), ' '));
         if (strlen($recipRow['firstname']) < 2 || preg_match('|[^[:alnum:]]$|', $recipRow['firstname'])) {
             $recipRow['firstname'] = $recipRow['name'];
@@ -636,11 +643,11 @@ public function dmailer_setBeginEnd($mid, $key)
         switch ($key) {
             case 'begin':
                 $subject = $this->getLanguageService()->getLL('dmailer_mid') . ' ' . $mid . ' ' . $this->getLanguageService()->getLL('dmailer_job_begin');
-                $message = $this->getLanguageService()->getLL('dmailer_job_begin') . ': ' . date("d-m-y h:i:s");
+                $message = $this->getLanguageService()->getLL('dmailer_job_begin') . ': ' . date('d-m-y h:i:s');
                 break;
             case 'end':
                 $subject = $this->getLanguageService()->getLL('dmailer_mid') . ' ' . $mid . ' ' . $this->getLanguageService()->getLL('dmailer_job_end');
-                $message = $this->getLanguageService()->getLL('dmailer_job_end') . ': ' . date("d-m-y h:i:s");
+                $message = $this->getLanguageService()->getLL('dmailer_job_end') . ': ' . date('d-m-y h:i:s');
                 break;
             default:
                 // do nothing
@@ -869,7 +876,7 @@ public function start($user_dmailer_sendPerCycle = 50, $user_dmailer_lang = 'en'
             $this->linebreak = CRLF;
         }
 
-            // Mailer engine parameters
+        // Mailer engine parameters
         $this->sendPerCycle = $user_dmailer_sendPerCycle;
         $this->user_dmailerLang = $user_dmailer_lang;
         if (!$this->nonCron) {
@@ -940,9 +947,9 @@ public function setContent(&$mailer)
         // set the attachment from $this->dmailer['sys_dmail_rec']['attachment']
         // comma separated files
         if (!empty($this->dmailer['sys_dmail_rec']['attachment'])) {
-            $files = explode(",", $this->dmailer['sys_dmail_rec']['attachment']);
+            $files = explode(',', $this->dmailer['sys_dmail_rec']['attachment']);
             foreach ($files as $file) {
-                $mailer->attach(\Swift_Attachment::fromPath(PATH_site . "uploads/tx_directmail/" . $file));
+                $mailer->attach(\Swift_Attachment::fromPath(PATH_site . 'uploads/tx_directmail/' . $file));
             }
         }
     }
@@ -979,7 +986,7 @@ public function sendTheMail($recipient, $recipRow = null)
             $header->addTextHeader('Organization', $this->organisation);
         }
         
-            // Hook to edit or add the mail headers
+        // Hook to edit or add the mail headers
         if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/direct_mail']['res/scripts/class.dmailer.php']['mailHeadersHook'])) {
             $mailHeadersHook =& $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/direct_mail']['res/scripts/class.dmailer.php']['mailHeadersHook'];
             if (is_array($mailHeadersHook)) {
@@ -1046,11 +1053,11 @@ public function addHTML($file)
             return false;
         }
         if ($this->extractFramesInfo()) {
-            return "Document was a frameset. Stopped";
+            return 'Document was a frameset. Stopped';
         }
         $this->extractHyperLinks();
         $this->substHREFsInHTML();
-        $this->setHTML($this->encodeMsg($this->theParts["html"]["content"]));
+        $this->setHTML($this->encodeMsg($this->theParts['html']['content']));
         return true;
     }
 
@@ -1152,7 +1159,8 @@ public function substHREFsInHTML()
             $this->theParts['html']['content'] = str_replace(
                 $val['subst_str'],
                 $val['quotes'] . $substVal . $val['quotes'],
-                $this->theParts['html']['content']);
+                $this->theParts['html']['content']
+            );
         }
     }
 
@@ -1204,7 +1212,7 @@ public function substHTTPurlsInPlainText($content)
             return $content;
         }
 
-        $textpieces = explode("http://", $content);
+        $textpieces = explode('http://', $content);
         $pieces = count($textpieces);
         $textstr = $textpieces[0];
         for ($i = 1; $i < $pieces; $i++) {
@@ -1216,7 +1224,7 @@ public function substHTTPurlsInPlainText($content)
                 }
 
                 $parts = array();
-                $parts[0] = "http://" . substr($textpieces[$i], 0, $len);
+                $parts[0] = 'http://' . substr($textpieces[$i], 0, $len);
                 $parts[1] = substr($textpieces[$i], $len);
 
                 if (strpos($parts[0], '&no_jumpurl=1') !== false) {
@@ -1318,8 +1326,8 @@ public function extractMediaLinks()
                 $imageData['quotes'] = (substr($codepieces[$i], strpos($codepieces[$i], $imageData['ref']) - 1, 1) == '"') ? '"' : '';
                 // subst_str is the string to look for, when substituting lateron
                 $imageData['subst_str'] = $imageData['quotes'] . $imageData['ref'] . $imageData['quotes'];
-                if ($imageData['ref'] && !strstr($imageList, "|" . $imageData["subst_str"] . "|")) {
-                    $imageList .= "|" . $imageData['subst_str'] . "|";
+                if ($imageData['ref'] && !strstr($imageList, '|' . $imageData['subst_str'] . '|')) {
+                    $imageList .= '|' . $imageData['subst_str'] . '|';
                     $imageData['absRef'] = $this->absRef($imageData['ref']);
                     $imageData['tag'] = $tag;
                     $imageData['use_jumpurl'] = $attributes['dmailerping'] ? 1 : 0;
@@ -1346,9 +1354,9 @@ public function extractMediaLinks()
                 $imageData['quotes'] = (substr($codepieces[$i], strpos($codepieces[$i], $imageData['ref']) - 1, 1) == '"') ? '"' : '';
                 // subst_str is the string to look for, when substituting lateron
                 $imageData['subst_str'] = $imageData['quotes'] . $imageData['ref'] . $imageData['quotes'];
-                if ($imageData['ref'] && !strstr($imageList, "|" . $imageData["subst_str"] . "|")) {
-                    $imageList .= "|" . $imageData["subst_str"] . "|";
-                    $imageData['absRef'] = $this->absRef($imageData["ref"]);
+                if ($imageData['ref'] && !strstr($imageList, '|' . $imageData['subst_str'] . '|')) {
+                    $imageList .= '|' . $imageData['subst_str'] . '|';
+                    $imageData['absRef'] = $this->absRef($imageData['ref']);
                     $this->theParts['html']['media'][] = $imageData;
                 }
             }
@@ -1374,8 +1382,8 @@ public function extractMediaLinks()
                 case 'jpeg':
                     // do like jpg
                 case 'jpg':
-                    if ($imageData['ref'] && !strstr($imageList, "|" . $imageData["subst_str"] . "|")) {
-                        $imageList .= "|" . $imageData['subst_str'] . "|";
+                    if ($imageData['ref'] && !strstr($imageList, '|' . $imageData['subst_str'] . '|')) {
+                        $imageList .= '|' . $imageData['subst_str'] . '|';
                         $imageData['absRef'] = $this->absRef($imageData['ref']);
                         $this->theParts['html']['media'][] = $imageData;
                     }
@@ -1403,24 +1411,26 @@ public function extractHyperLinks()
         $len = strlen($codepieces[0]);
         $pieces = count($codepieces);
         for ($i = 1; $i < $pieces; $i++) {
-            $tag = strtolower(strtok(substr($htmlContent, $len + 1, 10), " "));
+            $tag = strtolower(strtok(substr($htmlContent, $len + 1, 10), ' '));
             $len += strlen($tag) + strlen($codepieces[$i]) + 2;
 
             $dummy = preg_match('/[^>]*/', $codepieces[$i], $reg);
             // Fetches the attributes for the tag
-            $attributes = $this->get_tag_attributes($reg[0]);
+            $attributes = $this->get_tag_attributes($reg[0], false);
             $hrefData = array();
             $hrefData['ref'] = $attributes['href'] ?: $attributes['action'];
+            $quotes = (substr($hrefData['ref'], 0, 1) === '"') ? '"' : '';
+            $hrefData['ref'] = trim($hrefData['ref'], '"');
             if ($hrefData['ref']) {
                 // Finds out if the value had quotes around it
-                $hrefData['quotes'] = (substr($codepieces[$i], strpos($codepieces[$i], $hrefData["ref"]) - 1, 1) == '"') ? '"' : '';
-                // subst_str is the string to look for, when substituting lateron
-                $hrefData['subst_str'] = $hrefData['quotes'] . $hrefData['ref'] . $hrefData['quotes'];
-                if ($hrefData['ref'] && substr(trim($hrefData['ref']), 0, 1) != "#" && !strstr($linkList, "|" . $hrefData['subst_str'] . "|")) {
-                    $linkList .= "|" . $hrefData['subst_str'] . "|";
+                $hrefData['quotes'] = $quotes;
+                // subst_str is the string to look for when substituting later on
+                $hrefData['subst_str'] = $quotes . $hrefData['ref'] . $quotes;
+                if ($hrefData['ref'] && substr(trim($hrefData['ref']), 0, 1) != '#' && !strstr($linkList, '|' . $hrefData['subst_str'] . '|')) {
+                    $linkList .= '|' . $hrefData['subst_str'] . '|';
                     $hrefData['absRef'] = $this->absRef($hrefData['ref']);
                     $hrefData['tag'] = $tag;
-                    $hrefData['no_jumpurl'] = intval($attributes['no_jumpurl']) ? 1 : 0;
+                    $hrefData['no_jumpurl'] = intval(trim($attributes['no_jumpurl'], '"')) ? 1 : 0;
                     $this->theParts['html']['hrefs'][] = $hrefData;
                 }
             }
@@ -1435,8 +1445,8 @@ public function extractHyperLinks()
                 $hrefData['quotes'] = "'";
                 // subst_str is the string to look for, when substituting lateron
                 $hrefData['subst_str'] = $hrefData['quotes'] . $hrefData['ref'] . $hrefData['quotes'];
-                if ($hrefData['ref'] && !strstr($linkList, "|" . $hrefData['subst_str'] . "|")) {
-                    $linkList .= "|" . $hrefData['subst_str'] . "|";
+                if ($hrefData['ref'] && !strstr($linkList, '|' . $hrefData['subst_str'] . '|')) {
+                    $linkList .= '|' . $hrefData['subst_str'] . '|';
                     $hrefData['absRef'] = $this->absRef($hrefData['ref']);
                     $this->theParts['html']['hrefs'][] = $hrefData;
                 }
@@ -1509,10 +1519,11 @@ public function tag_regex($tags)
      *
      * @param string $tag Tag is either like this "<TAG OPTION ATTRIB=VALUE>" or
      *				 this " OPTION ATTRIB=VALUE>" which means you can omit the tag-name
+     * @param boolean $removeQuotes When TRUE (default) quotes around a value will get removed
      *
      * @return array array with attributes as keys in lower-case
      */
-    public function get_tag_attributes($tag)
+    public function get_tag_attributes($tag, $removeQuotes = true)
     {
         $attributes = array();
         $tag = ltrim(preg_replace('/^<[^ ]*/', '', trim($tag)));
@@ -1525,9 +1536,9 @@ public function get_tag_attributes($tag)
             $attrib = $reg[0];
 
             $tag = ltrim(substr($tag, strlen($attrib), $tagLen));
-            if (substr($tag, 0, 1) == '=') {
+            if (substr($tag, 0, 1) === '=') {
                 $tag = ltrim(substr($tag, 1, $tagLen));
-                if (substr($tag, 0, 1) == '"') {
+                if (substr($tag, 0, 1) === '"' && $removeQuotes) {
                     // Quotes around the value
                     $reg = explode('"', substr($tag, 1, $tagLen), 2);
                     $tag = ltrim($reg[1]);
@@ -1537,7 +1548,7 @@ public function get_tag_attributes($tag)
                     preg_match('/^([^[:space:]>]*)(.*)/', $tag, $reg);
                     $value = trim($reg[1]);
                     $tag = ltrim($reg[2]);
-                    if (substr($tag, 0, 1) == '>') {
+                    if (substr($tag, 0, 1) === '>') {
                         $tag = '';
                     }
                 }
@@ -1573,7 +1584,7 @@ public function absRef($ref)
         } else {
             // If the reference is relative, the path is added,
             // in order for us to fetch the content
-            if (substr($this->theParts['html']['path'], -1) == "/") {
+            if (substr($this->theParts['html']['path'], -1) == '/') {
                 // if the last char is a /, then prepend the ref
                 $ref = $this->theParts['html']['path'] . $ref;
             } else {
diff --git a/Classes/Hooks/JumpurlController.php b/Classes/Hooks/JumpurlController.php
index e012d3e75..60e68da76 100644
--- a/Classes/Hooks/JumpurlController.php
+++ b/Classes/Hooks/JumpurlController.php
@@ -125,7 +125,6 @@ public function preprocessRequest($parameter, $parentObject)
                                     $_POST['pass'] = $recipRow['password'];
                                     $_POST['pid']  = $recipRow['pid'];
                                     $_POST['logintype'] = 'login';
-                                    $GLOBALS['TSFE']->initFEuser();
                                 }
                             } else {
                                 throw new \Exception('authCode: Calculated authCode did not match the submitted authCode.', 1376899631);
@@ -144,14 +143,14 @@ public function preprocessRequest($parameter, $parentObject)
                 }
             } else {
                 // jumpUrl is not an integer -- then this is a URL, that means that the "dmailerping"
-                    // functionality was used to count the number of "opened mails" received (url, dmailerping)
+                // functionality was used to count the number of "opened mails" received (url, dmailerping)
 
-                    // Check if jumpurl is a valid link to a "dmailerping.gif"
-                    // Make $checkPath an absolute path pointing to dmailerping.gif so it can get checked via ::isAllowedAbsPath()
-                    // and remove an eventual "/" at beginning of $jumpurl (because PATH_site already contains "/" at the end)
+                // Check if jumpurl is a valid link to a "dmailerping.gif"
+                // Make $checkPath an absolute path pointing to dmailerping.gif so it can get checked via ::isAllowedAbsPath()
+                // and remove an eventual "/" at beginning of $jumpurl (because PATH_site already contains "/" at the end)
                 $checkPath = PATH_site . preg_replace('#^/#', '', $jumpurl);
 
-                    // Now check if $checkPath is a valid path and points to a "/dmailerping.gif"
+                // Now check if $checkPath is a valid path and points to a "/dmailerping.gif"
                 if (preg_match('#/dmailerping\\.(gif|png)$#', $checkPath) && GeneralUtility::isAllowedAbsPath($checkPath)) {
                     // set juHash as done for external_url in core: http://forge.typo3.org/issues/46071
                     GeneralUtility::_GETset(GeneralUtility::hmac($jumpurl, 'jumpurl'), 'juHash');
diff --git a/Classes/Hooks/TtnewsPlaintextHook.php b/Classes/Hooks/TtnewsPlaintextHook.php
index 55efcb517..d79c300e8 100644
--- a/Classes/Hooks/TtnewsPlaintextHook.php
+++ b/Classes/Hooks/TtnewsPlaintextHook.php
@@ -107,7 +107,7 @@ public function extraCodesProcessor(&$invokingObj)
                 );
             $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
             $GLOBALS['TYPO3_DB']->sql_free_result($res);
-                // get the translated record if the content language is not the default language
+            // get the translated record if the content language is not the default language
             if ($GLOBALS['TSFE']->sys_language_content) {
                 $OLmode = ($this->sys_language_mode == 'strict'?'hideNonTranslated':'');
                 $row = $GLOBALS['TSFE']->sys_page->getRecordOverlay('tt_news', $row, $GLOBALS['TSFE']->sys_language_content, $OLmode);
@@ -116,19 +116,19 @@ public function extraCodesProcessor(&$invokingObj)
                 // Render the title
                 $lines[] = $this->renderPlainText->renderHeader($row['title']);
 
-                    // Render author of the tt_news record
+                // Render author of the tt_news record
                 $lines[] = $this->renderAuthor($row);
 
-                    // Render the short version of the tt_news record
+                // Render the short version of the tt_news record
                 $lines[] = $this->renderPlainText->breakContent(strip_tags($this->renderPlainText->parseBody($row['short'], 'tt_news_short')));
 
-                    // Render the main text of the tt_news record
+                // Render the main text of the tt_news record
                 $lines[] = $this->renderPlainText->breakContent(strip_tags($this->renderPlainText->parseBody($row['bodytext'], 'tt_news_bodytext')));
 
-                    // Render the images of the tt_news record.
+                // Render the images of the tt_news record.
                 $lines[] = $this->getImages($row);
 
-                    // Render the downloads of the tt_news record.
+                // Render the downloads of the tt_news record.
                 $lines[] = $this->renderPlainText->renderUploads($row['news_files']);
             } elseif ($this->sys_language_mode == 'strict' && $this->tt_news_uid) {
                 $noTranslMsg = $this->cObj->stdWrap($invokingObj->pi_getLL('noTranslMsg', 'Sorry, there is no translation for this news-article'), $this->conf['noNewsIdMsg_stdWrap.']);
@@ -139,7 +139,7 @@ public function extraCodesProcessor(&$invokingObj)
                 $content = implode(LF, $lines).$content;
             }
 
-                // Substitute labels
+            // Substitute labels
             if (!empty($content)) {
                 $markerArray = array();
                 $markerArray = $this->renderPlainText->addLabelsMarkers($markerArray);
@@ -223,6 +223,6 @@ public function renderAuthor($row, $type=0)
                 return implode(LF, $lines);
             }
         }
-        return "";
+        return '';
     }
 }
diff --git a/Classes/Hooks/TypoScriptFrontendController.php b/Classes/Hooks/TypoScriptFrontendController.php
index 97f1964c7..563fe2318 100644
--- a/Classes/Hooks/TypoScriptFrontendController.php
+++ b/Classes/Hooks/TypoScriptFrontendController.php
@@ -42,7 +42,7 @@ public function simulateUsergroup($parameters, \TYPO3\CMS\Frontend\Controller\Ty
         $accessToken = GeneralUtility::_GET('access_token');
         if ($directMailFeGroup > 0 && DirectMailUtility::validateAndRemoveAccessToken($accessToken)) {
             if ($typoScriptFrontendController->fe_user->user) {
-                $typoScriptFrontendController->fe_user->user[$this->$typoScriptFrontendController->usergroup_column] = $directMailFeGroup;
+                $typoScriptFrontendController->fe_user->user[$typoScriptFrontendController->usergroup_column] = $directMailFeGroup;
             } else {
                 $typoScriptFrontendController->fe_user->user = array(
                     $typoScriptFrontendController->fe_user->usergroup_column => $directMailFeGroup
diff --git a/Classes/Importer.php b/Classes/Importer.php
index a4f3ecd2e..58d6fc09c 100644
--- a/Classes/Importer.php
+++ b/Classes/Importer.php
@@ -18,6 +18,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\File\BasicFileUtility;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Resource\DuplicationBehavior;
 
 /**
  * Recipient list module for tx_directmail extension
@@ -102,10 +103,10 @@ public function cmd_displayImport()
         // merge it with inData, but inData has priority.
         $this->indata = $this->indata + $this->params;
 
-//		$currentFileInfo = BasicFileUtility::getTotalFileInfo($this->indata['newFile']);
-//		$currentFileName = $currentFileInfo['file'];
-//		$currentFileSize = GeneralUtility::formatSize($currentFileInfo['size']);
-//		$currentFileMessage = $currentFileName . ' (' . $currentFileSize . ')';
+        //		$currentFileInfo = BasicFileUtility::getTotalFileInfo($this->indata['newFile']);
+        //		$currentFileName = $currentFileInfo['file'];
+        //		$currentFileSize = GeneralUtility::formatSize($currentFileInfo['size']);
+        //		$currentFileMessage = $currentFileName . ' (' . $currentFileSize . ')';
 
         if (empty($this->indata['csv']) && !empty($_FILES['upload_1']['name'])) {
             $this->indata['newFile'] = $this->checkUpload();
@@ -156,7 +157,7 @@ public function cmd_displayImport()
             }
         }
 
-        $out = "";
+        $out = '';
         switch ($stepCurrent) {
             case 'conf':
                 // get list of sysfolder
@@ -646,7 +647,7 @@ public function doImport(array $csvData)
             $mappedCSV = $filteredCSV['clean'];
         }
 
-            // array for the process_datamap();
+        // array for the process_datamap();
         $data = array();
         if ($this->indata['update_unique']) {
             $user = array();
@@ -805,7 +806,7 @@ public function makeDropdown($name, array $option, $selected, $disableInput='')
      *
      * @return	string		HTML code
      */
-    public function makeHidden($name, $value="")
+    public function makeHidden($name, $value='')
     {
         if (is_array($name)) {
             $hiddenFields = array();
@@ -830,7 +831,7 @@ public function readCSV()
     {
         ini_set('auto_detect_line_endings', true);
         $mydata = array();
-        $handle = fopen($this->indata['newFile'], "r");
+        $handle = fopen($this->indata['newFile'], 'r');
         $delimiter = $this->indata['delimiter'];
         $encaps = $this->indata['encapsulation'];
         $delimiter = ($delimiter === 'comma') ? ',' : $delimiter;
@@ -869,7 +870,7 @@ public function readExampleCSV($records=3)
         if (!is_file($this->indata['newFile']) && (strpos($this->indata['newFile'], PATH_site) === false)) {
             $this->indata['newFile'] = PATH_site . $this->indata['newFile'];
         }
-        $handle = fopen($this->indata['newFile'], "r");
+        $handle = fopen($this->indata['newFile'], 'r');
         $i = 0;
         $delimiter = $this->indata['delimiter'];
         $encaps = $this->indata['encapsulation'];
@@ -936,7 +937,7 @@ public function formatTable(array $tableLines, array $cellParams, $header, array
             $rowA = array();
             for ($k = 0; $k < count($r); $k++) {
                 $v = $r[$k];
-                $v = strlen($v) ? ($cellcmd[$k]?$v:htmlspecialchars($v)) : "&nbsp;";
+                $v = strlen($v) ? ($cellcmd[$k]?$v:htmlspecialchars($v)) : '&nbsp;';
                 if ($first) {
                     $v = '<B>' . $v . '</B>';
                 }
@@ -967,7 +968,9 @@ public function formatTable(array $tableLines, array $cellParams, $header, array
      */
     public function userTempFolder()
     {
-        return $tempFolder = 'fileadmin/_temp_/';
+        /** @var \TYPO3\CMS\Core\Resource\Folder $folder */
+        $folder = $GLOBALS['BE_USER']->getDefaultUploadTemporaryFolder();
+        return $folder->getPublicUrl();
     }
 
     /**
@@ -977,7 +980,7 @@ public function userTempFolder()
      */
     public function writeTempFile()
     {
-        $newfile = "";
+        $newfile = '';
         $userPermissions = $GLOBALS['BE_USER']->getFilePermissions();
 
         unset($this->fileProcessor);
@@ -992,7 +995,9 @@ public function writeTempFile()
         // Initializing:
         /* @var $fileProcessor \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility */
         $this->fileProcessor = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Utility\\File\\ExtendedFileUtility');
-        $this->fileProcessor->init($GLOBALS['FILEMOUNTS'], $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
+        if (version_compare(TYPO3_branch, '8.3', '<')) {
+            $this->fileProcessor->init($GLOBALS['FILEMOUNTS'], $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
+        }
         $this->fileProcessor->setActionPermissions($userPermissions);
         $this->fileProcessor->dontCheckForUnique = 1;
 
@@ -1061,7 +1066,9 @@ public function checkUpload()
         // Initializing:
         /* @var $fileProcessor \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility */
         $this->fileProcessor = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Utility\\File\\ExtendedFileUtility');
-        $this->fileProcessor->init($fm, $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
+        if (version_compare(TYPO3_branch, '8.3', '<')) {
+            $this->fileProcessor->init($fm, $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
+        }
         $this->fileProcessor->setActionPermissions();
         $this->fileProcessor->dontCheckForUnique = 1;
 
@@ -1073,6 +1080,7 @@ public function checkUpload()
             $this->fileProcessor->writeLog(0, 2, 1, 'Referer host "%s" and server host "%s" did not match!', array($refInfo['host'], $httpHost));
         } else {
             $this->fileProcessor->start($file);
+            $this->fileProcessor->setExistingFilesConflictMode(DuplicationBehavior::cast(DuplicationBehavior::REPLACE));
             $newfile = $this->fileProcessor->func_upload($file['upload']['1']);
         }
         return $newfile;
diff --git a/Classes/MailSelect.php b/Classes/MailSelect.php
index b41aa50bf..51fe4e220 100644
--- a/Classes/MailSelect.php
+++ b/Classes/MailSelect.php
@@ -27,7 +27,6 @@
  */
 class MailSelect extends QueryGenerator
 {
-
     public $allowedTables = array('tt_address','fe_users');
 
     /**
@@ -43,11 +42,11 @@ public function mkTableSelect($name, $cur)
     {
         $out = '<select name="' . $name . '" onChange="submit();">';
         $out .= '<option value=""></option>';
-        reset($GLOBALS["TCA"]);
-        foreach ($GLOBALS["TCA"] as $tN => $_) {
-            if ($GLOBALS["BE_USER"]->check('tables_select', $tN) && in_array($tN, $this->allowedTables)) {
+        reset($GLOBALS['TCA']);
+        foreach ($GLOBALS['TCA'] as $tN => $_) {
+            if ($GLOBALS['BE_USER']->check('tables_select', $tN) && in_array($tN, $this->allowedTables)) {
                 $out .='<option value="' . $tN . '"' . ($tN == $cur ? ' selected':'') . '>' .
-                    $GLOBALS["LANG"]->sl($GLOBALS["TCA"][$tN]['ctrl']['title']) .
+                    $GLOBALS['LANG']->sl($GLOBALS['TCA'][$tN]['ctrl']['title']) .
                     '</option>';
             }
         }
diff --git a/Classes/Module/Configuration.php b/Classes/Module/Configuration.php
index b430d77c8..33840c35a 100644
--- a/Classes/Module/Configuration.php
+++ b/Classes/Module/Configuration.php
@@ -23,6 +23,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use DirectMailTeam\DirectMail\DirectMailUtility;
+use DirectMailTeam\DirectMail\Utility\FlashMessageRenderer;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -115,7 +116,7 @@ public function init()
         }
         $this->MOD_MENU['dmail_mode'] = BackendUtility::unsetMenuItems($this->params, $this->MOD_MENU['dmail_mode'], 'menu.dmail_mode');
 
-            // initialize the page selector
+        // initialize the page selector
         $this->sys_page = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository');
         $this->sys_page->init(true);
 
@@ -137,9 +138,9 @@ public function init()
             }
             $GLOBALS['TYPO3_DB']->sql_free_result($res);
         }
-            // load contextual help
+        // load contextual help
         $this->cshTable = '_MOD_' . $this->MCONF['name'];
-        if ($GLOBALS["BE_USER"]->uc['edit_showFieldHelp']) {
+        if ($GLOBALS['BE_USER']->uc['edit_showFieldHelp']) {
             $this->getLanguageService()->loadSingleTableDescription($this->cshTable);
         }
 
@@ -181,11 +182,11 @@ public function main()
         $this->pageinfo = BackendUtility::readPageAccess($this->id, $this->perms_clause);
         $access = is_array($this->pageinfo) ? 1 : 0;
 
-        if (($this->id && $access) || ($GLOBALS["BE_USER"]->user['admin'] && !$this->id)) {
+        if (($this->id && $access) || ($GLOBALS['BE_USER']->user['admin'] && !$this->id)) {
 
             // Draw the header.
             $this->doc = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
-            $this->doc->backPath = $GLOBALS["BACK_PATH"];
+            $this->doc->backPath = $GLOBALS['BACK_PATH'];
             $this->doc->setModuleTemplate('EXT:direct_mail/Resources/Private/Templates/Module.html');
             $this->doc->form = '<form action="" method="post" name="' . $this->formname . '" enctype="multipart/form-data">';
 
@@ -273,10 +274,10 @@ function toggleDisplay(toggleId, e, countBox) { //
                 'PAGEPATH' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.php:labels.path') . ': ' .
                     GeneralUtility::fixed_lgd_cs($this->pageinfo['_thePath'], 50),
                 'SHORTCUT' => '',
-                'CSH' => BackendUtility::cshItem($this->cshTable, '', $GLOBALS["BACK_PATH"])
+                'CSH' => BackendUtility::cshItem($this->cshTable, '', $GLOBALS['BACK_PATH'])
             );
-                // shortcut icon
-            if ($GLOBALS["BE_USER"]->mayMakeShortcut()) {
+            // shortcut icon
+            if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
                 $docHeaderButtons['SHORTCUT'] = $this->doc->makeShortcutIcon('id', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
             }
 
@@ -285,30 +286,30 @@ function toggleDisplay(toggleId, e, countBox) { //
                 $pidrec=BackendUtility::getRecord('pages', intval($this->pageinfo['pid']));
                 $module=$pidrec['module'];
             }
+
             if ($module == 'dmail') {
                 // Direct mail module
                 if (($this->pageinfo['doktype'] == 254) && ($this->pageinfo['module'] == 'dmail')) {
                     $markers['CONTENT'] = '<h1>' . $this->getLanguageService()->getLL('header_conf') . '</h1>' .
                         $this->moduleContent();
                 } elseif ($this->id != 0) {
-                    /**
-                     * Generate flash message
-                     * @var \TYPO3\CMS\Core\Messaging\FlashMessage
-                     */
-                    $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    /* @var $flashMessage FlashMessage */
+                    $flashMessage = GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                         $this->getLanguageService()->getLL('dmail_noRegular'),
                         $this->getLanguageService()->getLL('dmail_newsletters'),
                         FlashMessage::WARNING
                     );
-                    $markers['FLASHMESSAGES'] = $flashMessage->render();
+                    $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
                 }
             } else {
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     $this->getLanguageService()->getLL('select_folder'),
                     $this->getLanguageService()->getLL('header_conf'),
                     FlashMessage::WARNING
                 );
-                $markers['FLASHMESSAGES'] = $flashMessage->render();
+                $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
             }
 
 
@@ -318,7 +319,7 @@ function toggleDisplay(toggleId, e, countBox) { //
             // If no access or if ID == zero
 
             $this->doc = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
-            $this->doc->backPath = $GLOBALS["BACK_PATH"];
+            $this->doc->backPath = $GLOBALS['BACK_PATH'];
 
             $this->content .= $this->doc->startPage($this->getLanguageService()->getLL('title'));
             $this->content .= $this->doc->header($this->getLanguageService()->getLL('title'));
@@ -393,7 +394,7 @@ protected function moduleContent()
             'testmail' => array('short', $this->getLanguageService()->getLL('configure_testmail'), $this->getLanguageService()->getLL('configure_testmail_description'))
         );
 
-            // Set default values
+        // Set default values
         if (!isset($this->implodedParams['plainParams'])) {
             $this->implodedParams['plainParams'] = '&type=99';
         }
@@ -404,7 +405,7 @@ protected function moduleContent()
             $this->implodedParams['direct_mail_charset'] = 'iso-8859-1';
         }
 
-            // Set domain selection list
+        // Set domain selection list
         $rootline = $this->sys_page->getRootLine($this->id);
         $rootlineId = array();
         foreach ($rootline as $rArr) {
@@ -420,7 +421,7 @@ protected function moduleContent()
         while (($row_domain = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res_domain))) {
             $configArray[3]['use_domain']['3'][$row_domain['uid']] = $row_domain['domainName'];
         }
-        $GLOBALS["TYPO3_DB"]->sql_free_result($res_domain);
+        $GLOBALS['TYPO3_DB']->sql_free_result($res_domain);
 
         $this->configArray_length = count($configArray);
         $form ='';
@@ -456,7 +457,7 @@ public function makeConfigForm(array $configArray, array$params, $dataPrefix)
                 if (is_array($config)) {
                     $lines[$fname] = '<strong>' . htmlspecialchars($config[1]) . '</strong>';
                     $lines[$fname] .= $wrapHelp1 . $config[2] . $wrapHelp2 . '<br />';
-                    $formEl = "";
+                    $formEl = '';
                     switch ($config[0]) {
                         case 'string':
                             // do as short
@@ -517,8 +518,8 @@ public function makeConfigForm(array $configArray, array$params, $dataPrefix)
      * @return void
      */
     public function updatePageTS()
-    {   
-        if ($GLOBALS["BE_USER"]->doesUserHaveAccess(BackendUtility::getRecord('pages', $this->id), 2)) {
+    {
+        if ($GLOBALS['BE_USER']->doesUserHaveAccess(BackendUtility::getRecord('pages', $this->id), 2)) {
             $pageTypoScript= GeneralUtility::_GP('pageTS');
             if (is_array($pageTypoScript)) {
                 DirectMailUtility::updatePagesTSconfig($this->id, $pageTypoScript, $this->TSconfPrefix);
diff --git a/Classes/Module/Dmail.php b/Classes/Module/Dmail.php
index e7c3fd7f7..a57d23804 100644
--- a/Classes/Module/Dmail.php
+++ b/Classes/Module/Dmail.php
@@ -19,6 +19,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Configuration\TranslationConfigurationProvider;
 use TYPO3\CMS\Backend\Module\BaseScriptClass;
+use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
@@ -26,6 +27,7 @@
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use DirectMailTeam\DirectMail\DirectMailUtility;
+use DirectMailTeam\DirectMail\Utility\FlashMessageRenderer;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Imaging\Icon;
 
@@ -138,7 +140,7 @@ public function init()
 
         $this->MOD_MENU['dmail_mode'] = BackendUtility::unsetMenuItems($this->params, $this->MOD_MENU['dmail_mode'], 'menu.dmail_mode');
 
-            // initialize backend user language
+        // initialize backend user language
         if ($this->getLanguageService()->lang && ExtensionManagementUtility::isLoaded('static_info_tables')) {
             $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'sys_language.uid',
@@ -153,7 +155,7 @@ public function init()
             }
             $GLOBALS['TYPO3_DB']->sql_free_result($res);
         }
-            // load contextual help
+        // load contextual help
         $this->cshTable = '_MOD_' . $this->MCONF['name'];
         if ($GLOBALS['BE_USER']->uc['edit_showFieldHelp']) {
             $this->getLanguageService()->loadSingleTableDescription($this->cshTable);
@@ -217,7 +219,7 @@ public function main()
             $this->doc->setModuleTemplate('EXT:direct_mail/Resources/Private/Templates/ModuleDirectMail.html');
             $this->doc->form = '<form action="" method="post" name="' . $this->formname . '" enctype="multipart/form-data">';
 
-                // Add CSS
+            // Add CSS
             $this->getPageRenderer()->addCssFile(ExtensionManagementUtility::extRelPath('direct_mail') . 'Resources/Public/StyleSheets/modules.css', 'stylesheet', 'all', '', false, false);
 
             // JavaScript
@@ -316,7 +318,7 @@ function toggleDisplay(toggleId, e, countBox) { //
                 'PAGEPATH' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.php:labels.path') . ': ' . GeneralUtility::fixed_lgd_cs($this->pageinfo['_thePath'], 50),
                 'SHORTCUT' => ''
             );
-                // shortcut icon
+            // shortcut icon
             if ($BE_USER->mayMakeShortcut()) {
                 $docHeaderButtons['SHORTCUT'] = $this->doc->makeShortcutIcon('id', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name'], 1, 'btn btn-default btn-sm');
             }
@@ -328,25 +330,28 @@ function toggleDisplay(toggleId, e, countBox) { //
             }
             if ($module == 'dmail') {
                 // Render content:
-                        // Direct mail module
+                // Direct mail module
                 if (($this->pageinfo['doktype'] == 254) && ($this->pageinfo['module'] == 'dmail')) {
                     $markers = $this->moduleContent();
                 } elseif ($this->id != 0) {
                     /* @var $flashMessage FlashMessage */
-                    $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    $flashMessage = GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                         $this->getLanguageService()->getLL('dmail_noRegular'),
                         $this->getLanguageService()->getLL('dmail_newsletters'),
                         FlashMessage::WARNING
                     );
-                    $markers['FLASHMESSAGES'] = $flashMessage->render();
+                    $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
                 }
             } else {
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                /* @var $flashMessage FlashMessage */
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     $this->getLanguageService()->getLL('select_folder'),
                     $this->getLanguageService()->getLL('header_directmail'),
                     FlashMessage::WARNING
                 );
-                $markers['FLASHMESSAGES'] = $flashMessage->render();
+                $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
             }
 
             $this->content = $this->doc->startPage($this->getLanguageService()->getLL('title'));
@@ -373,8 +378,8 @@ function toggleDisplay(toggleId, e, countBox) { //
      */
     public function createDMail_quick(array $indata)
     {
-        $theOutput = "";
-            // Set default values:
+        $theOutput = '';
+        // Set default values:
         $dmail = array();
         $dmail['sys_dmail']['NEW'] = array(
             'from_email'        => $indata['senderEmail'],
@@ -399,7 +404,7 @@ public function createDMail_quick(array $indata)
         $dmail['sys_dmail']['NEW']['pid'] = $this->pageinfo['uid'];
         $dmail['sys_dmail']['NEW']['charset'] = isset($this->params['quick_mail_charset'])? $this->params['quick_mail_charset'] : 'utf-8';
 
-            // If params set, set default values:
+        // If params set, set default values:
         if (isset($this->params['includeMedia'])) {
             $dmail['sys_dmail']['NEW']['includeMedia'] = $this->params['includeMedia'];
         }
@@ -423,8 +428,11 @@ public function createDMail_quick(array $indata)
             // link in the mail
             $message = '<!--DMAILER_SECTION_BOUNDARY_-->' . $indata['message'] . '<!--DMAILER_SECTION_BOUNDARY_END-->';
             if (trim($this->params['use_rdct'])) {
-                $message = GeneralUtility::substUrlsInPlainText($message, $this->params['long_link_mode']?'all':'76',
-                    DirectMailUtility::getUrlBase($this->params['use_domain']));
+                $message = DirectMailUtility::substUrlsInPlainText(
+                    $message,
+                    $this->params['long_link_mode']?'all':'76',
+                    DirectMailUtility::getUrlBase($this->params['use_domain'])
+                );
             }
             if ($indata['breakLines']) {
                 $message = wordwrap($message, 76, "\n");
@@ -452,8 +460,8 @@ public function createDMail_quick(array $indata)
      */
     public function compileQuickMail(array $row, $message)
     {
-        $errorMsg = "";
-        $warningMsg = "";
+        $errorMsg = '';
+        $warningMsg = '';
 
         // Compile the mail
         /* @var $htmlmail Dmailer */
@@ -464,9 +472,9 @@ public function compileQuickMail(array $row, $message)
         $htmlmail->addPlain($message);
 
         if (!$message || !$htmlmail->theParts['plain']['content']) {
-            $errorMsg .= '<br /><strong>' . $this->getLanguageService()->getLL('dmail_no_plain_content') . '</strong>';
+            $errorMsg .= '&nbsp;<strong>' . $this->getLanguageService()->getLL('dmail_no_plain_content') . '</strong>';
         } elseif (!strstr(base64_decode($htmlmail->theParts['plain']['content']), '<!--DMAILER_SECTION_BOUNDARY')) {
-            $warningMsg .= '<br /><strong>' . $this->getLanguageService()->getLL('dmail_no_plain_boundaries') . '</strong>';
+            $warningMsg .= '&nbsp;<strong>' . $this->getLanguageService()->getLL('dmail_no_plain_boundaries') . '</strong>';
         }
 
         // add attachment is removed. since it will be add during sending
@@ -521,7 +529,7 @@ public function showSteps($totalSteps)
      */
     public function moduleContent()
     {
-        $theOutput = "";
+        $theOutput = '';
         $isExternalDirectMailRecord = false;
 
         $markers = array(
@@ -585,7 +593,7 @@ public function moduleContent()
             }
         }
 
-        $nextCmd = "";
+        $nextCmd = '';
         if ($hideCategoryStep) {
             $totalSteps = 4;
             if ($this->CMD == 'info') {
@@ -598,10 +606,10 @@ public function moduleContent()
             }
         }
 
-        $navigationButtons = "";
+        $navigationButtons = '';
         switch ($this->CMD) {
             case 'info':
-                $fetchMessage = "";
+                $fetchMessage = '';
 
                     // step 2: create the Direct Mail record, or use existing
                 $this->currentStep = 2;
@@ -620,15 +628,14 @@ public function moduleContent()
 
                     // internal page
                 if ($createMailFromInternalPage && !$quickmail['send']) {
-
                     $createMailFromInternalPageLang = (int)GeneralUtility::_GP('createMailFrom_LANG');
                     $newUid = DirectMailUtility::createDirectMailRecordFromPage($createMailFromInternalPage, $this->params, $createMailFromInternalPageLang);
 
                     if (is_numeric($newUid)) {
                         $this->sys_dmail_uid = $newUid;
-                            // Read new record (necessary because TCEmain sets default field values)
+                        // Read new record (necessary because TCEmain sets default field values)
                         $row = BackendUtility::getRecord('sys_dmail', $newUid);
-                            // fetch the data
+                        // fetch the data
                         if ($shouldFetchData) {
                             $fetchMessage = DirectMailUtility::fetchUrlContentsForDirectMailRecord($row, $this->params);
                             $fetchError = ((strstr($fetchMessage, $this->getLanguageService()->getLL('dmail_error')) === false) ? false : true);
@@ -646,9 +653,9 @@ public function moduleContent()
                     $newUid = DirectMailUtility::createDirectMailRecordFromExternalURL($createMailFromExternalUrl, $htmlUrl, $plainTextUrl, $this->params);
                     if (is_numeric($newUid)) {
                         $this->sys_dmail_uid = $newUid;
-                            // Read new record (necessary because TCEmain sets default field values)
+                        // Read new record (necessary because TCEmain sets default field values)
                         $row = BackendUtility::getRecord('sys_dmail', $newUid);
-                            // fetch the data
+                        // fetch the data
                         if ($shouldFetchData) {
                             $fetchMessage = DirectMailUtility::fetchUrlContentsForDirectMailRecord($row, $this->params);
                             $fetchError = ((strstr($fetchMessage, $this->getLanguageService()->getLL('dmail_error')) === false) ? false : true);
@@ -659,7 +666,7 @@ public function moduleContent()
                         $this->error = 'no_valid_url';
                     }
 
-                        // Quickmail
+                    // Quickmail
                 } elseif ($quickmail['send']) {
                     $fetchMessage = $this->createDMail_quick($quickmail);
                     $fetchError = ((strstr($fetchMessage, $this->getLanguageService()->getLL('dmail_error')) === false) ? false : true);
@@ -697,12 +704,13 @@ public function moduleContent()
                     $markers['FLASHMESSAGES'] = $fetchMessage;
                 } elseif (!$fetchError && $shouldFetchData) {
                     /* @var $flashMessage FlashMessage */
-                    $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    $flashMessage = GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                         '',
                         $this->getLanguageService()->getLL('dmail_wiz2_fetch_success'),
                         FlashMessage::OK
                     );
-                    $markers['FLASHMESSAGES'] = $flashMessage->render();
+                    $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
                 }
 
                 if (is_array($row)) {
@@ -849,8 +857,8 @@ public function cmd_finalmail($direct_mail_row)
          * Hook for cmd_finalmail
          * insert a link to open extended importer
          */
-        $hookSelectDisabled = "";
-        $hookContents = "";
+        $hookSelectDisabled = '';
+        $hookContents = '';
         if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['mod2']['cmd_finalmail'])) {
             $hookObjectsArr = array();
             foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['mod2']['cmd_finalmail'] as $classRef) {
@@ -864,7 +872,7 @@ public function cmd_finalmail($direct_mail_row)
             }
         }
 
-            // Mail groups
+        // Mail groups
         $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'uid,pid,title',
             'sys_dmail_group',
@@ -900,13 +908,14 @@ public function cmd_finalmail($direct_mail_row)
 
         // added disabled. see hook
         if (count($opt) === 0) {
-            /** @var $flashMessage FlashMessage */
-            $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                'No recipient groups found',
+            /* @var $flashMessage FlashMessage */
+            $flashMessage = GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $this->getLanguageService()->getLL('error.no_recipient_groups_found'),
                 '',
                 FlashMessage::ERROR //severity
             );
-            $groupInput = $flashMessage->render();
+            $groupInput = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
         } elseif (count($opt) === 1) {
             $groupInput = '';
             if (!$hookSelectDisabled) {
@@ -917,10 +926,10 @@ public function cmd_finalmail($direct_mail_row)
                 $groupInput .= '<em>disabled</em>';
             }
         } else {
-            $groupInput = '<select multiple="multiple" name="mailgroup_uid[]" '.($hookSelectDisabled ? 'disabled' : '').'>'.implode(chr(10),$opt).'</select>';
+            $groupInput = '<select class="form-control" size="20" multiple="multiple" name="mailgroup_uid[]" '.($hookSelectDisabled ? 'disabled' : '').'>'.implode(chr(10),$opt).'</select>';
         }
-            // Set up form:
-        $msg = "";
+        // Set up form:
+        $msg = '';
         $msg .= '<input type="hidden" name="id" value="' . $this->id . '" />';
         $msg .= '<input type="hidden" name="sys_dmail_uid" value="' . $this->sys_dmail_uid . '" />';
         $msg .= '<input type="hidden" name="CMD" value="send_mail_final" />';
@@ -967,17 +976,17 @@ public function cmd_send_mail($row)
         $htmlmail->start();
         $htmlmail->dmailer_prepare($row);
 
-            // send out non-personalized emails
+        // send out non-personalized emails
         $simpleMailMode = GeneralUtility::_GP('mailingMode_simple');
 
         $sentFlag = false;
         if ($simpleMailMode) {
             // step 4, sending simple test emails
 
-                // setting Testmail flag
+            // setting Testmail flag
             $htmlmail->testmail = $this->params['testmail'];
 
-                // Fixing addresses:
+            // Fixing addresses:
             $addresses = GeneralUtility::_GP('SET');
             $addressList = $addresses['dmail_test_email'] ? $addresses['dmail_test_email'] : $this->MOD_SETTINGS['dmail_test_email'];
             $addresses = preg_split('|[' . LF . ',;]|', $addressList);
@@ -998,10 +1007,10 @@ public function cmd_send_mail($row)
                 $sentFlag = true;
 
                 /* @var $flashMessage FlashMessage */
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    $this->getLanguageService()->getLL('send_was_sent') .
-                        '<br /><br />' .
-                        $this->getLanguageService()->getLL('send_recipients') . '<br />' . htmlspecialchars($addressList),
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    $this->getLanguageService()->getLL('send_was_sent') . '&nbsp;' .
+                        $this->getLanguageService()->getLL('send_recipients') . '&nbsp;' . htmlspecialchars($addressList),
                     $this->getLanguageService()->getLL('send_sending'),
                     FlashMessage::OK
                 );
@@ -1023,7 +1032,7 @@ public function cmd_send_mail($row)
                         BackendUtility::deleteClause('pages') .
                         BackendUtility::BEenableFields('tt_address') .
                         BackendUtility::deleteClause('tt_address')
-                    );
+                );
                 if (($recipRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                     $recipRow = Dmailer::convertFields($recipRow);
                     $recipRow['sys_dmail_categories_list'] = $htmlmail->getListOfRecipentCategories('tt_address', $recipRow['uid']);
@@ -1031,7 +1040,8 @@ public function cmd_send_mail($row)
                     $sentFlag=true;
 
                     /* @var $flashMessage FlashMessage */
-                    $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    $flashMessage = GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                         sprintf($this->getLanguageService()->getLL('send_was_sent_to_name'), htmlspecialchars($recipRow['name']) . htmlspecialchars(' <' . $recipRow['email'] . '>')),
                         $this->getLanguageService()->getLL('send_sending'),
                         FlashMessage::OK
@@ -1050,7 +1060,8 @@ public function cmd_send_mail($row)
                 $sendFlag += $this->sendTestMailToTable($idLists, $this->userTable, $htmlmail);
 
                 /* @var $flashMessage FlashMessage */
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     sprintf($this->getLanguageService()->getLL('send_was_sent_to_number'), $sendFlag),
                     $this->getLanguageService()->getLL('send_sending'),
                     FlashMessage::OK
@@ -1059,14 +1070,14 @@ public function cmd_send_mail($row)
         } else {
             // step 5, sending personalized emails to the mailqueue
 
-                // prepare the email for sending with the mailqueue
+            // prepare the email for sending with the mailqueue
             $recipientGroups = GeneralUtility::_GP('mailgroup_uid');
             if (GeneralUtility::_GP('mailingMode_mailGroup') && $this->sys_dmail_uid && is_array($recipientGroups)) {
                 // Update the record:
                 $result = $this->cmd_compileMailGroup($recipientGroups);
                 $queryInfo = $result['queryInfo'];
 
-                $distributionTime = intval(GeneralUtility::_GP('send_mail_datetime'));
+                $distributionTime = strtotime(GeneralUtility::_GP('send_mail_datetime_hr'));
                 if ($distributionTime < time()) {
                     $distributionTime = time();
                 }
@@ -1081,7 +1092,7 @@ public function cmd_send_mail($row)
                     $updateFields['subject'] = $this->params['testmail'] . ' ' . $row['subject'];
                 }
 
-                    // create a draft version of the record
+                // create a draft version of the record
                 if (GeneralUtility::_GP('savedraft')) {
                     if ($row['type'] == 0) {
                         $updateFields['type'] = 2;
@@ -1104,7 +1115,8 @@ public function cmd_send_mail($row)
                 );
 
                 /* @var $flashMessage FlashMessage */
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     $sectionTitle . '<br /><br />' . $content,
                     $this->getLanguageService()->getLL('dmail_wiz5_sendmass'),
                     FlashMessage::OK
@@ -1112,7 +1124,7 @@ public function cmd_send_mail($row)
             }
         }
 
-            // Setting flags and update the record:
+        // Setting flags and update the record:
         if ($sentFlag && $this->CMD == 'send_mail_final') {
             $GLOBALS['TYPO3_DB']->exec_UPDATEquery(
                 'sys_dmail',
@@ -1121,7 +1133,7 @@ public function cmd_send_mail($row)
             );
         }
 
-        return $flashMessage->render();
+        return GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
     }
 
     /**
@@ -1163,7 +1175,7 @@ protected function sendTestMailToTable(array $idLists, $table, Dmailer $htmlmail
      */
     public function cmd_testmail()
     {
-        $theOutput = "";
+        $theOutput = '';
 
         if ($this->params['test_tt_address_uids']) {
             $intList = implode(',', GeneralUtility::intExplode(',', $this->params['test_tt_address_uids']));
@@ -1204,7 +1216,7 @@ public function cmd_testmail()
                 $msg .='<a href="' . BackendUtility::getModuleUrl('DirectMailNavFrame_DirectMail') . '&id=' . $this->id . '&sys_dmail_uid=' . $this->sys_dmail_uid . '&CMD=send_mail_test&sys_dmail_group_uid[]=' . $row['uid'] . '">' .
                     $this->iconFactory->getIconForRecord('sys_dmail_group', $row, Icon::SIZE_SMALL) .
                     htmlspecialchars($row['title']) . '</a><br />';
-                    // Members:
+                // Members:
                 $result = $this->cmd_compileMailGroup(array($row['uid']));
                 $msg.='<table border="0" class="table table-striped table-hover">
 				<tr>
@@ -1280,13 +1292,13 @@ public function getRecordList(array $listArr, $table, $editLinkFlag=1, $testMail
             foreach ($listArr as $row) {
                 $tableIcon = '';
                 $editLink = '';
-                $testLink = "";
+                $testLink = '';
 
                 if ($row['uid']) {
                     $tableIcon = '<td>' . $this->iconFactory->getIconForRecord($table, $row, Icon::SIZE_SMALL) . '</td>';
                     if ($editLinkFlag) {
                         $requestUri = GeneralUtility::getIndpEnv('REQUEST_URI') . '&CMD=send_test&sys_dmail_uid=' . $this->sys_dmail_uid . '&pages_uid=' . $this->pages_uid;
-                        $editLink = '<td><a href="#" onClick="' . BackendUtility::editOnClick('&edit[tt_address][' . $row['uid'] . ']=edit', $GLOBALS['BACK_PATH'], $requestUri) . '" title="' . $this->getLanguageService()->getLL("dmail_edit") . '">' .
+                        $editLink = '<td><a href="#" onClick="' . BackendUtility::editOnClick('&edit[tt_address][' . $row['uid'] . ']=edit', $GLOBALS['BACK_PATH'], $requestUri) . '" title="' . $this->getLanguageService()->getLL('dmail_edit') . '">' .
                             $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL) .
                             '</a></td>';
                     }
@@ -1367,7 +1379,7 @@ protected function cmd_compileMailGroup(array $groups)
          */
         if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['mod2']['cmd_compileMailGroup'])) {
             $hookObjectsArr = array();
-            $temporaryList = "";
+            $temporaryList = '';
 
             foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['mod2']['cmd_compileMailGroup'] as $classRef) {
                 $hookObjectsArr[] = &GeneralUtility::getUserObj($classRef);
@@ -1550,8 +1562,8 @@ public function update_specialQuery(array $mailGroup)
                 'query' => $this->MOD_SETTINGS['queryConfig']
             );
             $updateResult = $GLOBALS['TYPO3_DB']->exec_UPDATEquery(
-                "sys_dmail_group",
-                "uid = " . intval($mailGroup['uid']),
+                'sys_dmail_group',
+                'uid = ' . intval($mailGroup['uid']),
                 $updateFields
             );
             $GLOBALS['TYPO3_DB']->sql_free_result($updateResult);
@@ -1627,7 +1639,7 @@ public function makeCategoriesForm(array $row)
 
                 if ($colPosVal != $row['colPos']) {
                     $out .= '<tr><td colspan="3" bgcolor="' . $this->doc->bgColor5 . '">' . $this->getLanguageService()->getLL('nl_l_column') . ': <strong>' . BackendUtility::getProcessedValue('tt_content', 'colPos', $row['colPos']) . '</strong></td></tr>';
-                    $colPosVal = $row["colPos"];
+                    $colPosVal = $row['colPos'];
                 }
                 $out .= '<tr>';
                 $out .= '<td valign="top" width="75%">' . $this->iconFactory->getIconForRecord('tt_content', $row, Icon::SIZE_SMALL) .
@@ -1645,7 +1657,7 @@ public function makeCategoriesForm(array $row)
                 $this->categories = DirectMailUtility::makeCategories('tt_content', $row, $this->sys_language_uid);
                 reset($this->categories);
                 foreach ($this->categories as $pKey => $pVal) {
-                    $checkBox .= '<input type="hidden" name="indata[categories][' . $row["uid"] . '][' . $pKey . ']" value="0">' .
+                    $checkBox .= '<input type="hidden" name="indata[categories][' . $row['uid'] . '][' . $pKey . ']" value="0">' .
                     '<input type="checkbox" name="indata[categories][' . $row['uid'] . '][' . $pKey . ']" value="1"' . (GeneralUtility::inList($categoriesRow, $pKey) ?' checked':'') . '> ' .
                         htmlspecialchars($pVal) . '<br />';
                 }
@@ -1701,7 +1713,7 @@ public function makeFormExternal($boxId, $totalBox, $open=false)
         $output .= '<a href="#" onclick="toggleDisplay(\'' . $boxId . '\', event, ' . $totalBox . ')">' . $imgSrc . $this->getLanguageService()->getLL('dmail_wiz1_external_page') . '</a>';
         $output .= '</div><div id="' . $boxId . '" class="toggleBox" style="display:' . ($open?'block':'none') . '">';
 
-            // Create
+        // Create
         $out = $this->getLanguageService()->getLL('dmail_HTML_url') . '<br />
 				<input type="text" value="http://" name="createMailFrom_HTMLUrl"' . $GLOBALS['TBE_TEMPLATE']->formWidth(40) . ' /><br />' .
                 $this->getLanguageService()->getLL('dmail_plaintext_url') . '<br />
@@ -1709,7 +1721,7 @@ public function makeFormExternal($boxId, $totalBox, $open=false)
                 $this->getLanguageService()->getLL('dmail_subject') . '<br />' .
                 '<input type="text" value="' . $this->getLanguageService()->getLL('dmail_write_subject') . '" name="createMailFrom_URL" onFocus="this.value=\'\';"' . $GLOBALS['TBE_TEMPLATE']->formWidth(40) . ' /><br />' .
                 (($this->error == 'no_valid_url')?('<br /><b>' . $this->getLanguageService()->getLL('dmail_no_valid_url') . '</b><br /><br />'):'') .
-                '<input type="submit" value="' . $this->getLanguageService()->getLL("dmail_createMail") . '" />
+                '<input type="submit" value="' . $this->getLanguageService()->getLL('dmail_createMail') . '" />
 				<input type="hidden" name="fetchAtOnce" value="1">';
         $output.= '<h3>' . $this->getLanguageService()->getLL('dmail_dovsk_crFromUrl') . BackendUtility::cshItem($this->cshTable, 'create_directmail_from_url', $GLOBALS['BACK_PATH']) . '</h3>';
         $output.= $out;
@@ -1808,7 +1820,7 @@ public function cmd_quickmail()
 
         $senderName = ($indata['senderName']?$indata['senderName']:$GLOBALS['BE_USER']->user['realName']);
         $senderMail = ($indata['senderEmail']?$indata['senderEmail']:$GLOBALS['BE_USER']->user['email']);
-            // Set up form:
+        // Set up form:
         $theOutput.= '<input type="hidden" name="id" value="' . $this->id . '" />';
         $theOutput.= $this->getLanguageService()->getLL('quickmail_sender_name') . '<br /><input type="text" name="quickmail[senderName]" value="' . htmlspecialchars($senderName) . '"' . $this->doc->formWidth() . ' /><br />';
         $theOutput.= $this->getLanguageService()->getLL('quickmail_sender_email') . '<br /><input type="text" name="quickmail[senderEmail]" value="' . htmlspecialchars($senderMail) . '"' . $this->doc->formWidth() . ' /><br />';
@@ -1862,13 +1874,23 @@ public function cmd_news()
                     $plainIcon = $this->iconFactory->getIcon('direct_mail_preview_plain', Icon::SIZE_SMALL, $langIconOverlay);
                     $createIcon = $this->iconFactory->getIcon('direct_mail_newmail', Icon::SIZE_SMALL, $langIconOverlay);
 
-                    $previewHTMLLink .= '<a href="#" onClick="' . BackendUtility::viewOnClick($row['uid'],
-                            $GLOBALS['BACK_PATH'], BackendUtility::BEgetRootLine($row['uid']), '', '',
-                            $htmlParams) . '" title="' . htmlentities($GLOBALS['LANG']->getLL('nl_viewPage_HTML') . $langTitle) . '">' . $htmlIcon . '</a>';
-                    $previewTextLink .= '<a href="#" onClick="' . BackendUtility::viewOnClick($row['uid'],
-                            $GLOBALS['BACK_PATH'], BackendUtility::BEgetRootLine($row['uid']), '', '',
-                            $plainParams) . '" title="' . htmlentities($GLOBALS['LANG']->getLL('nl_viewPage_TXT') . $langTitle) . '">' . $plainIcon . '</a>';
-                    $createLink .= '<a href="' . $createDmailLink . $createLangParam . '" title="' . htmlentities($GLOBALS['LANG']->getLL("nl_create") . $langTitle) . '">' . $createIcon . '</a>';
+                    $previewHTMLLink .= '<a href="#" onClick="' . BackendUtility::viewOnClick(
+                        $row['uid'],
+                            $GLOBALS['BACK_PATH'],
+                        BackendUtility::BEgetRootLine($row['uid']),
+                        '',
+                        '',
+                            $htmlParams
+                    ) . '" title="' . htmlentities($GLOBALS['LANG']->getLL('nl_viewPage_HTML') . $langTitle) . '">' . $htmlIcon . '</a>';
+                    $previewTextLink .= '<a href="#" onClick="' . BackendUtility::viewOnClick(
+                        $row['uid'],
+                            $GLOBALS['BACK_PATH'],
+                        BackendUtility::BEgetRootLine($row['uid']),
+                        '',
+                        '',
+                            $plainParams
+                    ) . '" title="' . htmlentities($GLOBALS['LANG']->getLL('nl_viewPage_TXT') . $langTitle) . '">' . $plainIcon . '</a>';
+                    $createLink .= '<a href="' . $createDmailLink . $createLangParam . '" title="' . htmlentities($GLOBALS['LANG']->getLL('nl_create') . $langTitle) . '">' . $createIcon . '</a>';
                 }
 
                 switch ($this->params['sendOptions']) {
@@ -1887,7 +1909,7 @@ public function cmd_news()
                 $outLines[] = [
                     (count($languages) > 1 ? $pageIcon : '<a href="' . $createDmailLink . '">' . $pageIcon . '</a>'),
                     $createLink,
-                    '<a onclick="' . htmlspecialchars(BackendUtility::editOnClick('&edit[pages][' . $row['uid'] . ']=edit', $this->doc->backPath)) . '" href="#" title="' . $GLOBALS['LANG']->getLL("nl_editPage") . '">' . $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL) . '</a>',
+                    '<a onclick="' . htmlspecialchars(BackendUtility::editOnClick('&edit[pages][' . $row['uid'] . ']=edit', $this->doc->backPath)) . '" href="#" title="' . $GLOBALS['LANG']->getLL('nl_editPage') . '">' . $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL) . '</a>',
                     $previewLink
                 ];
             }
@@ -1905,10 +1927,11 @@ public function cmd_news()
      * @param $pageUid
      * @return array
      */
-    protected function getAvailablePageLanguages($pageUid) {
+    protected function getAvailablePageLanguages($pageUid)
+    {
         static $languages;
         $languageUids = [];
-        if ($languages === NULL) {
+        if ($languages === null) {
             $languages = GeneralUtility::makeInstance(TranslationConfigurationProvider::class)->getSystemLanguages();
         }
         // loop trough all sys languages and check if there is matching page translation
@@ -1967,7 +1990,7 @@ protected function renderRecordDetailsTable(array $row)
 
                 $editParams = BackendUtility::editOnClick('&edit[sys_dmail][' . $row['uid'] . ']=edit', $GLOBALS['BACK_PATH'], $requestUri);
 
-                $content = '<a href="#" onClick="' . $editParams . '" title="' . $this->getLanguageService()->getLL("dmail_edit") . '">' .
+                $content = '<a href="#" onClick="' . $editParams . '" title="' . $this->getLanguageService()->getLL('dmail_edit') . '">' .
                     $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL) .
                     '<b>' . $this->getLanguageService()->getLL('dmail_edit') . '</b></a>';
             } else {
diff --git a/Classes/Module/MailerEngine.php b/Classes/Module/MailerEngine.php
index 977d56dcf..9729952b6 100644
--- a/Classes/Module/MailerEngine.php
+++ b/Classes/Module/MailerEngine.php
@@ -14,13 +14,14 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-use DirectMailTeam\DirectMail\DirectMailUtility;
 use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
+use DirectMailTeam\DirectMail\DirectMailUtility;
+use DirectMailTeam\DirectMail\Utility\FlashMessageRenderer;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -97,30 +98,30 @@ public function init()
         }
         $this->params = $temp['properties'];
         $this->implodedParams = DirectMailUtility::implodeTSParams($this->params);
-        if ($this->params['userTable'] && is_array($GLOBALS["TCA"][$this->params['userTable']])) {
+        if ($this->params['userTable'] && is_array($GLOBALS['TCA'][$this->params['userTable']])) {
             $this->userTable = $this->params['userTable'];
             $this->allowedTables[] = $this->userTable;
         }
         $this->MOD_MENU['dmail_mode'] = BackendUtility::unsetMenuItems($this->params, $this->MOD_MENU['dmail_mode'], 'menu.dmail_mode');
 
-            // initialize backend user language
+        // initialize backend user language
         if ($this->getLanguageService()->lang && ExtensionManagementUtility::isLoaded('static_info_tables')) {
-            $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'sys_language.uid',
                 'sys_language LEFT JOIN static_languages ON sys_language.static_lang_isocode=static_languages.uid',
-                'static_languages.lg_typo3=' . $GLOBALS["TYPO3_DB"]->fullQuoteStr($this->getLanguageService()->lang, 'static_languages') .
+                'static_languages.lg_typo3=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->getLanguageService()->lang, 'static_languages') .
                     BackendUtility::BEenableFields('sys_language') .
                     BackendUtility::deleteClause('sys_language') .
                     BackendUtility::deleteClause('static_languages')
                 );
-            while (($row = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+            while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                 $this->sys_language_uid = $row['uid'];
             }
-            $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+            $GLOBALS['TYPO3_DB']->sql_free_result($res);
         }
-            // load contextual help
+        // load contextual help
         $this->cshTable = '_MOD_' . $this->MCONF['name'];
-        if ($GLOBALS["BE_USER"]->uc['edit_showFieldHelp']) {
+        if ($GLOBALS['BE_USER']->uc['edit_showFieldHelp']) {
             $this->getLanguageService()->loadSingleTableDescription($this->cshTable);
         }
     }
@@ -160,10 +161,10 @@ public function main()
         $this->pageinfo = BackendUtility::readPageAccess($this->id, $this->perms_clause);
         $access = is_array($this->pageinfo) ? 1 : 0;
 
-        if (($this->id && $access) || ($GLOBALS["BE_USER"]->user['admin'] && !$this->id)) {
+        if (($this->id && $access) || ($GLOBALS['BE_USER']->user['admin'] && !$this->id)) {
             // Draw the header.
             $this->doc = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
-            $this->doc->backPath = $GLOBALS["BACK_PATH"];
+            $this->doc->backPath = $GLOBALS['BACK_PATH'];
             $this->doc->setModuleTemplate('EXT:direct_mail/Resources/Private/Templates/Module.html');
             $this->doc->form='<form action="" method="post" name="' . $this->formname . '" enctype="multipart/form-data">';
 
@@ -195,10 +196,10 @@ function jumpToUrlD(URL) { //
             $docHeaderButtons = array(
                 'PAGEPATH' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.php:labels.path') . ': ' . GeneralUtility::fixed_lgd_cs($this->pageinfo['_thePath'], 50),
                 'SHORTCUT' => '',
-                'CSH' => BackendUtility::cshItem($this->cshTable, '', $GLOBALS["BACK_PATH"])
+                'CSH' => BackendUtility::cshItem($this->cshTable, '', $GLOBALS['BACK_PATH'])
             );
-                // shortcut icon
-            if ($GLOBALS["BE_USER"]->mayMakeShortcut()) {
+            // shortcut icon
+            if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
                 $docHeaderButtons['SHORTCUT'] = $this->doc->makeShortcutIcon('id', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
             }
 
@@ -207,32 +208,35 @@ function jumpToUrlD(URL) { //
                 $pidrec=BackendUtility::getRecord('pages', intval($this->pageinfo['pid']));
                 $module=$pidrec['module'];
             }
-                    // Render content:
+            // Render content:
             if ($module == 'dmail') {
                 if (GeneralUtility::_GP('cmd') == 'delete') {
                     $this->deleteDMail(GeneralUtility::_GP('uid'));
                 }
 
-                    // Direct mail module
+                // Direct mail module
                 if ($this->pageinfo['doktype'] == 254 && $this->pageinfo['module'] == 'dmail') {
                     $markers['CONTENT'] = '<h1>' . $this->getLanguageService()->getLL('header_mailer') . '</h1>' .
                     $this->cmd_cronMonitor() . $this->cmd_mailerengine();
                 } elseif ($this->id != 0) {
                     /* @var $flashMessage FlashMessage */
-                    $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    $flashMessage = GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                         $this->getLanguageService()->getLL('dmail_noRegular'),
                         $this->getLanguageService()->getLL('dmail_newsletters'),
                         FlashMessage::WARNING
                     );
-                    $markers['FLASHMESSAGES'] = $flashMessage->render();
+                    $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
                 }
             } else {
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                /* @var $flashMessage FlashMessage */
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     $this->getLanguageService()->getLL('select_folder'),
                     $this->getLanguageService()->getLL('header_mailer'),
                     FlashMessage::WARNING
                 );
-                $markers['FLASHMESSAGES'] = $flashMessage->render();
+                $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
             }
 
             $this->content = $this->doc->startPage($this->getLanguageService()->getLL('title'));
@@ -241,7 +245,7 @@ function jumpToUrlD(URL) { //
             // If no access or if ID == zero
 
             $this->doc = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
-            $this->doc->backPath = $GLOBALS["BACK_PATH"];
+            $this->doc->backPath = $GLOBALS['BACK_PATH'];
 
             $this->content .= $this->doc->startPage($this->getLanguageService()->getLL('title'));
             $this->content .= $this->doc->header($this->getLanguageService()->getLL('title'));
@@ -269,13 +273,13 @@ public function printContent()
     public function deleteDMail($uid)
     {
         $table = 'sys_dmail';
-        if ($GLOBALS["TCA"][$table]['ctrl']['delete']) {
-            $res = $GLOBALS["TYPO3_DB"]->exec_UPDATEquery(
+        if ($GLOBALS['TCA'][$table]['ctrl']['delete']) {
+            $res = $GLOBALS['TYPO3_DB']->exec_UPDATEquery(
                 $table,
                 'uid = ' . $uid,
-                array($GLOBALS["TCA"][$table]['ctrl']['delete'] => 1)
+                array($GLOBALS['TCA'][$table]['ctrl']['delete'] => 1)
             );
-            $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+            $GLOBALS['TYPO3_DB']->sql_free_result($res);
         }
     }
 
@@ -289,11 +293,11 @@ public function cmd_cronMonitor()
         $content = '';
         $mailerStatus = 0;
         $lastExecutionTime = 0;
-        $logContent = "";
+        $logContent = '';
 
 
-            // seconds
-        $cronInterval = $GLOBALS["TYPO3_CONF_VARS"]['EXTCONF']['direct_mail']['cronInt'] * 60;
+        // seconds
+        $cronInterval = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['cronInt'] * 60;
         $lastCronjobShouldBeNewThan = (time() - $cronInterval);
 
         $filename = PATH_site . 'typo3temp/tx_directmail_dmailer_log.txt';
@@ -309,11 +313,11 @@ public function cmd_cronMonitor()
          * 	-1 = cron stopped
          */
 
-            // cron running or error (die function in dmailer_log)
+        // cron running or error (die function in dmailer_log)
         if (file_exists(PATH_site . 'typo3temp/tx_directmail_cron.lock')) {
             $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_dmail_maillog', 'response_type = 0', 'tstamp DESC');
             $lastSend = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-            $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+            $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
             if (($lastSend['tstamp'] < time()) && ($lastSend['tstamp'] > $lastCronjobShouldBeNewThan)) {
                 // cron is sending
@@ -336,25 +340,28 @@ public function cmd_cronMonitor()
         }
 
 
-        $currentDate = ' / ' . $this->getLanguageService()->getLL('dmail_mailerengine_current_time') . ' ' . BackendUtility::datetime(time()) . '<br />';
-        $lastRun = '<br />' . $this->getLanguageService()->getLL('dmail_mailerengine_cron_lastrun') . ($lastExecutionTime ? BackendUtility::datetime($lastExecutionTime) : '-') . $currentDate;
+        $currentDate = ' / ' . $this->getLanguageService()->getLL('dmail_mailerengine_current_time') . ' ' . BackendUtility::datetime(time()) . '. ';
+        $lastRun = ' ' . $this->getLanguageService()->getLL('dmail_mailerengine_cron_lastrun') . ($lastExecutionTime ? BackendUtility::datetime($lastExecutionTime) : '-') . $currentDate;
         switch ($mailerStatus) {
             case -1:
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     $this->getLanguageService()->getLL('dmail_mailerengine_cron_warning') . ': ' . ($error ? $error : $this->getLanguageService()->getLL('dmail_mailerengine_cron_warning_msg')) . $lastRun,
                     $this->getLanguageService()->getLL('dmail_mailerengine_cron_status'),
                     FlashMessage::ERROR
                 );
                 break;
             case 0:
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     $this->getLanguageService()->getLL('dmail_mailerengine_cron_caution') . ': ' . $this->getLanguageService()->getLL('dmail_mailerengine_cron_caution_msg') . $lastRun,
                     $this->getLanguageService()->getLL('dmail_mailerengine_cron_status'),
                     FlashMessage::WARNING
                 );
                 break;
             case 1:
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     $this->getLanguageService()->getLL('dmail_mailerengine_cron_ok') . ': ' . $this->getLanguageService()->getLL('dmail_mailerengine_cron_ok_msg') . $lastRun,
                     $this->getLanguageService()->getLL('dmail_mailerengine_cron_status'),
                     FlashMessage::OK
@@ -362,7 +369,7 @@ public function cmd_cronMonitor()
                 break;
             default:
         }
-        return $flashMessage->render();
+        return GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
     }
 
     /**
@@ -373,30 +380,31 @@ public function cmd_cronMonitor()
      */
     public function cmd_mailerengine()
     {
-        $invokeMessage = "";
+        $invokeMessage = '';
 
-            // enable manual invocation of mailer engine; enabled by default
+        // enable manual invocation of mailer engine; enabled by default
         $enableTrigger = ! (isset($this->params['menu.']['dmail_mode.']['mailengine.']['disable_trigger']) && $this->params['menu.']['dmail_mode.']['mailengine.']['disable_trigger']);
         if ($enableTrigger && GeneralUtility::_GP('invokeMailerEngine')) {
             /* @var $flashMessage FlashMessage */
-            $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                '<strong>' . $this->getLanguageService()->getLL('dmail_mailerengine_log') . '</strong><br />' . nl2br($this->invokeMEngine()),
+            $flashMessage = GeneralUtility::makeInstance(
+                'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $this->getLanguageService()->getLL('dmail_mailerengine_log') . ' ' . $this->invokeMEngine() . '. ',
                 $this->getLanguageService()->getLL('dmail_mailerengine_invoked'),
                 FlashMessage::INFO
             );
-            $invokeMessage = $flashMessage->render();
+            $invokeMessage = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
         }
 
         // Invoke engine
         if ($enableTrigger) {
             $out = '<p>' . $this->getLanguageService()->getLL('dmail_mailerengine_manual_explain') . '<br /><br /><a class="t3-link" href="' . BackendUtility::getModuleUrl('DirectMailNavFrame_MailerEngine') . '&id=' . $this->id . '&invokeMailerEngine=1"><strong>' . $this->getLanguageService()->getLL('dmail_mailerengine_invoke_now') . '</strong></a></p>';
             $invokeMessage .= '<div style="padding-top: 20px;"></div>';
-            $invokeMessage .= $this->doc->section(BackendUtility::cshItem($this->cshTable, 'mailerengine_invoke', $GLOBALS["BACK_PATH"]) . $this->getLanguageService()->getLL('dmail_mailerengine_manual_invoke'), $out, 1, 1, 0, true);
+            $invokeMessage .= $this->doc->section(BackendUtility::cshItem($this->cshTable, 'mailerengine_invoke', $GLOBALS['BACK_PATH']) . $this->getLanguageService()->getLL('dmail_mailerengine_manual_invoke'), $out, 1, 1, 0, true);
             $invokeMessage .= '<div style="padding-top: 20px;"></div>';
         }
 
         // Display mailer engine status
-        $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'uid,pid,subject,scheduled,scheduled_begin,scheduled_end',
             'sys_dmail',
             'pid=' . intval($this->id) .
@@ -416,15 +424,15 @@ public function cmd_mailerengine()
 				<td style="text-align: center;"><b>&nbsp;' . $this->getLanguageService()->getLL('dmail_mailerengine_delete') . '&nbsp;</b></td>
 			</tr>';
 
-        while (($row = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
-            $countres = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+        while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
+            $countres = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'count(*)',
                 'sys_dmail_maillog',
                 'mid=' . intval($row['uid']) .
                     ' AND response_type=0' .
                     ' AND html_sent>0'
                 );
-            list($count) = $GLOBALS["TYPO3_DB"]->sql_fetch_row($countres);
+            list($count) = $GLOBALS['TYPO3_DB']->sql_fetch_row($countres);
             $out .='<tr class="db_list_normal">
 						<td>' . $this->iconFactory->getIconForRecord('sys_dmail', $row, Icon::SIZE_SMALL)->render() . '</td>
 						<td>' . $this->linkDMail_record(htmlspecialchars(GeneralUtility::fixed_lgd_cs($row['subject'], 100)) . '&nbsp;&nbsp;', $row['uid']) . '</td>
@@ -437,7 +445,7 @@ public function cmd_mailerengine()
         }
 
         $out = $invokeMessage . '<table class="table table-striped table-hover">' . $out . '</table>';
-        return $this->doc->section(BackendUtility::cshItem($this->cshTable, 'mailerengine_status', $GLOBALS["BACK_PATH"]) . $this->getLanguageService()->getLL('dmail_mailerengine_status'), $out, 1, 1, 0, true);
+        return $this->doc->section(BackendUtility::cshItem($this->cshTable, 'mailerengine_status', $GLOBALS['BACK_PATH']) . $this->getLanguageService()->getLL('dmail_mailerengine_status'), $out, 1, 1, 0, true);
     }
 
     /**
@@ -454,7 +462,7 @@ public function deleteLink($uid)
         if (!$dmail['scheduled_begin']) {
             return '<a href="' . BackendUtility::getModuleUrl('DirectMailNavFrame_MailerEngine') . '&id=' . $this->id . '&cmd=delete&uid=' . $uid . '">' . $icon . '</a>';
         }
-        return "";
+        return '';
     }
 
     /**
diff --git a/Classes/Module/NavFrame.php b/Classes/Module/NavFrame.php
index 1edec65ea..00fcc2881 100644
--- a/Classes/Module/NavFrame.php
+++ b/Classes/Module/NavFrame.php
@@ -135,7 +135,8 @@ function hilight_row(frameSetModule,highLightID) { //
 				top.fsMod.navFrameHighlightedID[frameSetModule] = highLightID;
 				theObj = document.getElementById(highLightID);
 			}
-		');
+		'
+        );
     }
 
     /**
diff --git a/Classes/Module/RecipientList.php b/Classes/Module/RecipientList.php
index 702bc2c61..10783d617 100644
--- a/Classes/Module/RecipientList.php
+++ b/Classes/Module/RecipientList.php
@@ -23,6 +23,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use DirectMailTeam\DirectMail\DirectMailUtility;
+use DirectMailTeam\DirectMail\Utility\FlashMessageRenderer;
 
 /**
  * Recipient list module for tx_directmail extension
@@ -117,10 +118,10 @@ public function init()
         }
         $this->MOD_MENU['dmail_mode'] = BackendUtility::unsetMenuItems($this->params, $this->MOD_MENU['dmail_mode'], 'menu.dmail_mode');
 
-            // initialize the query generator
+        // initialize the query generator
         $this->queryGenerator = GeneralUtility::makeInstance('DirectMailTeam\\DirectMail\\MailSelect');
 
-            // initialize backend user language
+        // initialize backend user language
         if ($this->getLanguageService()->lang && ExtensionManagementUtility::isLoaded('static_info_tables')) {
             $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'sys_language.uid',
@@ -134,7 +135,7 @@ public function init()
                 $this->sys_language_uid = $row['uid'];
             }
         }
-            // load contextual help
+        // load contextual help
         $this->cshTable = '_MOD_' . $this->MCONF['name'];
         if ($GLOBALS['BE_USER']->uc['edit_showFieldHelp']) {
             $this->getLanguageService()->loadSingleTableDescription($this->cshTable);
@@ -218,7 +219,7 @@ function jumpToUrlD(URL) { //
                 'SHORTCUT' => '',
                 'CSH' => BackendUtility::cshItem($this->cshTable, '', $GLOBALS['BACK_PATH'])
             );
-                // shortcut icon
+            // shortcut icon
             if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
                 $docHeaderButtons['SHORTCUT'] = $this->doc->makeShortcutIcon('id', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
             }
@@ -230,7 +231,7 @@ function jumpToUrlD(URL) { //
                 $module = $pidrec['module'];
             }
 
-                // Render content:
+            // Render content:
             if ($module == 'dmail') {
                 // Direct mail module
                 if ($this->pageinfo['doktype']==254 && $this->pageinfo['module']=='dmail') {
@@ -238,21 +239,23 @@ function jumpToUrlD(URL) { //
                         $this->moduleContent();
                 } elseif ($this->id != 0) {
                     /* @var $flashMessage FlashMessage */
-                    $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    $flashMessage = GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                         $this->getLanguageService()->getLL('dmail_noRegular'),
                         $this->getLanguageService()->getLL('dmail_newsletters'),
                         FlashMessage::WARNING
                     );
-                    $markers['FLASHMESSAGES'] = $flashMessage->render();
+                    $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
                 }
             } else {
                 /* @var $flashMessage FlashMessage */
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     $this->getLanguageService()->getLL('select_folder'),
                     $this->getLanguageService()->getLL('header_recip'),
                     FlashMessage::WARNING
                 );
-                $markers['FLASHMESSAGES'] = $flashMessage->render();
+                $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
             }
 
             $this->content = $this->doc->startPage($this->getLanguageService()->getLL('mailgroup_header'));
@@ -362,14 +365,14 @@ public function showExistingRecipientLists()
         $out =' <table class="table table-striped table-hover">' . $out . '</table>';
         $theOutput = $this->doc->section(BackendUtility::cshItem($this->cshTable, 'select_mailgroup', $GLOBALS['BACK_PATH']) . $this->getLanguageService()->getLL('recip_select_mailgroup'), $out, 1, 1, 0, true);
 
-            // New:
+        // New:
         $out = '<a href="#" class="t3-link" onClick="' . BackendUtility::editOnClick('&edit[sys_dmail_group][' . $this->id . ']=new', $GLOBALS['BACK_PATH'], '') . '">' .
             $this->iconFactory->getIconForRecord('sys_dmail_group', array(), Icon::SIZE_SMALL) .
             $this->getLanguageService()->getLL('recip_create_mailgroup_msg') . '</a>';
         $theOutput .= '<div style="padding-top: 20px;"></div>';
         $theOutput .= $this->doc->section(BackendUtility::cshItem($this->cshTable, 'create_mailgroup', $GLOBALS['BACK_PATH']) . $this->getLanguageService()->getLL('recip_create_mailgroup'), $out, 1, 0, false, true, false, true);
 
-            // Import
+        // Import
         $out = '<a class="t3-link" href="' . BackendUtility::getModuleUrl('DirectMailNavFrame_RecipientList') . '&id=' . $this->id . '&CMD=displayImport">' . $this->getLanguageService()->getLL('recip_import_mailgroup_msg') . '</a>';
         $theOutput.= '<div style="padding-top: 20px;"></div>';
         $theOutput.= $this->doc->section($this->getLanguageService()->getLL('mailgroup_import'), $out, 1, 1, 0, true);
@@ -387,12 +390,12 @@ public function showExistingRecipientLists()
      */
     public function editLink($table, $uid)
     {
-        $str = "";
+        $str = '';
 
         // check if the user has the right to modify the table
-        if ($GLOBALS["BE_USER"]->check('tables_modify', $table)) {
+        if ($GLOBALS['BE_USER']->check('tables_modify', $table)) {
             $params = '&edit[' . $table . '][' . $uid . ']=edit';
-            $str = '<a href="#" onClick="' . BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'], '') . '" title="' . $this->getLanguageService()->getLL("dmail_edit") . '">' .
+            $str = '<a href="#" onClick="' . BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'], '') . '" title="' . $this->getLanguageService()->getLL('dmail_edit') . '">' .
                 $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL) .
                 '</a>';
         }
@@ -600,7 +603,7 @@ public function cmd_displayMailGroup($result)
         $theOutput = $this->doc->section($this->getLanguageService()->getLL('mailgroup_recip_from') . ' ' . $out, $mainC, 1, 1, 0, true);
         $theOutput .= '<div style="padding-top: 20px;"></div>';
 
-            // do the CSV export
+        // do the CSV export
         $csvValue = GeneralUtility::_GP('csv');
         if ($csvValue) {
             if ($csvValue == 'PLAINLIST') {
@@ -655,7 +658,7 @@ public function cmd_displayMailGroup($result)
                 }
 
                 if ($group['type'] == 3) {
-                    if ($GLOBALS["BE_USER"]->check('tables_modify', 'sys_dmail_group')) {
+                    if ($GLOBALS['BE_USER']->check('tables_modify', 'sys_dmail_group')) {
                         $theOutput .= $this->cmd_specialQuery($group);
                     }
                 }
@@ -728,7 +731,7 @@ public function update_specialQuery($mailGroup)
      */
     public function cmd_specialQuery($mailGroup)
     {
-        $out = "";
+        $out = '';
         $this->queryGenerator->init('dmail_queryConfig', $this->MOD_SETTINGS['queryTable']);
 
         if ($this->MOD_SETTINGS['queryTable'] && $this->MOD_SETTINGS['queryConfig']) {
@@ -872,13 +875,13 @@ public function cmd_displayUserInfo()
             while (($rowCat=$GLOBALS['TYPO3_DB']->sql_fetch_assoc($resCat))) {
                 $categoriesArray[] = $rowCat['uid_foreign'];
             }
-            $categories = implode($categoriesArray, ",");
+            $categories = implode($categoriesArray, ',');
 
             $editParams = '&edit[' . $table . '][' . $row['uid'] . ']=edit';
 
             $out = '';
             $out .=  $this->iconFactory->getIconForRecord($table, $row)->render() . htmlspecialchars($row['name']) . htmlspecialchars(' <' . $row['email'] . '>');
-            $out .= '&nbsp;&nbsp;<a href="#" onClick="' . BackendUtility::editOnClick($editParams, $GLOBALS['BACK_PATH'], '') . '" title="' . $this->getLanguageService()->getLL("dmail_edit") . '">' .
+            $out .= '&nbsp;&nbsp;<a href="#" onClick="' . BackendUtility::editOnClick($editParams, $GLOBALS['BACK_PATH'], '') . '" title="' . $this->getLanguageService()->getLL('dmail_edit') . '">' .
                 $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL) .
                 '<b>' . $this->getLanguageService()->getLL('dmail_edit') . '</b></a>';
             $theOutput = $this->doc->section($this->getLanguageService()->getLL('subscriber_info'), $out);
diff --git a/Classes/Module/Statistics.php b/Classes/Module/Statistics.php
index 786ec6cb4..f592be857 100644
--- a/Classes/Module/Statistics.php
+++ b/Classes/Module/Statistics.php
@@ -23,6 +23,7 @@
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Backend\Utility\IconUtility;
 use DirectMailTeam\DirectMail\DirectMailUtility;
+use DirectMailTeam\DirectMail\Utility\FlashMessageRenderer;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
@@ -115,27 +116,27 @@ public function init()
 
         $this->MOD_MENU['dmail_mode'] = BackendUtility::unsetMenuItems($this->params, $this->MOD_MENU['dmail_mode'], 'menu.dmail_mode');
 
-            // initialize the page selector
+        // initialize the page selector
         $this->sys_page = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository');
         $this->sys_page->init(true);
 
-            // initialize backend user language
+        // initialize backend user language
         if ($this->getLanguageService()->lang && ExtensionManagementUtility::isLoaded('static_info_tables')) {
-            $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'sys_language.uid',
                 'sys_language LEFT JOIN static_languages ON sys_language.static_lang_isocode=static_languages.uid',
-                'static_languages.lg_typo3=' . $GLOBALS["TYPO3_DB"]->fullQuoteStr($this->getLanguageService()->lang, 'static_languages') .
+                'static_languages.lg_typo3=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->getLanguageService()->lang, 'static_languages') .
                     BackendUtility::BEenableFields('sys_language') .
                     BackendUtility::deleteClause('sys_language') .
                     BackendUtility::deleteClause('static_languages')
                 );
-            while (($row = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+            while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                 $this->sys_language_uid = $row['uid'];
             }
         }
-            // load contextual help
+        // load contextual help
         $this->cshTable = '_MOD_'.$this->MCONF['name'];
-        if ($GLOBALS["BE_USER"]->uc['edit_showFieldHelp']) {
+        if ($GLOBALS['BE_USER']->uc['edit_showFieldHelp']) {
             $this->getLanguageService()->loadSingleTableDescription($this->cshTable);
         }
     }
@@ -185,11 +186,11 @@ public function main()
         $this->pageinfo = BackendUtility::readPageAccess($this->id, $this->perms_clause);
         $access = is_array($this->pageinfo) ? 1 : 0;
 
-        if (($this->id && $access) || ($GLOBALS["BE_USER"]->user['admin'] && !$this->id)) {
+        if (($this->id && $access) || ($GLOBALS['BE_USER']->user['admin'] && !$this->id)) {
 
             // Draw the header.
             $this->doc = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
-            $this->doc->backPath = $GLOBALS["BACK_PATH"];
+            $this->doc->backPath = $GLOBALS['BACK_PATH'];
             $this->doc->setModuleTemplate('EXT:direct_mail/Resources/Private/Templates/Module.html');
             $this->doc->form='<form action="" method="post" name="' . $this->formname . '" enctype="multipart/form-data">';
 
@@ -232,10 +233,10 @@ function jumpToUrlD(URL) { //
             $docHeaderButtons = array(
                 'PAGEPATH' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.php:labels.path') . ': ' . GeneralUtility::fixed_lgd_cs($this->pageinfo['_thePath'], 50),
                 'SHORTCUT' => '',
-                'CSH' => BackendUtility::cshItem($this->cshTable, '', $GLOBALS["BACK_PATH"])
+                'CSH' => BackendUtility::cshItem($this->cshTable, '', $GLOBALS['BACK_PATH'])
             );
-                // shortcut icon
-            if ($GLOBALS["BE_USER"]->mayMakeShortcut()) {
+            // shortcut icon
+            if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
                 $docHeaderButtons['SHORTCUT'] = $this->doc->makeShortcutIcon('id', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
             }
 
@@ -247,25 +248,27 @@ function jumpToUrlD(URL) { //
 
             if ($module == 'dmail') {
                 // Direct mail module
-                    // Render content:
+                // Render content:
                 if ($this->pageinfo['doktype']==254 && $this->pageinfo['module']=='dmail') {
                     $markers['CONTENT'] = '<h1>' . $this->getLanguageService()->getLL('stats_overview_header') . '</h1>' . $this->moduleContent();
                 } elseif ($this->id != 0) {
                     /* @var $flashMessage FlashMessage */
-                    $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                    $flashMessage = GeneralUtility::makeInstance(
+                        'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                         $this->getLanguageService()->getLL('dmail_noRegular'),
                         $this->getLanguageService()->getLL('dmail_newsletters'),
                         FlashMessage::WARNING
                     );
-                    $markers['FLASHMESSAGES'] = $flashMessage->render();
+                    $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
                 }
             } else {
-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
+                $flashMessage = GeneralUtility::makeInstance(
+                    'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
                     $this->getLanguageService()->getLL('select_folder'),
                     $this->getLanguageService()->getLL('header_stat'),
                     FlashMessage::WARNING
                 );
-                $markers['FLASHMESSAGES'] = $flashMessage->render();
+                $markers['FLASHMESSAGES'] = GeneralUtility::makeInstance(FlashMessageRenderer::class)->render($flashMessage);
 
                 $markers['CONTENT'] = '<h2>' . $this->getLanguageService()->getLL('stats_overview_header') . '</h2>';
             }
@@ -276,7 +279,7 @@ function jumpToUrlD(URL) { //
             // If no access or if ID == zero
 
             $this->doc = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
-            $this->doc->backPath = $GLOBALS["BACK_PATH"];
+            $this->doc->backPath = $GLOBALS['BACK_PATH'];
 
             $this->content .= $this->doc->startPage($this->getLanguageService()->getLL('title'));
             $this->content .= $this->doc->header($this->getLanguageService()->getLL('title'));
@@ -291,14 +294,14 @@ function jumpToUrlD(URL) { //
      */
     public function moduleContent()
     {
-        $theOutput = "";
+        $theOutput = '';
 
         if (!$this->sys_dmail_uid) {
             $theOutput = $this->cmd_displayPageInfo();
         } else {
             // Here the single dmail record is shown.
             $this->sys_dmail_uid = intval($this->sys_dmail_uid);
-            $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 '*',
                 'sys_dmail',
                 'pid=' . intval($this->id) .
@@ -308,11 +311,11 @@ public function moduleContent()
 
             $this->noView = 0;
 
-            if (($row = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+            if (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                 // Set URL data for commands
                 $this->setURLs($row);
 
-                    // COMMAND:
+                // COMMAND:
                 switch ($this->CMD) {
                     case 'displayUserInfo':
                         $theOutput = $this->cmd_displayUserInfo();
@@ -322,8 +325,8 @@ public function moduleContent()
                         break;
                     default:
                         // Hook for handling of custom direct mail commands:
-                        if (is_array($GLOBALS["TYPO3_CONF_VARS"]['EXT']['directmail']['handledirectmailcmd-' . $this->CMD])) {
-                            foreach ($GLOBALS["TYPO3_CONF_VARS"]['EXT']['directmail']['handledirectmailcmd-' . $this->CMD] as $funcRef) {
+                        if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXT']['directmail']['handledirectmailcmd-' . $this->CMD])) {
+                            foreach ($GLOBALS['TYPO3_CONF_VARS']['EXT']['directmail']['handledirectmailcmd-' . $this->CMD] as $funcRef) {
                                 $params = array('pObj' => &$this);
                                 $theOutput = GeneralUtility::callUserFunction($funcRef, $params, $this);
                             }
@@ -345,7 +348,7 @@ public function cmd_displayUserInfo()
         $indata = GeneralUtility::_GP('indata');
         $table = GeneralUtility::_GP('table');
 
-        $mmTable = $GLOBALS["TCA"][$table]['columns']['module_sys_dmail_category']['config']['MM'];
+        $mmTable = $GLOBALS['TCA'][$table]['columns']['module_sys_dmail_category']['config']['MM'];
 
         if (GeneralUtility::_GP('submit')) {
             $indata = GeneralUtility::_GP('indata');
@@ -362,7 +365,7 @@ public function cmd_displayUserInfo()
                     $data=array();
                     if (is_array($indata['categories'])) {
                         reset($indata['categories']);
-                        foreach ($indata["categories"] as $recValues) {
+                        foreach ($indata['categories'] as $recValues) {
                             $enabled = array();
                             foreach ($recValues as $k => $b) {
                                 if ($b) {
@@ -387,7 +390,7 @@ public function cmd_displayUserInfo()
 
         switch ($table) {
             case 'tt_address':
-                $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'tt_address.*',
                     'tt_address LEFT JOIN pages ON pages.uid=tt_address.pid',
                     'tt_address.uid=' . intval($uid) .
@@ -398,7 +401,7 @@ public function cmd_displayUserInfo()
                     );
                 break;
             case 'fe_users':
-                $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'fe_users.*',
                     'fe_users LEFT JOIN pages ON pages.uid=fe_users.pid',
                     'fe_users.uid=' . intval($uid) .
@@ -414,29 +417,29 @@ public function cmd_displayUserInfo()
 
         $row = array();
         if ($res) {
-            $row = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res);
-            $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+            $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
+            $GLOBALS['TYPO3_DB']->sql_free_result($res);
         }
 
-        $theOutput = "";
+        $theOutput = '';
         if (is_array($row)) {
             $categories = '';
-            $resCat = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $resCat = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'uid_foreign',
                 $mmTable,
                 'uid_local=' . $row['uid']
                 );
 
-            while (($rowCat = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($resCat))) {
+            while (($rowCat = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resCat))) {
                 $categories .= $rowCat['uid_foreign'] . ',';
             }
-            $categories = rtrim($categories, ",");
-            $GLOBALS["TYPO3_DB"]->sql_free_result($resCat);
+            $categories = rtrim($categories, ',');
+            $GLOBALS['TYPO3_DB']->sql_free_result($resCat);
 
             $editParameters = '&edit[' . $table . '][' . $row['uid'] . ']=edit';
             $out = '';
             $out .= $this->iconFactory->getIconForRecord($table, $row)->render() . htmlspecialchars($row['name'] . ' <' . $row['email'] . '>');
-            $out .= '&nbsp;&nbsp;<a href="#" onClick="' . BackendUtility::editOnClick($editParameters, $GLOBALS["BACK_PATH"], '') . '" title="' . $this->getLanguageService()->getLL("dmail_edit") . '">' .
+            $out .= '&nbsp;&nbsp;<a href="#" onClick="' . BackendUtility::editOnClick($editParameters, $GLOBALS['BACK_PATH'], '') . '" title="' . $this->getLanguageService()->getLL('dmail_edit') . '">' .
                 $this->iconFactory->getIcon('actions-open', Icon::SIZE_SMALL) .
                 $this->getLanguageService()->getLL('dmail_edit') . '</b></a>';
             $theOutput = $this->doc->section($this->getLanguageService()->getLL('subscriber_info'), $out);
@@ -472,7 +475,7 @@ public function cmd_displayUserInfo()
     public function cmd_displayPageInfo()
     {
         // Here the dmail list is rendered:
-        $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             '*',
             'sys_dmail',
             'pid=' . intval($this->id) .
@@ -483,14 +486,14 @@ public function cmd_displayPageInfo()
             'scheduled DESC, scheduled_begin DESC'
             );
 
-        if ($GLOBALS["TYPO3_DB"]->sql_num_rows($res)) {
-            $onClick = ' onClick="return confirm(' . GeneralUtility::quoteJSvalue(sprintf($this->getLanguageService()->getLL('nl_l_warning'), $GLOBALS["TYPO3_DB"]->sql_num_rows($res))) . ');"';
+        if ($GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
+            $onClick = ' onClick="return confirm(' . GeneralUtility::quoteJSvalue(sprintf($this->getLanguageService()->getLL('nl_l_warning'), $GLOBALS['TYPO3_DB']->sql_num_rows($res))) . ');"';
         } else {
             $onClick = '';
         }
         $out = '';
 
-        if ($GLOBALS["TYPO3_DB"]->sql_num_rows($res)) {
+        if ($GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
             $out .='<table border="0" cellpadding="0" cellspacing="0" class="table table-striped table-hover">';
             $out .='<thead>
 					<th>&nbsp;</th>
@@ -501,15 +504,15 @@ public function cmd_displayPageInfo()
 					<th nowrap="nowrap"><b>' . $this->getLanguageService()->getLL('stats_overview_total_sent') . '</b></th>
 					<th><b>' . $this->getLanguageService()->getLL('stats_overview_status') . '</b></th>
 				</thead>';
-            while (($row = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
-                $countRes = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
+                $countRes = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'count(*)',
                     'sys_dmail_maillog',
                     'mid = ' . $row['uid'] .
                         ' AND response_type=0' .
                         ' AND html_sent>0'
                 );
-                list($count) = $GLOBALS["TYPO3_DB"]->sql_fetch_row($countRes);
+                list($count) = $GLOBALS['TYPO3_DB']->sql_fetch_row($countRes);
 
                 if (!empty($row['scheduled_begin'])) {
                     if (!empty($row['scheduled_end'])) {
@@ -522,11 +525,11 @@ public function cmd_displayPageInfo()
                 }
 
                 $out.='<tr class="db_list_normal">
-					<td>' . $this->iconFactory->getIconForRecord('sys_dmail', $row)->render() . '</td>
+					<td>' . $this->iconFactory->getIconForRecord('sys_dmail', $row, Icon::SIZE_SMALL)->render() . '</td>
 					<td>' . $this->linkDMail_record(GeneralUtility::fixed_lgd_cs($row['subject'], 30) . '  ', $row['uid'], $row['subject']) . '&nbsp;&nbsp;</td>
-					<td>' . BackendUtility::datetime($row["scheduled"]) . '</td>
-					<td>' . ($row["scheduled_begin"]?BackendUtility::datetime($row["scheduled_begin"]):'&nbsp;') . '</td>
-					<td>' . ($row["scheduled_end"]?BackendUtility::datetime($row["scheduled_end"]):'&nbsp;') . '</td>
+					<td>' . BackendUtility::datetime($row['scheduled']) . '</td>
+					<td>' . ($row['scheduled_begin']?BackendUtility::datetime($row['scheduled_begin']):'&nbsp;') . '</td>
+					<td>' . ($row['scheduled_end']?BackendUtility::datetime($row['scheduled_end']):'&nbsp;') . '</td>
 					<td>' . ($count?$count:'&nbsp;') . '</td>
 					<td>' . $sent . '</td>
 				</tr>';
@@ -563,44 +566,44 @@ public function linkDMail_record($str, $uid, $aTitle='')
      */
     public function cmd_stats($row)
     {
-        if (GeneralUtility::_GP("recalcCache")) {
+        if (GeneralUtility::_GP('recalcCache')) {
             $this->makeStatTempTableContent($row);
         }
         $thisurl = BackendUtility::getModuleUrl('DirectMailNavFrame_Statistics') . '&id=' . $this->id . '&sys_dmail_uid=' . $row['uid'] . '&CMD=' . $this->CMD . '&recalcCache=1';
         $output = $this->directMail_compactView($row);
 
-            // *****************************
-            // Mail responses, general:
-            // *****************************
+        // *****************************
+        // Mail responses, general:
+        // *****************************
 
         $mailingId = intval($row['uid']);
         $queryArray = array('response_type,count(*) as counter', 'sys_dmail_maillog', 'mid=' . $mailingId, 'response_type');
         $table = $this->getQueryRows($queryArray, 'response_type');
 
-            // Plaintext/HTML
-        $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery('html_sent,count(*) as counter', 'sys_dmail_maillog', 'mid=' . $mailingId . ' AND response_type=0', 'html_sent');
+        // Plaintext/HTML
+        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('html_sent,count(*) as counter', 'sys_dmail_maillog', 'mid=' . $mailingId . ' AND response_type=0', 'html_sent');
 
         $textHtml = array();
-        while (($row2 = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+        while (($row2 = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
             // 0:No mail; 1:HTML; 2:TEXT; 3:HTML+TEXT
             $textHtml[$row2['html_sent']] = $row2['counter'];
         }
-        $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+        $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
-            // Unique responses, html
-        $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery('count(*) as counter', 'sys_dmail_maillog', 'mid=' . $mailingId . ' AND response_type=1', 'rid,rtbl', 'counter');
-        $uniqueHtmlResponses = $GLOBALS["TYPO3_DB"]->sql_num_rows($res);
-        $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+        // Unique responses, html
+        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('count(*) as counter', 'sys_dmail_maillog', 'mid=' . $mailingId . ' AND response_type=1', 'rid,rtbl', 'counter');
+        $uniqueHtmlResponses = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
+        $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
-            // Unique responses, Plain
-        $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery('count(*) as counter', 'sys_dmail_maillog', 'mid=' . $mailingId . ' AND response_type=2', 'rid,rtbl', 'counter');
-        $uniquePlainResponses = $GLOBALS["TYPO3_DB"]->sql_num_rows($res);
-        $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+        // Unique responses, Plain
+        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('count(*) as counter', 'sys_dmail_maillog', 'mid=' . $mailingId . ' AND response_type=2', 'rid,rtbl', 'counter');
+        $uniquePlainResponses = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
+        $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
-            // Unique responses, pings
-        $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery('count(*) as counter', 'sys_dmail_maillog', 'mid=' . $mailingId . ' AND response_type=-1', 'rid,rtbl', 'counter');
-        $uniquePingResponses = $GLOBALS["TYPO3_DB"]->sql_num_rows($res);
-        $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+        // Unique responses, pings
+        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('count(*) as counter', 'sys_dmail_maillog', 'mid=' . $mailingId . ' AND response_type=-1', 'rid,rtbl', 'counter');
+        $uniquePingResponses = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
+        $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
         $tblLines = array();
         $tblLines[]=array('',$this->getLanguageService()->getLL('stats_total'),$this->getLanguageService()->getLL('stats_HTML'),$this->getLanguageService()->getLL('stats_plaintext'));
@@ -617,21 +620,21 @@ public function cmd_stats($row)
         $output.='<br /><h2>' . $this->getLanguageService()->getLL('stats_general_information') . '</h2>';
         $output.= DirectMailUtility::formatTable($tblLines, array('nowrap', 'nowrap', 'nowrap', 'nowrap'), 1, array());
 
-            // ******************
-            // Links:
-            // ******************
+        // ******************
+        // Links:
+        // ******************
 
-            // initialize $urlCounter
+        // initialize $urlCounter
         $urlCounter = array(
             'total' => array(),
             'plain' => array(),
             'html' => array(),
         );
-            // Most popular links, html:
+        // Most popular links, html:
         $queryArray = array('url_id,count(*) as counter', 'sys_dmail_maillog', 'mid=' . intval($row['uid']) . ' AND response_type=1', 'url_id', 'counter');
         $htmlUrlsTable=$this->getQueryRows($queryArray, 'url_id');
 
-            // Most popular links, plain:
+        // Most popular links, plain:
         $queryArray = array('url_id,count(*) as counter', 'sys_dmail_maillog', 'mid=' . intval($row['uid']) . ' AND response_type=2', 'url_id', 'counter');
         $plainUrlsTable=$this->getQueryRows($queryArray, 'url_id');
 
@@ -716,7 +719,7 @@ public function cmd_stats($row)
         $tblLines = array();
         $tblLines[] = array('',$this->getLanguageService()->getLL('stats_HTML_link_nr'),$this->getLanguageService()->getLL('stats_plaintext_link_nr'),$this->getLanguageService()->getLL('stats_total'),$this->getLanguageService()->getLL('stats_HTML'),$this->getLanguageService()->getLL('stats_plaintext'),'');
 
-            // HTML mails
+        // HTML mails
         if (intval($row['sendOptions']) & 0x2) {
             $htmlContent = $unpackedMail['html']['content'];
 
@@ -782,7 +785,7 @@ public function cmd_stats($row)
             $origId = $id;
             $id     = abs(intval($id));
             $url    = $htmlLinks[$id]['url'] ? $htmlLinks[$id]['url'] : $urlArr[$origId];
-                // a link to this host?
+            // a link to this host?
             $uParts = @parse_url($url);
             $urlstr = $this->getUrlStr($uParts);
 
@@ -815,7 +818,7 @@ public function cmd_stats($row)
         }
 
 
-            // go through all links that were not clicked yet and that have a label
+        // go through all links that were not clicked yet and that have a label
         $clickedLinks = array_keys($urlCounter['total']);
         foreach ($urlArr as $id => $link) {
             if (!in_array($id, $clickedLinks) && (isset($htmlLinks['id']))) {
@@ -839,7 +842,24 @@ public function cmd_stats($row)
 
         if ($urlCounter['total']) {
             $output .= '<br /><h2>' . $this->getLanguageService()->getLL('stats_response_link') . '</h2>';
-            $output .= DirectMailUtility::formatTable($tblLines, array('nowrap', 'nowrap width="100"', 'nowrap width="100"', 'nowrap', 'nowrap', 'nowrap', 'nowrap'), 1, array(1, 0, 0, 0, 0, 0, 1));
+
+            /**
+             * Hook for cmd_stats_linkResponses
+             */
+            if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['mod4']['cmd_stats_linkResponses'])) {
+                $hookObjectsArr = array();
+                foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['mod4']['cmd_stats_linkResponses'] as $classRef) {
+                    $hookObjectsArr[] = &GeneralUtility::getUserObj($classRef);
+                }
+
+                foreach ($hookObjectsArr as $hookObj) {
+                    if (method_exists($hookObj, 'cmd_stats_linkResponses')) {
+                        $output .= $hookObj->cmd_stats_linkResponses($tblLines, $this);
+                    }
+                }
+            } else {
+                $output .= DirectMailUtility::formatTable($tblLines, array('nowrap', 'nowrap width="100"', 'nowrap width="100"', 'nowrap', 'nowrap', 'nowrap', 'nowrap'), 1, array(1, 0, 0, 0, 0, 0, 1));
+            }
         }
 
 
@@ -903,7 +923,7 @@ public function cmd_stats($row)
 
         // Find all returned mail
         if (GeneralUtility::_GP('returnList')||GeneralUtility::_GP('returnDisable')||GeneralUtility::_GP('returnCSV')) {
-            $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'rid,rtbl,email',
                 'sys_dmail_maillog',
                 'mid=' . intval($row['uid']) .
@@ -911,7 +931,7 @@ public function cmd_stats($row)
                 );
             $idLists = array();
 
-            while (($rrow = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+            while (($rrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                 switch ($rrow['rtbl']) {
                     case 't':
                         $idLists['tt_address'][]=$rrow['rid'];
@@ -973,7 +993,7 @@ public function cmd_stats($row)
 
         // Find Unknown Recipient
         if (GeneralUtility::_GP('unknownList')||GeneralUtility::_GP('unknownDisable')||GeneralUtility::_GP('unknownCSV')) {
-            $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'rid,rtbl,email',
                 'sys_dmail_maillog',
                 'mid=' . intval($row['uid']) .
@@ -982,7 +1002,7 @@ public function cmd_stats($row)
                 );
 
             $idLists = array();
-            while (($rrow = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+            while (($rrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                 switch ($rrow['rtbl']) {
                     case 't':
                         $idLists['tt_address'][]=$rrow['rid'];
@@ -1044,7 +1064,7 @@ public function cmd_stats($row)
 
         // Mailbox Full
         if (GeneralUtility::_GP('fullList')||GeneralUtility::_GP('fullDisable')||GeneralUtility::_GP('fullCSV')) {
-            $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'rid,rtbl,email',
                 'sys_dmail_maillog',
                 'mid=' . intval($row['uid']) .
@@ -1052,7 +1072,7 @@ public function cmd_stats($row)
                     ' AND return_code=551'
                 );
             $idLists = array();
-            while (($rrow = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+            while (($rrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                 switch ($rrow['rtbl']) {
                     case 't':
                         $idLists['tt_address'][]=$rrow['rid'];
@@ -1114,7 +1134,7 @@ public function cmd_stats($row)
 
         // find Bad Host
         if (GeneralUtility::_GP('badHostList')||GeneralUtility::_GP('badHostDisable')||GeneralUtility::_GP('badHostCSV')) {
-            $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'rid,rtbl,email',
                 'sys_dmail_maillog',
                 'mid=' . intval($row['uid']) .
@@ -1122,7 +1142,7 @@ public function cmd_stats($row)
                     ' AND return_code=552'
                 );
             $idLists = array();
-            while (($rrow = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+            while (($rrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                 switch ($rrow['rtbl']) {
                     case 't':
                         $idLists['tt_address'][]=$rrow['rid'];
@@ -1184,7 +1204,7 @@ public function cmd_stats($row)
 
         // find Bad Header
         if (GeneralUtility::_GP('badHeaderList')||GeneralUtility::_GP('badHeaderDisable')||GeneralUtility::_GP('badHeaderCSV')) {
-            $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'rid,rtbl,email',
                 'sys_dmail_maillog',
                 'mid=' . intval($row['uid']) .
@@ -1192,7 +1212,7 @@ public function cmd_stats($row)
                     ' AND return_code=554'
                 );
             $idLists = array();
-            while (($rrow = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+            while (($rrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                 switch ($rrow['rtbl']) {
                     case 't':
                         $idLists['tt_address'][] = $rrow['rid'];
@@ -1256,7 +1276,7 @@ public function cmd_stats($row)
         // find Unknown Reasons
         // TODO: list all reason
         if (GeneralUtility::_GP('reasonUnknownList')||GeneralUtility::_GP('reasonUnknownDisable')||GeneralUtility::_GP('reasonUnknownCSV')) {
-            $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+            $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'rid,rtbl,email',
                 'sys_dmail_maillog',
                 'mid=' . intval($row['uid']) .
@@ -1264,7 +1284,7 @@ public function cmd_stats($row)
                     ' AND return_code=-1'
                 );
             $idLists = array();
-            while (($rrow = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+            while (($rrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
                 switch ($rrow['rtbl']) {
                     case 't':
                         $idLists['tt_address'][] = $rrow['rid'];
@@ -1394,15 +1414,19 @@ public function getLinkLabel($url, $urlStr, $forceFetch = false, $linkedWord = '
                 $url = $pathSite . $url;
             }
 
-            $content = GeneralUtility::getURL($url);
-
-            if (preg_match('/\<\s*title\s*\>(.*)\<\s*\/\s*title\s*\>/i', $content, $matches)) {
-                // get the page title
-                $contentTitle = GeneralUtility::fixed_lgd_cs(trim($matches[1]), 50);
-            } else {
-                // file?
-                $file = GeneralUtility::split_fileref($url);
-                $contentTitle = $file['file'];
+            try {
+                $content = GeneralUtility::getURL($url);
+                if (preg_match('/\<\s*title\s*\>(.*)\<\s*\/\s*title\s*\>/i', $content, $matches)) {
+                    // get the page title
+                    $contentTitle = GeneralUtility::fixed_lgd_cs(trim($matches[1]), 50);
+                } else {
+                    // file?
+                    $file = GeneralUtility::split_fileref($url);
+                    $contentTitle = $file['file'];
+                }
+            } catch (\Exception $e) {
+                //When the url can't be retrieved, set the title to the url
+                $contentTitle = $url;
             }
         }
 
@@ -1421,7 +1445,7 @@ public function getLinkLabel($url, $urlStr, $forceFetch = false, $linkedWord = '
             }
         }
 
-            // Fallback to url
+        // Fallback to url
         if ($label === '') {
             $label = $url;
         }
@@ -1484,7 +1508,7 @@ public function getUrlStr(array $urlParts)
      */
     public function getBaseURL()
     {
-        $baseUrl = GeneralUtility::getIndpEnv("TYPO3_SITE_URL");
+        $baseUrl = GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
 
         # if fetching the newsletter using http, set the url to http here
         if ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['UseHttpToFetch'] == 1) {
@@ -1517,7 +1541,7 @@ public function disableRecipients(array $arr, $table)
                         'uid IN (' . implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($uidList)) . ')',
                         $values
                         );
-                    $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+                    $GLOBALS['TYPO3_DB']->sql_free_result($res);
                 }
             }
         }
@@ -1534,12 +1558,12 @@ public function disableRecipients(array $arr, $table)
     public function makeStatTempTableContent(array $mrow)
     {
         // Remove old:
-        $GLOBALS["TYPO3_DB"]->exec_DELETEquery(
+        $GLOBALS['TYPO3_DB']->exec_DELETEquery(
             'cache_sys_dmail_stat',
             'mid=' . intval($mrow['uid'])
             );
 
-        $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'rid,rtbl,tstamp,response_type,url_id,html_sent,size',
             'sys_dmail_maillog',
             'mid=' . intval($mrow['uid']),
@@ -1550,7 +1574,7 @@ public function makeStatTempTableContent(array $mrow)
         $currentRec = '';
         $recRec = '';
 
-        while (($row = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+        while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
             $thisRecPointer = $row['rtbl'] . $row['rid'];
 
             if ($thisRecPointer != $currentRec) {
@@ -1606,7 +1630,7 @@ public function makeStatTempTableContent(array $mrow)
             }
         }
 
-        $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+        $GLOBALS['TYPO3_DB']->sql_free_result($res);
         $this->storeRecRec($recRec);
     }
 
@@ -1650,7 +1674,7 @@ public function storeRecRec(array $recRec)
                 'cache_sys_dmail_stat',
                 $recRec
             );
-            $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+            $GLOBALS['TYPO3_DB']->sql_free_result($res);
         }
     }
 
@@ -1664,7 +1688,7 @@ public function storeRecRec(array $recRec)
      */
     public function getQueryRows(array $queryArray, $fieldName)
     {
-        $res = $GLOBALS["TYPO3_DB"]->exec_SELECTquery(
+        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             $queryArray[0],
             $queryArray[1],
             $queryArray[2],
@@ -1673,14 +1697,14 @@ public function getQueryRows(array $queryArray, $fieldName)
             $queryArray[5]
             );
         $lines = array();
-        while (($row = $GLOBALS["TYPO3_DB"]->sql_fetch_assoc($res))) {
+        while (($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))) {
             if ($fieldName) {
                 $lines[$row[$fieldName]] = $row;
             } else {
                 $lines[] = $row;
             }
         }
-        $GLOBALS["TYPO3_DB"]->sql_free_result($res);
+        $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
         return $lines;
     }
@@ -1715,7 +1739,7 @@ public function setURLs(array $row)
         // Finding the domain to use
         $this->urlbase = DirectMailUtility::getUrlBase($row['use_domain']);
 
-            // Finding the url to fetch content from
+        // Finding the url to fetch content from
         switch ((string)$row['type']) {
             case 1:
                 $this->url_html = $row['HTMLParams'];
@@ -1787,8 +1811,8 @@ public function directMail_compactView($row)
             $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL) .
             '</span>';
 
-        $delBegin = ($row["scheduled_begin"]?BackendUtility::datetime($row["scheduled_begin"]):'-');
-        $delEnd = ($row["scheduled_end"]?BackendUtility::datetime($row["scheduled_begin"]):'-');
+        $delBegin = ($row['scheduled_begin']?BackendUtility::datetime($row['scheduled_begin']):'-');
+        $delEnd = ($row['scheduled_end']?BackendUtility::datetime($row['scheduled_begin']):'-');
 
         // count total recipient from the query_info
         $totalRecip = 0;
@@ -1799,7 +1823,7 @@ public function directMail_compactView($row)
         $sentRecip = $GLOBALS['TYPO3_DB']->sql_num_rows($GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_dmail_maillog', 'mid=' . $row['uid'] . ' AND response_type = 0', '', 'rid ASC'));
 
         $out = '<table class="table table-striped table-hover">';
-        $out .= '<tr class="t3-row-header"><td colspan="3">' . $this->iconFactory->getIconForRecord('sys_dmail', $row)->render() . htmlspecialchars($row['subject']) . '</td></tr>';
+        $out .= '<tr class="t3-row-header"><td colspan="3">' . $this->iconFactory->getIconForRecord('sys_dmail', $row, Icon::SIZE_SMALL)->render() . htmlspecialchars($row['subject']) . '</td></tr>';
         $out .= '<tr class="db_list_normal"><td>' . $this->getLanguageService()->getLL('view_from') . '</td>' .
             '<td>' . htmlspecialchars($row['from_name'] . ' <' . htmlspecialchars($row['from_email']) . '>') . '</td>' .
             '<td>' . $fromInfo . '</td></tr>';
diff --git a/pi1/class.tx_directmail_pi1.php b/Classes/Plugin/DirectMail.php
similarity index 98%
rename from pi1/class.tx_directmail_pi1.php
rename to Classes/Plugin/DirectMail.php
index 92fdcdae9..6b83cfef8 100644
--- a/pi1/class.tx_directmail_pi1.php
+++ b/Classes/Plugin/DirectMail.php
@@ -1,4 +1,6 @@
 <?php
+namespace DirectMailTeam\DirectMail\Plugin;
+
 /***************************************************************
 *  Copyright notice
 *
@@ -49,7 +51,7 @@
  *
  * @author Ivan Kartolo <ivan.kartolo@gmail.com>
  */
-class tx_directmail_pi1 extends AbstractPlugin
+class DirectMail extends AbstractPlugin
 {
 
     /**
@@ -152,12 +154,12 @@ public function main($content, array $conf)
         $lines[] = '';
         $content = implode(LF, $lines);
 
-            // Substitute labels
+        // Substitute labels
         $markerArray = array();
         $markerArray = $this->addLabelsMarkers($markerArray);
         $content = $this->cObj->substituteMarkerArray($content, $markerArray);
 
-            // User processing:
+        // User processing:
         $content = $this->userProcess('userProc', $content);
         return $content;
     }
@@ -177,7 +179,7 @@ public function init(array $conf)
         $this->pi_loadLL();
         $this->siteUrl = $this->conf['siteUrl'];
 
-            // Default linebreak;
+        // Default linebreak;
         if ($this->conf['flowedFormat']) {
             $this->linebreak = chr(32) . LF;
         }
@@ -277,9 +279,11 @@ public function getImagesStandard(array &$imagesArray, $uploadPath='uploads/pics
     public function getImagesFromDam(array &$imagesArray)
     {
         $sql = 'SELECT tx_dam.* FROM tx_dam_mm_ref,tx_dam WHERE tx_dam_mm_ref.tablenames="tt_content" AND tx_dam_mm_ref.ident="tx_damttcontent_files" AND tx_dam_mm_ref.uid_foreign="' . $this->cObj->data['uid'] . '" AND tx_dam_mm_ref.uid_local=tx_dam.uid AND tx_dam.deleted=0 ORDER BY sorting_foreign';
-        $res = mysql_query($sql);
-        if (mysql_num_rows($res)>0) {
-            while (($row = mysql_fetch_assoc($res))) {
+        /* @var \TYPO3\CMS\Core\Database\DatabaseConnection $db */
+        $db = $GLOBALS['TYPO3_DB'];
+        $res = $db->sql_query($sql);
+        if ($db->sql_num_rows($res) > 0) {
+            while ($row = $db->sql_fetch_assoc($res)) {
                 $imagesArray[] = $this->siteUrl . $row['file_path'] . $row['file_name'];
             }
         }
@@ -298,11 +302,11 @@ public function parseBody($str, $altConf='bodytext')
         if ($this->conf[$altConf . '.']['doubleLF']) {
             $str = preg_replace("/\n/", "\n\n", $str);
         }
-            // Regular parsing:
+        // Regular parsing:
         $str = preg_replace('/<br\s*\/?>/i', LF, $str);
         $str = $this->cObj->stdWrap($str, $this->conf[$altConf . '.']['stdWrap.']);
 
-            // Then all a-tags:
+        // Then all a-tags:
         $aConf = array();
         $aConf['parseFunc.']['tags.']['a'] = 'USER';
         $aConf['parseFunc.']['tags.']['a.']['userFunc'] = 'tx_directmail_pi1->atag_to_http';
@@ -416,7 +420,7 @@ public function renderHeader($str, $type = 0)
             }
         }
 
-        return "";
+        return '';
     }
 
     /**
@@ -452,7 +456,7 @@ public function breakContent($str)
         $cParts = explode(LF, $str);
         $lines = array();
         foreach ($cParts as $substrs) {
-            $lines[] = $this->breakLines($substrs, "");
+            $lines[] = $this->breakLines($substrs, '');
         }
         return implode(LF, $lines);
     }
diff --git a/Classes/Readmail.php b/Classes/Readmail.php
index 88bc76093..db745f1bf 100644
--- a/Classes/Readmail.php
+++ b/Classes/Readmail.php
@@ -21,16 +21,15 @@
  * Analysis of return mail reason is enhanced by checking more possible reason texts.
  * Tested on mailing list of approx. 1500 members with most domains in M�xico and reason text in English or Spanish.
  *
- * @author		Kasper Sk�rh�j <kasper@typo3.com>
- * @author		Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
+ * @author  Kasper Sk�rh�j <kasper@typo3.com>
+ * @author  Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
  *
- * @package 	TYPO3
- * @subpackage 	tx_directmail
- * @version		$Id: class.readmail.php 6012 2007-07-23 12:54:25Z ivankartolo $
+ * @package  TYPO3
+ * @subpackage  tx_directmail
+ * @version  $Id: class.readmail.php 6012 2007-07-23 12:54:25Z ivankartolo $
  */
 class Readmail
 {
-
     protected $reason_text = array(
         '550' => 'no mailbox|account does not exist|user unknown|user is unknown|unknown user|unknown local part|unrouteable address|does not have an account here|no such user|user not listed|account has been disabled or discontinued|user disabled|unknown recipient|invalid recipient|recipient problem|recipient name is not recognized|mailbox unavailable|550 5\.1\.1 recipient|status: 5\.1\.1|delivery failed 550|550 requested action not taken|receiver not found|unknown or illegal alias|is unknown at host|is not a valid mailbox|no mailbox here by that name|we do not relay|5\.7\.1 unable to relay|cuenta no activa|inactive user|user is inactive|mailaddress is administratively disabled|not found in directory|not listed in public name & address book|destination addresses were unknown|rejected address|not listed in domino directory|domino directory entry does not|550-5\.1.1 The email account that you tried to reach does not exist',
         '551' => 'over quota|quota exceeded|mailbox full|mailbox is full|not enough space on the disk|mailfolder is over the allowed quota|recipient reached disk quota|temporalmente sobre utilizada|recipient storage full|mailbox lleno|user mailbox exceeds allowed size',
@@ -55,14 +54,13 @@ class Readmail
 
     public $serverGMToffsetMinutes = 60;
 
-
     /**
      * Returns special TYPO3 Message ID (MID) from input TO header
      * (the return address of the sent mail from Dmailer)
      *
-     * @param	string		$to Email address, return address string
+     * @param string  $to Email address, return address string
      *
-     * @return	array		array with 'mid', 'rtbl' and 'rid' keys are returned.
+     * @return array  array with 'mid', 'rtbl' and 'rid' keys are returned.
      */
     public function find_MIDfromReturnPath($to)
     {
@@ -83,16 +81,15 @@ public function find_MIDfromReturnPath($to)
     /**
      * Returns special TYPO3 Message ID (MID) from input mail content
      *
-     * @param	string		$content Mail (header) content
+     * @param string  $content Mail (header) content
      *
-     * @return	mixed		If "X-Typo3MID" header is found and integrity is OK,
-     * 	then an array with 'mid', 'rtbl' and 'rid' keys are returned. Otherwise void.
-     * @internal
+     * @return mixed  If "X-Typo3MID" header is found and integrity is OK,
+     *  then an array with 'mid', 'rtbl' and 'rid' keys are returned. Otherwise void.
      */
     public function find_XTypo3MID($content)
     {
-        if (strstr($content, "X-TYPO3MID:")) {
-            $p = explode("X-TYPO3MID:", $content, 2);
+        if (strstr($content, 'X-TYPO3MID:')) {
+            $p = explode('X-TYPO3MID:', $content, 2);
             $l = explode(LF, $p[1], 2);
             list($mid, $hash) = GeneralUtility::trimExplode('-', $l[0]);
             if (md5($mid) == $hash) {
@@ -105,7 +102,7 @@ public function find_XTypo3MID($content)
                 return($out);
             }
         }
-        return "";
+        return '';
     }
 
     /**
@@ -115,7 +112,7 @@ public function find_XTypo3MID($content)
      *
      * @param array $mailParts Output from extractMailHeader()
      *
-     * @return	string		only the content part
+     * @return string  only the content part
      */
     public function getMessage(array $mailParts)
     {
@@ -130,7 +127,7 @@ public function getMessage(array $mailParts)
             } else {
                 $c=$this->getTextContent(
                     'Content-Type: ' . $mailParts['content-type'] . '
-					' . $mailParts['CONTENT']
+     ' . $mailParts['CONTENT']
                 );
             }
         } else {
@@ -209,10 +206,10 @@ public function getCType($str)
      * used to find what reason there was for rejecting the mail
      * Used by the Dmailer, but not exclusively.
      *
-     * @param	string		$c Message Body/text
+     * @param string  $c Message Body/text
      *
-     * @return	array		key/value pairs with analysis result.
-     * 	Eg. "reason", "content", "reason_text", "mailserver" etc.
+     * @return array  key/value pairs with analysis result.
+     *  Eg. "reason", "content", "reason_text", "mailserver" etc.
      */
     public function analyseReturnError($c)
     {
@@ -281,9 +278,9 @@ public function analyseReturnError($c)
      * Try to match reason found in the returned email
      * with the defined reasons (see $reason_text)
      *
-     * @param	string		$text Content of the returned email
+     * @param string  $text Content of the returned email
      *
-     * @return	int		The error code.
+     * @return int  The error code.
      */
     public function extractReason($text)
     {
@@ -334,7 +331,7 @@ public function decodeHeaderString($str)
      * @param string $str Value from a header field containing name/email values.
      *
      * @return array Array with the name and email in.
-     * 	Email is validated, otherwise not set.
+     *  Email is validated, otherwise not set.
      */
     public function extractNameEmail($str)
     {
@@ -431,9 +428,9 @@ public function getGMToffset($GMT)
      *
      * @param string $content Raw mail content
      * @param int $limit A safety limit that will put a upper length
-     * 	to how many header chars will be processed.
+     *  to how many header chars will be processed.
      *  Set to zero means that there is no limit.
-     *	(Uses a simple substr() to limit the amount of mail data to process to avoid run-away)
+     * (Uses a simple substr() to limit the amount of mail data to process to avoid run-away)
      *
      * @return array An array where each key/value pair is a header-key/value pair.
      * The mail BODY is returned in the key 'CONTENT' if $limit is not set!
diff --git a/Classes/Scheduler/AnalyzeBounceMail.php b/Classes/Scheduler/AnalyzeBounceMail.php
new file mode 100644
index 000000000..15df386a6
--- /dev/null
+++ b/Classes/Scheduler/AnalyzeBounceMail.php
@@ -0,0 +1,287 @@
+<?php
+namespace DirectMailTeam\DirectMail\Scheduler;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use DirectMailTeam\DirectMail\Readmail;
+use Fetch\Message;
+use Fetch\Server;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Scheduler\Task\AbstractTask;
+
+/**
+ * Class AnalyzeBounceMail
+ * @package DirectMailTeam\DirectMail\Scheduler
+ * @author Ivan Kartolo <ivan.kartolo@gmail.com>
+ */
+class AnalyzeBounceMail extends AbstractTask
+{
+    /**
+     * url of the mail server
+     * @var string
+     */
+    protected $server;
+
+    /**
+     * Port number of the mail server
+     * @var int
+     */
+    protected $port;
+
+    /**
+     * Username to use to authenticate
+     * @var string
+     */
+    protected $user;
+
+    /**
+     * Password of the user
+     * @var string
+     */
+    protected $password;
+
+    /**
+     * Mailserver type (imap or pop3)
+     * @var string
+     */
+    protected $service;
+
+    /**
+     * Maximum number of bounce mail to be processed
+     * @var int
+     */
+    protected $maxProcessed;
+
+    /**
+     * @return int
+     */
+    public function getPort()
+    {
+        return $this->port;
+    }
+
+    /**
+     * @param int $port
+     */
+    public function setPort($port)
+    {
+        $this->port = $port;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * @param string $user
+     */
+    public function setUser($user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    /**
+     * @param string $password
+     */
+    public function setPassword($password)
+    {
+        $this->password = $password;
+    }
+
+    /**
+     * @return string
+     */
+    public function getService()
+    {
+        return $this->service;
+    }
+
+    /**
+     * @param string $service
+     */
+    public function setService($service)
+    {
+        $this->service = $service;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getServer()
+    {
+        return $this->server;
+    }
+
+    /**
+     * @param mixed $server
+     */
+    public function setServer($server)
+    {
+        $this->server = $server;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getMaxProcessed()
+    {
+        return $this->maxProcessed;
+    }
+
+    /**
+     * @param mixed $maxProcessed
+     */
+    public function setMaxProcessed($maxProcessed)
+    {
+        $this->maxProcessed = (int) $maxProcessed;
+    }
+
+    /**
+     * execute the scheduler task.
+     *
+     * @return bool
+     */
+    public function execute()
+    {
+        // try connect to mail server
+        $mailServer = $this->connectMailServer();
+        if ($mailServer instanceof Server) {
+            // we are connected to mail server
+            // get unread mails
+            $messages = $mailServer->search('UNSEEN', $this->maxProcessed);
+            /** @var Message $message The message object */
+            foreach ($messages as $i => $message) {
+                // process the mail
+                if ($this->processBounceMail($message)) {
+                    // set delete
+                    $message->delete();
+                } else {
+                    $message->setFlag('SEEN');
+                }
+            }
+
+            // expunge to delete permanently
+            $mailServer->expunge();
+            imap_close($mailServer->getImapStream());
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Process the bounce mail
+     * @param Message $message the message object
+     * @return bool true if bounce mail can be parsed, else false
+     */
+    private function processBounceMail($message)
+    {
+        /** @var Readmail $readMail */
+        $readMail = GeneralUtility::makeInstance(Readmail::class);
+
+        // get attachment
+        $attachmentArray = $message->getAttachments();
+        $midArray = array();
+        if (is_array($attachmentArray)) {
+            foreach ($attachmentArray as $v => $attachment) {
+                $bouncedMail = $attachment->getData();
+                // Find mail id
+                $midArray = $readMail->find_XTypo3MID($bouncedMail);
+                if (is_array($midArray)) {
+                    // if mid, rid and rtbl are found, then continue
+                    break;
+                }
+            }
+            // Extract text content
+            $cp = $readMail->analyseReturnError($message->getMessageBody());
+
+            $res = $this->getDatabaseConnection()->exec_SELECTquery(
+                'uid,email',
+                'sys_dmail_maillog',
+                'rid=' . intval($midArray['rid']) . ' AND rtbl="' .
+                $this->getDatabaseConnection()->quoteStr($midArray['rtbl'], 'sys_dmail_maillog') . '"' .
+                ' AND mid=' . intval($midArray['mid']) . ' AND response_type=0'
+            );
+
+            // only write to log table, if we found a corresponding recipient record
+            if ($this->getDatabaseConnection()->sql_num_rows($res)) {
+                $row = $this->getDatabaseConnection()->sql_fetch_assoc($res);
+                $midArray['email'] = $row['email'];
+                $insertFields = array(
+                    'tstamp' => $GLOBALS['EXEC_TIME'],
+                    'response_type' => -127,
+                    'mid' => intval($midArray['mid']),
+                    'rid' => intval($midArray['rid']),
+                    'email' => $midArray['email'],
+                    'rtbl' => $midArray['rtbl'],
+                    'return_content' => serialize($cp),
+                    'return_code' => intval($cp['reason'])
+                );
+                return $this->getDatabaseConnection()->exec_INSERTquery('sys_dmail_maillog', $insertFields);
+            } else {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Create connection to mail server.
+     * Return mailServer object or false on error
+     *
+     * @return bool|Server
+     */
+    private function connectMailServer()
+    {
+        // check if we can connect using the given data
+        /** @var Server $mailServer */
+        $mailServer = GeneralUtility::makeInstance(
+            Server::class,
+            $this->server,
+            (int) $this->port,
+            $this->service
+        );
+
+        // set mail username and password
+        $mailServer->setAuthentication($this->user, $this->password);
+
+        try {
+            $imapStream = $mailServer->getImapStream();
+            return $mailServer;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Get the DB global object
+     *
+     * @return \TYPO3\CMS\Core\Database\DatabaseConnection
+     */
+    protected function getDatabaseConnection()
+    {
+        return $GLOBALS['TYPO3_DB'];
+    }
+}
diff --git a/Classes/Scheduler/AnalyzeBounceMailAdditionalFields.php b/Classes/Scheduler/AnalyzeBounceMailAdditionalFields.php
new file mode 100644
index 000000000..de1b8d27c
--- /dev/null
+++ b/Classes/Scheduler/AnalyzeBounceMailAdditionalFields.php
@@ -0,0 +1,162 @@
+<?php
+namespace DirectMailTeam\DirectMail\Scheduler;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use Fetch\Server;
+use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Lang\LanguageService;
+use TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface;
+use TYPO3\CMS\Scheduler\Controller\SchedulerModuleController;
+use TYPO3\CMS\Scheduler\Task\AbstractTask;
+
+/**
+ * Class AnalyzeBounceMailAdditionalFields
+ * This provides additional fields for the AnalyzeBounceMail task.
+ *
+ * @package DirectMailTeam\DirectMail\Scheduler
+ * @author Ivan Kartolo <ivan.kartolo@gmail.com>
+ */
+class AnalyzeBounceMailAdditionalFields implements AdditionalFieldProviderInterface
+{
+    public function __construct()
+    {
+        // add locallang file
+        $this->getLanguangeService()->includeLLFile('EXT:direct_mail/Resources/Private/Language/locallang_mod2-6.xlf');
+    }
+
+    /**
+     * This method is used to define new fields for adding or editing a task
+     * In this case, it adds an email field
+     *
+     * @param array $taskInfo reference to the array containing the info used in the add/edit form
+     * @param AnalyzeBounceMail $task when editing, reference to the current task object. Null when adding.
+     * @param SchedulerModuleController $schedulerModule reference to the calling object (Scheduler's BE module)
+     *
+     * @return array Array containg all the information pertaining to the additional fields
+     *               The array is multidimensional, keyed to the task class name and each field's id
+     *               For each field it provides an associative sub-array with the following:
+     *               ['code'] => The HTML code for the field
+     *               ['label'] => The label of the field (possibly localized)
+     *               ['cshKey'] => The CSH key for the field
+     *               ['cshLabel'] => The code of the CSH label
+     */
+    public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule)
+    {
+        // TODO: Implement getAdditionalFields() method.
+        // fields: server, port, user, pw, service (imap, pop3)
+        $serverHTML = '<input type="text" name="tx_scheduler[bounceServer]" value="' . ($task ? $task->getServer() : '') . '"/>';
+        $portHTML = '<input type="text" name="tx_scheduler[bouncePort]" value="' . ($task ? $task->getPort() : '') . '"/>';
+        $userHTML = '<input type="text" name="tx_scheduler[bounceUser]" value="' . ($task ? $task->getUser() : '') . '"/>';
+        $passwordHTML = '<input type="password" name="tx_scheduler[bouncePassword]" value="' . ($task ? $task->getPassword() : '') . '"/>';
+        $maxProcessedHTML = '<input type="text" name="tx_scheduler[bounceProcessed]" value="' . ($task ? $task->getMaxProcessed() : '') . '"/>';
+        $serviceHTML = '<select name="tx_scheduler[bounceService]" id="bounceService">' .
+            '<option value="imap" ' . ($task->getService == 'imap'? 'selected="selected"' : '') . '>IMAP</option>' .
+            '<option value="pop3" ' . ($task->getService == 'pop3'? 'selected="selected"' : '') . '>POP3</option>' .
+            '</select>';
+
+        $additionalFields = array();
+        $additionalFields['server'] = $this->createAdditionalFields('server', $serverHTML);
+        $additionalFields['port'] = $this->createAdditionalFields('port', $portHTML);
+        $additionalFields['user'] = $this->createAdditionalFields('user', $userHTML);
+        $additionalFields['password'] = $this->createAdditionalFields('password', $passwordHTML);
+        $additionalFields['service'] = $this->createAdditionalFields('service', $serviceHTML);
+        $additionalFields['maxProcessed'] = $this->createAdditionalFields('maxProcessed', $maxProcessedHTML);
+
+        return $additionalFields;
+    }
+
+    /**
+     * Takes care of saving the additional fields' values in the task's object
+     *
+     * @param array $submittedData An array containing the data submitted by the add/edit task form
+     * @param AnalyzeBounceMail $task Reference to the scheduler backend module
+     * @return void
+     */
+    public function saveAdditionalFields(array $submittedData, AbstractTask $task)
+    {
+        $task->setServer($submittedData['bounceServer']);
+        $task->setPort((int)$submittedData['bouncePort']);
+        $task->setUser($submittedData['bounceUser']);
+        $task->setPassword($submittedData['bouncePassword']);
+        $task->setService($submittedData['bounceService']);
+        $task->setMaxProcessed($submittedData['bounceProcessed']);
+    }
+
+    /**
+     * Validates the additional fields' values
+     *
+     * @param array $submittedData An array containing the data submitted by the add/edit task form
+     * @param SchedulerModuleController $schedulerModule Reference to the scheduler backend module
+     * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
+     */
+    public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $schedulerModule)
+    {
+        // check if PHP IMAP is installed
+        if (extension_loaded('imap')) {
+            // check if we can connect using the given data
+            /** @var Server $mailServer */
+            $mailServer = GeneralUtility::makeInstance(
+                \Fetch\Server::class,
+                $submittedData['bounceServer'],
+                (int)$submittedData['bouncePort'],
+                $submittedData['bounceService']
+            );
+
+            $mailServer->setAuthentication($submittedData['bounceUser'], $submittedData['bouncePassword']);
+
+            try {
+                $imapStream = $mailServer->getImapStream();
+                $return = true;
+            } catch (\Exception $e) {
+                $schedulerModule->addMessage(
+                    $this->getLanguangeService()->getLL('scheduler.bounceMail.dataVerification') .
+                    $e->getMessage(),
+                    FlashMessage::ERROR
+                );
+                $return = false;
+            }
+        } else {
+            $schedulerModule->addMessage(
+                $this->getLanguangeService()->getLL('scheduler.bounceMail.phpImapError'),
+                FlashMessage::ERROR
+            );
+            $return = false;
+        }
+
+        return $return;
+    }
+
+    protected function createAdditionalFields($fieldName, $fieldHTML)
+    {
+        // create server input field
+        return array(
+            'code'     => $fieldHTML,
+            'label'    => $this->getLanguangeService()->getLL('scheduler.bounceMail.' . $fieldName),
+            'cshKey'   => $fieldName,
+            'cshLabel' => $this->getLanguangeService()->getLL('scheduler.bounceMail.csh.' . $fieldName)
+        );
+    }
+
+    /**
+     * Get languange service
+     *
+     * @return LanguageService
+     */
+    protected function getLanguangeService()
+    {
+        return $GLOBALS['LANG'];
+    }
+}
diff --git a/Classes/Scheduler/MailFromDraft.php b/Classes/Scheduler/MailFromDraft.php
index dc71f58d1..a9d01f3ab 100644
--- a/Classes/Scheduler/MailFromDraft.php
+++ b/Classes/Scheduler/MailFromDraft.php
@@ -14,10 +14,10 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-use \TYPO3\CMS\Backend\Utility\BackendUtility;
-use \TYPO3\CMS\Core\Utility\GeneralUtility;
-use \TYPO3\CMS\Scheduler\Task\AbstractTask;
-use \DirectMailTeam\DirectMail\DirectMailUtility;
+use DirectMailTeam\DirectMail\DirectMailUtility;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Scheduler\Task\AbstractTask;
 
 /**
  * Class tx_directmail_Scheduler_MailFromDraft
@@ -30,7 +30,6 @@
  */
 class MailFromDraft extends AbstractTask
 {
-
     public $draftUid = null;
 
     protected $hookObjects = array();
@@ -61,31 +60,41 @@ public function execute()
 
             $draftRecord = BackendUtility::getRecord('sys_dmail', $this->draftUid);
 
-                // get some parameters from tsConfig
+            // get some parameters from tsConfig
             $tsConfig = BackendUtility::getModTSconfig($draftRecord['pid'], 'mod.web_modules.dmail');
             $defaultParams = $tsConfig['properties'];
 
-                // make a real record out of it
+            // make a real record out of it
             unset($draftRecord['uid']);
             $draftRecord['tstamp'] = time();
             // set the right type (3 => 1, 2 => 0)
             $draftRecord['type'] -= 2;
 
-                // Insert the new dmail record into the DB
+            // check if domain record is set
+            if ((TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI) && (int)$draftRecord['type'] !== 1 && empty($draftRecord['use_domain'])) {
+                throw new \Exception('No domain record set!');
+            }
+
+            // Insert the new dmail record into the DB
             $GLOBALS['TYPO3_DB']->exec_INSERTquery('sys_dmail', $draftRecord);
             $this->dmailUid = $GLOBALS['TYPO3_DB']->sql_insert_id();
 
-                // Call a hook after insertion of the cloned dmail record
-                // This hook can get used to modify fields of the direct mail.
-                // For example the current date could get appended to the subject.
+            // Call a hook after insertion of the cloned dmail record
+            // This hook can get used to modify fields of the direct mail.
+            // For example the current date could get appended to the subject.
             $hookParams['draftRecord'] = &$draftRecord;
             $hookParams['defaultParams'] = &$defaultParams;
             $this->callHooks('postInsertClone', $hookParams);
 
-                // fetch the cloned record
+            // fetch the cloned record
             $mailRecord = BackendUtility::getRecord('sys_dmail', $this->dmailUid);
 
-            DirectMailUtility::fetchUrlContentsForDirectMailRecord($mailRecord, $defaultParams);
+            // fetch mail content
+            $result = DirectMailUtility::fetchUrlContentsForDirectMailRecord($mailRecord, $defaultParams, true);
+
+            if ($result['errors'] !== array()) {
+                throw new \Exception('Failed to fetch contents: ' . implode(', ', $result['errors']));
+            }
 
             $mailRecord = BackendUtility::getRecord('sys_dmail', $this->dmailUid);
             if ($mailRecord['mailContent'] && $mailRecord['renderedsize'] > 0) {
@@ -93,13 +102,13 @@ public function execute()
                     'scheduled' => time(),
                     'issent'    => 1
                 );
-                    // Call a hook before enqueuing the cloned dmail record into
-                    // the direct mail delivery queue
+                // Call a hook before enqueuing the cloned dmail record into
+                // the direct mail delivery queue
                 $hookParams['mailRecord'] = &$mailRecord;
                 $hookParams['updateData'] = &$updateData;
                 $this->callHooks('enqueueClonedDmail', $hookParams);
-                    // Update the cloned dmail so it will get sent upon next
-                    // invocation of the mailer engine
+                // Update the cloned dmail so it will get sent upon next
+                // invocation of the mailer engine
                 $GLOBALS['TYPO3_DB']->exec_UPDATEquery('sys_dmail', 'uid = ' . intval($this->dmailUid), $updateData);
             }
         }
diff --git a/Classes/Scheduler/MailFromDraftAdditionalFields.php b/Classes/Scheduler/MailFromDraftAdditionalFields.php
index 15245f32a..b92e35973 100644
--- a/Classes/Scheduler/MailFromDraftAdditionalFields.php
+++ b/Classes/Scheduler/MailFromDraftAdditionalFields.php
@@ -70,7 +70,7 @@ public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleCont
             $drafts = array_merge($drafts, $draftsExternal);
         }
 
-            // Create the input field
+        // Create the input field
         $fieldID = 'task_selecteddraft';
         $fieldHtml = '';
 
diff --git a/Classes/SelectCategories.php b/Classes/SelectCategories.php
index 9bce6fb8d..6b8c729ab 100644
--- a/Classes/SelectCategories.php
+++ b/Classes/SelectCategories.php
@@ -16,7 +16,6 @@
 
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use DirectMailTeam\DirectMail;
 
 /**
  * Localize categories for backend forms
@@ -43,18 +42,18 @@ public function get_localized_categories(array $params)
     {
         global $LANG;
 
-/*
-        $params['items'] = &$items;
-        $params['config'] = $config;
-        $params['TSconfig'] = $iArray;
-        $params['table'] = $table;
-        $params['row'] = $row;
-        $params['field'] = $field;
-*/
+        /*
+                $params['items'] = &$items;
+                $params['config'] = $config;
+                $params['TSconfig'] = $iArray;
+                $params['table'] = $table;
+                $params['row'] = $row;
+                $params['field'] = $field;
+        */
         $config = $params['config'];
         $table = $config['itemsProcFunc_config']['table'];
 
-            // initialize backend user language
+        // initialize backend user language
         if ($LANG->lang && ExtensionManagementUtility::isLoaded('static_info_tables')) {
             $sysPage = GeneralUtility::makeInstance('TYPO3\CMS\Frontend\Page\PageRepository');
             $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
diff --git a/Classes/Utility/FlashMessageRenderer.php b/Classes/Utility/FlashMessageRenderer.php
new file mode 100644
index 000000000..393b929d6
--- /dev/null
+++ b/Classes/Utility/FlashMessageRenderer.php
@@ -0,0 +1,51 @@
+<?php
+namespace DirectMailTeam\DirectMail\Utility;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Messaging\FlashMessageRendererResolver;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+/**
+ * Static class
+ * Functions in this class are used by more than one module
+ *
+ * @author		Daniel Lorenz	<daniel.lorenz@tritum.de>
+ *
+ * @package		TYPO3
+ * @subpackage	tx_directmail
+ */
+class FlashMessageRenderer
+{
+    /**
+     * @param FlashMessage $flashMessage
+     *
+     * @return string
+     */
+    public function render(FlashMessage $flashMessage) {
+        if (version_compare(TYPO3_branch, '8.6', '>=')) {
+            return GeneralUtility::makeInstance(FlashMessageRendererResolver::class)
+                ->resolve()
+                ->render([$flashMessage]);
+        }
+        if (version_compare(TYPO3_branch, '8.0', '>=')) {
+            return $flashMessage->getMessageAsMarkup();
+        }
+        if (version_compare(TYPO3_branch, '7.6', '>=')) {
+            return $flashMessage->render();
+        }
+        return '';
+    }
+}
diff --git a/Classes/Utility/TsParserExt.php b/Classes/Utility/TsParserExt.php
index 0c180f482..e9124871f 100644
--- a/Classes/Utility/TsParserExt.php
+++ b/Classes/Utility/TsParserExt.php
@@ -40,18 +40,18 @@ public static function displayMessage()
         );
         $link = BackendUtility::getModuleUrl('tools_ExtensionmanagerExtensionmanager', $parameters);
 
-        $out = "
-		<div style=\"position:absolute;top:10px;right:10px; width:300px;\">
-			<div class=\"typo3-message message-information\">
-					<div class=\"message-header\">" . $GLOBALS['LANG']->sL('LLL:EXT:direct_mail/Resources/Private/Language/locallang_mod2-6.xlf:update_optionHeader') . "</div>
-					<div class=\"message-body\">
-						" . $GLOBALS['LANG']->sL("LLL:EXT:direct_mail/Resources/Private/Language/locallang_mod2-6.xlf:update_optionMsg") . "<br />
-						<a style=\"text-decoration:underline;\" href=\"" . $link . "\">
-						" . $GLOBALS['LANG']->sL("LLL:EXT:direct_mail/Resources/Private/Language/locallang_mod2-6.xlf:update_optionLink") . "</a>
+        $out = '
+		<div style="position:absolute;top:10px;right:10px; width:300px;">
+			<div class="typo3-message message-information">
+					<div class="message-header">' . $GLOBALS['LANG']->sL('LLL:EXT:direct_mail/Resources/Private/Language/locallang_mod2-6.xlf:update_optionHeader') . '</div>
+					<div class="message-body">
+						' . $GLOBALS['LANG']->sL('LLL:EXT:direct_mail/Resources/Private/Language/locallang_mod2-6.xlf:update_optionMsg') . '<br />
+						<a style="text-decoration:underline;" href="' . $link . '">
+						' . $GLOBALS['LANG']->sL('LLL:EXT:direct_mail/Resources/Private/Language/locallang_mod2-6.xlf:update_optionLink') . '</a>
 					</div>
 				</div>
 			</div>
-			";
+			';
 
         return $out;
     }
diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
index 307442f00..1283cf706 100644
--- a/Configuration/TCA/Overrides/pages.php
+++ b/Configuration/TCA/Overrides/pages.php
@@ -6,3 +6,7 @@
 // pages modified
 $GLOBALS['TCA']['pages']['columns']['module']['config']['items'][] =
     array('LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:pages.module.I.5', 'dmail');
+
+if (is_array($GLOBALS['TCA']['pages']['ctrl']['typeicon_classes'])) {
+    $GLOBALS['TCA']['pages']['ctrl']['typeicon_classes']['contains-dmail'] = 'tcarecords-pages-contains-dmail';
+}
diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
new file mode 100644
index 000000000..bf5958830
--- /dev/null
+++ b/Configuration/TCA/Overrides/sys_template.php
@@ -0,0 +1,6 @@
+<?php
+defined('TYPO3_MODE') or die();
+
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('direct_mail', 'Configuration/TypoScript/boundaries/', 'Direct Mail Content Boundaries');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('direct_mail', 'Configuration/TypoScript/plaintext/', 'Direct Mail Plain text');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('direct_mail', 'Configuration/TypoScript/tt_news_plaintext/', 'Direct Mail News Plain text');
diff --git a/Configuration/TCA/sys_dmail.php b/Configuration/TCA/sys_dmail.php
index 826f50781..982967909 100644
--- a/Configuration/TCA/sys_dmail.php
+++ b/Configuration/TCA/sys_dmail.php
@@ -8,10 +8,11 @@
         'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
         'title' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail',
         'delete' => 'deleted',
-        'iconfile' => TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('direct_mail') . 'res/gfx/mail.gif',
+        'iconfile' => TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('direct_mail') . 'Resources/Public/Icons/mail.gif',
         'type' => 'type',
         'useColumnsForDefaultValues' => 'from_email,from_name,replyto_email,replyto_name,organisation,priority,encoding,charset,sendOptions,type',
         'dividers2tabs' => true,
+        'languageField' => 'sys_language_uid'
     ),
     'interface' => array(
         'showRecordFieldList' => 'sys_language_uid,type,plainParams,HTMLParams,subject,from_name,from_email,replyto_name,replyto_email,return_path,organisation,attachment,priority,encoding,charset,sendOptions,includeMedia,flowedFormat,issent,renderedsize,use_domain,use_rdct,long_link_mode,authcode_fieldList'
@@ -21,6 +22,7 @@
             'exclude' => 1,
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
             'config' => array(
+                'default' => '0',
                 'type' => 'select',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
diff --git a/Configuration/TCA/sys_dmail_category.php b/Configuration/TCA/sys_dmail_category.php
index 12376ae83..5d1825928 100644
--- a/Configuration/TCA/sys_dmail_category.php
+++ b/Configuration/TCA/sys_dmail_category.php
@@ -15,12 +15,12 @@
         'enablecolumns' => array(
             'disabled' => 'hidden',
         ),
-        'iconfile' => TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('direct_mail') . 'res/gfx/icon_tx_directmail_category.gif',
+        'iconfile' => TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('direct_mail') . 'Resources/Public/Icons/icon_tx_directmail_category.gif',
     ),
     'interface' => array(
         'showRecordFieldList' => 'hidden,category'
     ),
-    'feInterface' => $TCA['sys_dmail_category']['feInterface'],
+    'feInterface' => $GLOBALS['TCA']['sys_dmail_category']['feInterface'],
     'columns' => array(
         'sys_language_uid' => array(
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
diff --git a/Configuration/TCA/sys_dmail_group.php b/Configuration/TCA/sys_dmail_group.php
index 872eaa683..3ef44ebb5 100644
--- a/Configuration/TCA/sys_dmail_group.php
+++ b/Configuration/TCA/sys_dmail_group.php
@@ -8,7 +8,7 @@
         'prependAtCopy' => 'LLL:EXT:lang/locallang_general.xlf:LGL.prependAtCopy',
         'title' => 'LLL:EXT:direct_mail/Resources/Private/Language/locallang_tca.xlf:sys_dmail_group',
         'delete' => 'deleted',
-        'iconfile' => TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('direct_mail') . 'res/gfx/mailgroup.gif',
+        'iconfile' => TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('direct_mail') . 'Resources/Public/Icons/mailgroup.gif',
         'type' => 'type',
     ),
     'interface' => array(
diff --git a/Configuration/TypoScript/plaintext/setup.txt b/Configuration/TypoScript/plaintext/setup.txt
index 1f82871e0..d1e8ca43e 100644
--- a/Configuration/TypoScript/plaintext/setup.txt
+++ b/Configuration/TypoScript/plaintext/setup.txt
@@ -6,8 +6,7 @@
 
 plugin.tx_directmail_pi1 = USER
 plugin.tx_directmail_pi1 {
-  includeLibs = typo3conf/ext/direct_mail/pi1/class.tx_directmail_pi1.php
-  userFunc = tx_directmail_pi1->main
+  userFunc = DirectMailTeam\DirectMail\Plugin\DirectMail->main
 
   siteUrl = {$plugin.tx_directmail_pi1.siteUrl}
   flowedFormat = {$plugin.tx_directmail_pi1.flowedFormat}
diff --git a/Documentation/Configuration/ConfiguringMultilanguage/index.rst b/Documentation/Configuration/ConfiguringMultilanguage/index.rst
new file mode 100644
index 000000000..105313a81
--- /dev/null
+++ b/Documentation/Configuration/ConfiguringMultilanguage/index.rst
@@ -0,0 +1,29 @@
+Usage/configuring multi language
+--------------------------------
+
+When the page has a translation you have the possibility to select a specific language/translation of the page when creating a new Direct Mail. It is also possible to target receiver groups based on a language restriction.
+Creating a Direct Mail will provide the option in the BE module to use a translation of the page instead of the original only if a page is translated.
+
+In the last step of creating a Direct Mail, receiver groups are shown that match the language selection. When only 1 group is present, the select is not shown but this group is automatically selected.
+
+Configuring a language for recipients
+"""""""""""""""""""""""""""""""""""""
+
+In a recipient list an option is available to select a language for that list with as default <All languages>. This option is used at the last step of creating a Direct Mail to determine the receivers.
+
+Language mapping
+""""""""""""""""
+
+Mapping language params to the sys_language_uid can be done by tsConfig and with an automatic fallback to `&L=sys_language_uid`.
+
+Example tsConfig::
+
+mod.web_modules.dmail {
+    langParams.0 =
+    langParams.1 = &L=1
+}
+
+
+
+
+
diff --git a/Documentation/Configuration/ConfiguringTheAnalysisOfReturnedMails/Index.rst b/Documentation/Configuration/ConfiguringTheAnalysisOfReturnedMails/Index.rst
index e5cc1cf6c..4e3adc967 100644
--- a/Documentation/Configuration/ConfiguringTheAnalysisOfReturnedMails/Index.rst
+++ b/Documentation/Configuration/ConfiguringTheAnalysisOfReturnedMails/Index.rst
@@ -18,14 +18,12 @@
 Configuring the analysis of returned mails
 ------------------------------------------
 
-There are probably many ways to configure analysis of returned mails.
-We propose an approach based on open Source program fetchmail. For
-more information about fetchmail, see `The fetchmail home page
-<http://catb.org/~esr/fetchmail/>`_ .
+The analysis of the return mails can now be set in the scheduler job.
+It needs the `PHP-IMAP <http://php.net/manual/en/book.imap.php>`_
+extension.
 
-#. Create a mailbox (popbox) for the returned mails, for example:
-   “bounce@pophost.org”. This mailbox should be located on the same
-   machine as the TYPO3 installation.
+#. Create a mailbox (IMAP or POP) for the returned mails, for example:
+   “bounce@domain.tld”.
 
 #. Use the Module Configuration function of the Direct mail module to
    configure this same address in the 'Return Path' field in Page TS
@@ -33,49 +31,22 @@ more information about fetchmail, see `The fetchmail home page
 
    |img-17|
 
-#. fetchmail can read a mailbox and then do something with these mails.
-   We are going to use fetchmail to “pipe” the returned mails to the
-   “returnmail.phpsh” script. fetchmail uses a configuration file that
-   should be outside the web accessible folder. For examble, it may be
-   positionned on the root: /root/.fetchmailrc. ls -l of this file may
-   look like this:
+#. Now create a task **Analyze bounce mail** in the scheduler module.
 
-   ::
+#. There you can set following parameter:
 
-      -rwx--x---  1 root root 208 Jun 20 12:50 /root/.fetchmailrc
+   ======================================    ====================================
+   Parameter                                 Description
+   ======================================    ====================================
+   Server URL/IP                             The URL or IP of the mail server
+   Port number                               Port of the mail server
+   Username                                  Bounce mail address
+   Password                                  Password of the bounce mail account
+   Type of mailserver                        IMAP or POP
+   Number of bounce mail to be processed     How many mail to be fetch in a cycle
+   ======================================    ====================================
 
-#. Insert the following line in file .fetchmailrc, substituting variables
-   my.pophost.org with the name of your mailserver, and username-of-
-   popbox and password-of-popbox with the name and password of your
-   bounce mailbox:
-
-   ::
-
-      poll my.pophost.org timeout 40 username "username-of-popbox" password "password-of-popbox" flush mda "/path/to/your/TYPO3/installation/typo3conf/ext/direct_mail/res/scripts/returnmail.phpsh"
-
-#. Note that the absolute path to the script must be specified. If the
-   extension is installed as a global extension, substitute typo3conf
-   with typo3 in the above path. Make sure that script returnmail.phpsh
-   has sufficient permissions to be run by the server. Note also that
-   returnmail.phpsh is a shell script and requires the availability of a
-   PHP binary, "/usr/bin/php”. Depending on your server configuration,
-   you may have to edit the first line of the script to refer to the
-   location of the PHP binary.
-
-#. If you have configured multiple Direct Mail folders each with its own
-   return mailbox, you will need a similar line for each mailbox.
-
-#. Use the command “crontab -e” (as root), or cPanel tool, to add the
-   following cron task. You need only one, even if you have configured
-   multiple folders of Direct Mail. This example setting will run the
-   cron task every 10 minutes:
-
-   ::
-
-      */10 * * * * fetchmail> /dev/null
-
-#. Use the Direct Mail module to send a newsletter to a bouncing address.
-   Use the Statistics function of the module to verify that the bounced
-   mail is accounted for in the displayed statistics.
+#. If you have more than one bounce account, you have to create a new scheduler
+   task for every bounce mail account.
 
 
diff --git a/Documentation/Configuration/EnablingClickStatistics/Index.rst b/Documentation/Configuration/EnablingClickStatistics/Index.rst
index 975f8147c..c99b6231c 100644
--- a/Documentation/Configuration/EnablingClickStatistics/Index.rst
+++ b/Documentation/Configuration/EnablingClickStatistics/Index.rst
@@ -41,7 +41,7 @@ Example:
 
 ::
 
-   <img src="typo3conf/ext/direct_mail/res/gfx/dmailerping.gif" width="1" height="1" dmailerping="1" />
+   <img src="typo3conf/ext/direct_mail/Resources/Public/Icons/dmailerping.gif" width="1" height="1" dmailerping="1" />
 
 Note that the result of the jumpurl setting on the above HTML line is
 that the src attribute will be replaced by one that refers to the
diff --git a/Documentation/Configuration/Hooks/Index.rst b/Documentation/Configuration/Hooks/Index.rst
index 21f075bf1..6b5c10149 100755
--- a/Documentation/Configuration/Hooks/Index.rst
+++ b/Documentation/Configuration/Hooks/Index.rst
@@ -51,6 +51,21 @@ cmd_stats
    Description
          This hook can be used to influence the output of the overall statistic output
 
+.. _hooks_cmd_stats_linkResponses:
+cmd_stats_linkResponses
+'''''''''
+
+.. container:: table-row
+
+   Property
+         ``$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['direct_mail']['mod4']['cmd_stats_linkResponses']``
+
+   Method
+         ``cmd_stats_linkResponses``
+
+   Description
+         This hook can be used to influence the output of the statistics section "link responses" 
+
 .. _hooks_renderCType:
 renderCType
 '''''''''''
diff --git a/Documentation/Configuration/Index.rst b/Documentation/Configuration/Index.rst
index 5f997289d..6552b3d79 100644
--- a/Documentation/Configuration/Index.rst
+++ b/Documentation/Configuration/Index.rst
@@ -33,6 +33,7 @@ Configuration
    ConfiguringPlainTextRendering/Index
    ConfiguringPlainTextRenderingOfNewsRecords/Index
    ConfiguringTheUseOfCategories/Index
+   ConfiguringMultilanguage/Index
    EnablingClickStatistics/Index
    AutomaticallyInvokeTheMailerEngine/Index
    ConfiguringTheAnalysisOfReturnedMails/Index
diff --git a/Documentation/Images/manual_html_m2a446403.png b/Documentation/Images/manual_html_m2a446403.png
index cdd93e83c..bd7fca764 100644
Binary files a/Documentation/Images/manual_html_m2a446403.png and b/Documentation/Images/manual_html_m2a446403.png differ
diff --git a/Migrations/Code/ClassAliasMap.php b/Migrations/Code/ClassAliasMap.php
index 14cb077f4..3629f9fab 100644
--- a/Migrations/Code/ClassAliasMap.php
+++ b/Migrations/Code/ClassAliasMap.php
@@ -1,5 +1,6 @@
 <?php
 return array(
+    'tx_directmail_pi1' => 'DirectMailTeam\\DirectMail\\Plugin\\DirectMail',
     'tx_directmail_checkjumpurl' => 'DirectMailTeam\\DirectMail\\Checkjumpurl',
     'tx_directmail_container' => 'DirectMailTeam\\DirectMail\\Container',
     'tx_directmail_static' => 'DirectMailTeam\\DirectMail\\DirectMailUtility',
diff --git a/Resources/Private/Language/de.locallangConfiguration.xlf b/Resources/Private/Language/de.locallangConfiguration.xlf
deleted file mode 100644
index 253490277..000000000
--- a/Resources/Private/Language/de.locallangConfiguration.xlf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:08:10Z">
-		<header>
-			<description>Labels for the main Direct Mail module</description>
-			<type>module</type>
-			<fileId>EXT:direct_mail/mod6/locallang_mod.xml</fileId>
-			<labelContext></labelContext>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id="mlang_labels_tabdescr" approved="yes">
-			<source>Edit configuration of the extension</source>
-			<target>Bearbeiten die Konfigrationen der Erweiterung</target>
-		</trans-unit>
-		<trans-unit id="mlang_labels_tablabel" approved="yes">
-			<source>Edit configuration of the extension</source>
-			<target>Bearbeiten die Konfigrationen der Erweiterung</target>
-		</trans-unit>
-		<trans-unit id="mlang_tabs_tab" approved="yes">
-			<source>Configuration</source>
-			<target>Konfiguration</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallangDirectMail.xlf b/Resources/Private/Language/de.locallangDirectMail.xlf
deleted file mode 100644
index 453198c22..000000000
--- a/Resources/Private/Language/de.locallangDirectMail.xlf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:01:36Z">
-		<header>
-			<description>Labels for the main Direct Mail module</description>
-			<type>module</type>
-			<fileId>EXT:direct_mail/mod/locallang.xml</fileId>
-			<labelContext></labelContext>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id="mlang_labels_tabdescr" approved="yes">
-			<source>Direct mailing of newsletters to targeted recipients.</source>
-			<target>Direct mailing von Newslettern an ausgewählte Empfänger.</target>
-		</trans-unit>
-		<trans-unit id="mlang_labels_tablabel" approved="yes">
-			<source>Direct Mailer</source>
-			<target>Direct Mailer</target>
-		</trans-unit>
-		<trans-unit id="mlang_tabs_tab" approved="yes">
-			<source>Direct Mail</source>
-			<target>Direct Mail</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallangMailerEngine.xlf b/Resources/Private/Language/de.locallangMailerEngine.xlf
deleted file mode 100644
index ed503cc70..000000000
--- a/Resources/Private/Language/de.locallangMailerEngine.xlf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:10:50Z">
-		<header>
-			<description>Labels for the Direct Mail module</description>
-			<type>module</type>
-			<fileId>EXT:direct_mail/mod/locallang.xml</fileId>
-			<labelContext></labelContext>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id="mlang_labels_tabdescr" approved="yes">
-			<source>Show the mailing status of the newsletter</source>
-			<target>Zeigt der Versandstatus eines Newsletters an</target>
-		</trans-unit>
-		<trans-unit id="mlang_labels_tablabel" approved="yes">
-			<source>Mailing status</source>
-			<target>Versandstatus eines Newsletters</target>
-		</trans-unit>
-		<trans-unit id="mlang_tabs_tab" approved="yes">
-			<source>Mailer Engine Status</source>
-			<target>Versand-Status</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallangNavFrame.xlf b/Resources/Private/Language/de.locallangNavFrame.xlf
deleted file mode 100644
index 8938849d0..000000000
--- a/Resources/Private/Language/de.locallangNavFrame.xlf
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:11:24Z">
-		<header>
-			<type>module</type>
-			<description>Language labels for module &quot;DirectMailNavFrame&quot; - header, description</description>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id="mlang_labels_tabdescr" approved="yes">
-			<source>Direct Mailer</source>
-			<target>Direct mailing von Newslettern an ausgewählte Empfänger.</target>
-		</trans-unit>
-		<trans-unit id="mlang_tabs_tab" approved="yes">
-			<source>Direct Mail</source>
-			<target>Direct Mail</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallangRecipientList.xlf b/Resources/Private/Language/de.locallangRecipientList.xlf
deleted file mode 100644
index 4e50d5749..000000000
--- a/Resources/Private/Language/de.locallangRecipientList.xlf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:10:25Z">
-		<header>
-			<description>Labels for the main Direct Mail module</description>
-			<type>module</type>
-			<fileId>EXT:direct_mail/mod/locallang.xml</fileId>
-			<labelContext></labelContext>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id="mlang_labels_tabdescr" approved="yes">
-			<source>Import Recipients from a CSV File.</source>
-			<target>Importieren der Empfängern von einer CSV Datei.</target>
-		</trans-unit>
-		<trans-unit id="mlang_labels_tablabel" approved="yes">
-			<source>Import Recipients (CSV)</source>
-			<target>Importieren der Empfängern (CSV)</target>
-		</trans-unit>
-		<trans-unit id="mlang_tabs_tab" approved="yes">
-			<source>Recipients Lists</source>
-			<target>Empfängerliste</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallangStatistics.xlf b/Resources/Private/Language/de.locallangStatistics.xlf
deleted file mode 100644
index fb3c5092b..000000000
--- a/Resources/Private/Language/de.locallangStatistics.xlf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:11:55Z">
-		<header>
-			<description>Labels for the main Direct Mail module</description>
-			<type>module</type>
-			<fileId>EXT:direct_mail/mod/locallang.xml</fileId>
-			<labelContext></labelContext>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id="mlang_labels_tabdescr" approved="yes">
-			<source>Shows newsletter statistics</source>
-			<target>Zeigt Statistiken eines Newsletters</target>
-		</trans-unit>
-		<trans-unit id="mlang_labels_tablabel" approved="yes">
-			<source>Shows newsletter statistics</source>
-			<target>Zeigt Statistiken eines Newsletters</target>
-		</trans-unit>
-		<trans-unit id="mlang_tabs_tab" approved="yes">
-			<source>Statistics</source>
-			<target>Statistiken</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallang_csh_Configuration.xlf b/Resources/Private/Language/de.locallang_csh_Configuration.xlf
deleted file mode 100644
index 901bb3ebf..000000000
--- a/Resources/Private/Language/de.locallang_csh_Configuration.xlf
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:09:55Z">
-		<header>
-			<description>CSH for Direct Mail Configuration Module</description>
-			<type>CSH</type>
-			<fileId>EXT:direct_mail/Resources/Private/Language/locallang_csh_txdirectmailM6</fileId>
-			<csh_table>_MOD_DirectMailNavFrame_txdirectmailM6</csh_table>
-			<keep_original_text>1</keep_original_text>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id=".alttitle" approved="yes">
-			<source>Direct Mail &gt; Configuration module</source>
-			<target>Direct Mail &gt; Konfiguration-Modul </target>
-		</trans-unit>
-		<trans-unit id=".description" approved="yes">
-			<source>Set the configuration</source>
-			<target>Konfigurieren das Direct Mail-Modul</target>
-		</trans-unit>
-		<trans-unit id=".details" approved="yes">
-			<source>Set the configuration for the direct mail module. Please refer to the manual for the detailed information</source>
-			<target>beziehen Sie bitte sich auf das Handbuch zu ausführlicher Information</target>
-		</trans-unit>
-		<trans-unit id="folders.alttitle" approved="yes">
-			<source>Available Direct Mail folders</source>
-			<target>Verfügbare Direct-Mail-Ordner</target>
-		</trans-unit>
-		<trans-unit id="folders.description" approved="yes">
-			<source>Select the Direct Mail folder you wish to work with.</source>
-			<target>Wählen Sie den Direct-Mail-Ordner, mit dem Sie arbeiten wollen.</target>
-		</trans-unit>
-		<trans-unit id="folders.details" approved="yes">
-			<source>Each Direct Mail folder is a specifically configured work area for the Direct Mail module.</source>
-			<target>Jeder Direct-Mail-Ordner enthält eine eigene Newsletter-Konfiguration. Für unterschiedliche Zwecke oder Empfänger können Sie so unterschiedlich gestaltete Newsletter versenden.</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallang_csh_DirectMail.xlf b/Resources/Private/Language/de.locallang_csh_DirectMail.xlf
deleted file mode 100644
index 9f9d256d8..000000000
--- a/Resources/Private/Language/de.locallang_csh_DirectMail.xlf
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:33:52Z">
-		<header>
-			<description>CSH for Direct Mail Module</description>
-			<type>CSH</type>
-			<fileId>EXT:direct_mail/Resources/Private/Language/locallang_csh_txdirectmailM2</fileId>
-			<csh_table>_MOD_DirectMailNavFrame_txdirectmailM2</csh_table>
-			<keep_original_text>1</keep_original_text>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id=".alttitle" approved="yes">
-			<source>Direct Mail &gt; Direct Mail module</source>
-			<target>Web &gt; Direct-Mail-Modul </target>
-		</trans-unit>
-		<trans-unit id=".description" approved="yes">
-			<source>Select the function of the Direct Mail module that you want to use.</source>
-			<target>Wählen Sie eine Funktion des Direct-Mail-Moduls.</target>
-		</trans-unit>
-		<trans-unit id=".details" approved="yes" xml:space="preserve">
-			<source><![CDATA[The functions of the Direct Mail module are the following, but their availability may be restricted depending on user access rights:
-
-1. Newsletters: this function lets you create a new newsletter or select an existing one; you may also select an existing newsletter in the page tree of the Direct Mail folder; selecting an existing newsletter leads you to a screen that lets you view or edit the newsletter, assign categories to the content elements of the page, view the list of direct mails already based on this newsletter page, or create a new one based on it.
-
-2. Direct Mails: this function lets you create a new direct mail based on a newsletter that has not yet been used to create one, or based on an external URL, or select an existing direct mail; selecting an existing direct mail leads you to a screen that lets you view the current information on the direct mail, edit the properties of the direct mail, and select from a menu of options the action you want to take on the selected direct mail.
-
-3. Recipient Lists: this function lets you create a new recipient list, import Addresses records from csv data to create a new recipient list, link to the diting form of an existing recipient list, or select an existing recipient list; selecting an existing recipient list leads you to a screen that lets you view the number of recipients of each type in the list, with the options to list the recipients or download a csv file.
-
-4. Mailer Engine Status: this function lets you review the current status of the direct mails that have been scheduled for mass sending, and invoke manually the mailer engine, if it is not configured to be automatically invoked; selecting one of the listed direct mails leads you to the Direct Mails function where you may select to review the statistics of the selected direct mail.
-
-5. QuickMail: this function lets you enter a short message and send it immediately to a recipient list. No newsletter, nor any direct mail is involved in this function.
-
-6. Categories Conversion: this function is a migration tool that lets you convert your database to the new Direct Mail Categories introduced in version 2.0 of Direct Mail. Please refer to the manual for more information.
-
-7. Module Configuration: this function is an administration tool used to configure a Direct Mail folder. Please refer to the manual for more information.]]></source>
-			<target><![CDATA[The functions of the Direct Mail module are the following, but their availability may be restricted depending on user access rights:
-
-1. Newsletter: this function lets you create a new newsletter or select an existing one; you may also select an existing newsletter in the page tree of the Direct Mail folder; selecting an existing newsletter leads you to a screen that lets you view or edit the newsletter, assign categories to the content elements of the page, view the list of direct mails already based on this newsletter page, or create a new one based on it.
-
-2. Versand: this function lets you create a new direct mail based on a newsletter that has not yet been used to create one, or based on an external URL, or select an existing direct mail; selecting an existing direct mail leads you to a screen that lets you view the current information on the direct mail, edit the properties of the direct mail, and select from a menu of options the action you want to take on the selected direct mail.
-
-3. Empfängerliste: this function lets you create a new recipient list, import Addresses records from csv data to create a new recipient list, link to the diting form of an existing recipient list, or select an existing recipient list; selecting an existing recipient list leads you to a screen that lets you view the number of recipients of each type in the list, with the options to list the recipients or download a csv file.
-
-4. Versand-Status: this function lets you review the current status of the direct mails that have been scheduled for mass sending, and invoke manually the mailer engine, if it is not configured to be automatically invoked; selecting one of the listed direct mails leads you to the Direct Mails function where you may select to review the statistics of the selected direct mail.
-
-5. QuickMail: this function lets you enter a short message and send it immediately to a recipient list. No newsletter, nor any direct mail is involved in this function.
-
-6. Konvertierung von Kategorien: this function is a migration tool that lets you convert your database to the new Direct Mail Categories introduced in version 2.0 of Direct Mail. Please refer to the manual for more information.
-
-7. Modulkonfiguration: this function is an administration tool used to configure a Direct Mail folder. Please refer to the manual for more information.]]></target>
-		</trans-unit>
-		<trans-unit id="_.seeAlso" approved="yes">
-			<source>sys_dmail, sys_dmail_group, sys_dmail_category</source>
-			<target>sys_dmail, sys_dmail_group, sys_dmail_category</target>
-		</trans-unit>
-		<trans-unit id="assign_categories.alttitle" approved="yes">
-			<source>Select a direct mail</source>
-			<target>Select a direct mail</target>
-		</trans-unit>
-		<trans-unit id="assign_categories.description" approved="yes">
-			<source>Assigning categories to a content element means that the element will appear in the mail only if the recipient user has chosen that category in his profile.</source>
-			<target>Assigning categories to a content element means that the element will appear in the mail only if the recipient user has chosen that category in his profile.</target>
-		</trans-unit>
-		<trans-unit id="assign_categories.details" approved="yes" xml:space="preserve">
-			<source><![CDATA[Check a checkbox in order to assign a category to a content element.
-
-If you do not assign any category to an element, the element will appear in all mails.]]></source>
-			<target><![CDATA[Check a checkbox in order to assign a category to a content element.
-
-If you do not assign any category to an element, the element will appear in all mails.]]></target>
-		</trans-unit>
-		<trans-unit id="assign_categories.seeAlso" approved="yes">
-			<source>sys_dmail_category</source>
-			<target>sys_dmail_category</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_nl.alttitle" approved="yes">
-			<source>Create a new direct mail from newsletter</source>
-			<target>Create a new direct mail from newsletter</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_nl.description" approved="yes">
-			<source>No direct mail has been created using the content of the following newsletters. Click on the one you want to use to create a new direct mail.</source>
-			<target>No direct mail has been created using the content of the following newsletters. Click on the one you want to use to create a new direct mail.</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_nl.seeAlso" approved="yes">
-			<source>sys_dmail</source>
-			<target>sys_dmail</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_url.alttitle" approved="yes">
-			<source>Create a new direct mail from an external URL</source>
-			<target>Create a new direct mail from an external URL</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_url.description" approved="yes">
-			<source>Use this form to create a new direct mail based on content grabbed from an external URL.</source>
-			<target>Use this form to create a new direct mail based on content grabbed from an external URL.</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_url.seeAlso" approved="yes">
-			<source>sys_dmail</source>
-			<target>sys_dmail</target>
-		</trans-unit>
-		<trans-unit id="create_newsletter.alttitle" approved="yes">
-			<source>Create a newsletter</source>
-			<target>Newsletter anlegen</target>
-		</trans-unit>
-		<trans-unit id="create_newsletter.description" approved="yes">
-			<source>Click on this link if you want to create a new newsletter.</source>
-			<target>Klicken Sie hier, um eine neue Newsletter-Seite anzulegen.</target>
-		</trans-unit>
-		<trans-unit id="create_newsletter.details" approved="yes" xml:space="preserve">
-			<source><![CDATA[A newsletter is basically a regular TYPO3 page which resides in the Direct Mail folder. Clicking on this link will lead you to a combined page creation and first content element creation form. After creating the page, you may add more content to it.
-
-You may personalize the direct mails that will be sent to each recipient by inserting the following markers in content elements of the newsletter page. The markers will be substituted with the corresponding value found in each recipient record, whenever available:
-
-###USER_uid### (the unique id of the recipient)
-###USER_name### (full name)
-###USER_firstname### (first name calculated)
-###USER_NAME### and ###USER_FIRSTNAME### will insert uppercase versions of the equivalents
-###USER_title###
-###USER_email###
-###USER_phone###
-###USER_www###
-###USER_address###
-###USER_company###
-###USER_city###
-###USER_zip###
-###USER_country###
-###USER_fax###
-###SYS_TABLE_NAME###
-###SYS_MAIL_ID###
-###SYS_AUTHCODE###]]></source>
-			<target><![CDATA[A newsletter is basically a regular TYPO3 page which resides in the Direct Mail folder. Clicking on this link will lead you to a combined page creation and first content element creation form. After creating the page, you may add more content to it.
-
-You may personalize the direct mails that will be sent to each recipient by inserting the following markers in content elements of the newsletter page. The markers will be substituted with the corresponding value found in each recipient record, whenever available:
-
-###USER_uid### (the unique id of the recipient)
-###USER_name### (full name)
-###USER_firstname### (first name calculated)
-###USER_NAME### and ###USER_FIRSTNAME### will insert uppercase versions of the equivalents
-###USER_title###
-###USER_email###
-###USER_phone###
-###USER_www###
-###USER_address###
-###USER_company###
-###USER_city###
-###USER_zip###
-###USER_country###
-###USER_fax###
-###SYS_TABLE_NAME###
-###SYS_MAIL_ID###
-###SYS_AUTHCODE###]]></target>
-		</trans-unit>
-		<trans-unit id="directmail_actions.alttitle" approved="yes">
-			<source>Direct Mails options menu</source>
-			<target>Direct Mails options menu</target>
-		</trans-unit>
-		<trans-unit id="directmail_actions.description" approved="yes">
-			<source>Select the action you want to perform on this direct mail.</source>
-			<target>Select the action you want to perform on this direct mail.</target>
-		</trans-unit>
-		<trans-unit id="directmail_actions.details" approved="yes" xml:space="preserve">
-			<source><![CDATA[Possible actions are the following, but their availability vary depending on the current state of the direct mail:
-
-1. Fetch and compile mail content: this option lets you fetch or acquire the content of the direct mail which will be compiled in a special format for later mailing; this action must be performed before any other action may be taken; you should review the properties of the direct mail as presented on the screen, and edit them, if required, before fetching content.
-
-2. Send a testmail: this option lets you send a test mail to make sure that the email messages that will be sent to the recipient list look as expected when received in a client email application.
-
-3. Mass-send mail: this option lets you schedule the actual sending of the direct mail to a specific recipient list.
-
-4. See statistics of this mail: this option lets you review statistics on the direct mail and the responses, and take action on returned mails; this option is available only after mass-sending the mail has been initiated.]]></source>
-			<target><![CDATA[Possible actions are the following, but their availability vary depending on the current state of the direct mail:
-
-1. Fetch and compile mail content: this option lets you fetch or acquire the content of the direct mail which will be compiled in a special format for later mailing; this action must be performed before any other action may be taken; you should review the properties of the direct mail as presented on the screen, and edit them, if required, before fetching content.
-
-2. Send a testmail: this option lets you send a test mail to make sure that the email messages that will be sent to the recipient list look as expected when received in a client email application.
-
-3. Mass-send mail: this option lets you schedule the actual sending of the direct mail to a specific recipient list.
-
-4. See statistics of this mail: this option lets you review statistics on the direct mail and the responses, and take action on returned mails; this option is available only after mass-sending the mail has been initiated.]]></target>
-		</trans-unit>
-		<trans-unit id="directmail_actions.seeAlso" approved="yes">
-			<source>sys_dmail</source>
-			<target>sys_dmail</target>
-		</trans-unit>
-		<trans-unit id="folders.alttitle" approved="yes">
-			<source>Available Direct Mail folders</source>
-			<target>Verfügbare Direct-Mail-Ordner</target>
-		</trans-unit>
-		<trans-unit id="folders.description" approved="yes">
-			<source>Select the Direct Mail folder you wish to work with.</source>
-			<target>Wählen Sie den Direct-Mail-Ordner, mit dem Sie arbeiten wollen.</target>
-		</trans-unit>
-		<trans-unit id="folders.details" approved="yes">
-			<source>Each Direct Mail folder is a specifically configured work area for the Direct Mail module.</source>
-			<target>Jeder Direct-Mail-Ordner enthält eine eigene Newsletter-Konfiguration. Für unterschiedliche Zwecke oder Empfänger können Sie so unterschiedlich gestaltete Newsletter versenden.</target>
-		</trans-unit>
-		<trans-unit id="select_directmail.description" approved="yes">
-			<source>The following direct mails have not yet been sent. Click on the one you want to work on.</source>
-			<target>The following direct mails have not yet been sent. Click on the one you want to work on.</target>
-		</trans-unit>
-		<trans-unit id="select_directmail.seeAlso" approved="yes">
-			<source>sys_dmail</source>
-			<target>sys_dmail</target>
-		</trans-unit>
-		<trans-unit id="select_newsletter.alttitle" approved="yes">
-			<source>Select a newsletter</source>
-			<target>Wählen Sie eine Newsletter-Seite.</target>
-		</trans-unit>
-		<trans-unit id="select_newsletter.description" approved="yes">
-			<source>Click on one of these already created newsletters.</source>
-			<target>Klicken Sie einen der bereits angelegten Newsletter.</target>
-		</trans-unit>
-		<trans-unit id="select_newsletter.details" approved="yes">
-			<source>You may click on one of the listed newsletter to view information about it, categorize its content elements, and eventually use it to create a direct mail.</source>
-			<target>Sie können einen der aufgelisteten Newsletter anklicken, um Informationen über ihn zu erhalten, ihn zu bearbeiten und einen Versand daraus zu erstellen.</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallang_csh_MailerEngine.xlf b/Resources/Private/Language/de.locallang_csh_MailerEngine.xlf
deleted file mode 100644
index 371652396..000000000
--- a/Resources/Private/Language/de.locallang_csh_MailerEngine.xlf
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:09:21Z">
-		<header>
-			<description>CSH for Direct Mail Mailer Engine Module</description>
-			<type>CSH</type>
-			<fileId>EXT:direct_mail/Resources/Private/Language/locallang_csh_txdirectmailM5</fileId>
-			<csh_table>_MOD_DirectMailNavFrame_txdirectmailM5</csh_table>
-			<keep_original_text>1</keep_original_text>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id=".alttitle" approved="yes">
-			<source>Direct Mail &gt; Mailer Engine module</source>
-			<target>Direct Mail &gt; Versand-Status-Modul </target>
-		</trans-unit>
-		<trans-unit id=".description" approved="yes">
-			<source>Show status and queuing jobs of the Mailer Engine</source>
-			<target>Zeigt Status des Versands und anstehenden Newsletter-Versand an.</target>
-		</trans-unit>
-		<trans-unit id=".details" approved="yes">
-			<source>Show the detailed status and queuing jobs of the Mailer Engine.</source>
-			<target>Zeigt detaillierte Status des Versand und anstehenden Newsletter-Versand an.</target>
-		</trans-unit>
-		<trans-unit id="folders.alttitle" approved="yes">
-			<source>Available Direct Mail folders</source>
-			<target>Verfügbare Direct-Mail-Ordner</target>
-		</trans-unit>
-		<trans-unit id="folders.description" approved="yes">
-			<source>Select the Direct Mail folder you wish to work with.</source>
-			<target>Wählen Sie den Direct-Mail-Ordner, mit dem Sie arbeiten wollen.</target>
-		</trans-unit>
-		<trans-unit id="folders.details" approved="yes">
-			<source>Each Direct Mail folder is a specifically configured work area for the Direct Mail module.</source>
-			<target>Jeder Direct-Mail-Ordner enthält eine eigene Newsletter-Konfiguration. Für unterschiedliche Zwecke oder Empfänger können Sie so unterschiedlich gestaltete Newsletter versenden.</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallang_csh_RecipientList.xlf b/Resources/Private/Language/de.locallang_csh_RecipientList.xlf
deleted file mode 100644
index d62f9b136..000000000
--- a/Resources/Private/Language/de.locallang_csh_RecipientList.xlf
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:04:00Z">
-		<header>
-			<description>CSH for Direct Mail Recipient List Module</description>
-			<type>CSH</type>
-			<fileId>EXT:direct_mail/Resources/Private/Language/locallang_csh_txdirectmailM3</fileId>
-			<csh_table>_MOD_DirectMailNavFrame_txdirectmailM3</csh_table>
-			<keep_original_text>1</keep_original_text>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id=".alttitle" approved="yes">
-			<source>Direct Mail &gt; Recipient List module</source>
-			<target>Direct Mail &gt; Empfängerliste-Modul </target>
-		</trans-unit>
-		<trans-unit id=".description" approved="yes">
-			<source>Manage the recipient list.</source>
-			<target>Verwalten die Empfängerlisten</target>
-		</trans-unit>
-		<trans-unit id=".details" approved="yes" xml:space="preserve">
-			<source>This module lets you:
-- create a new recipient list
-- import Addresses records from CSV-File
-- link to the editing form of an existing recipient list
-- select an existing recipient list; selecting an existing recipient list leads you to a screen that lets you view the number of recipients of each type in the list, with the options to list the recipients or download a csv file.</source>
-			<target>Mit diesem Modul können Sie:
-- neue Empfängerliste erzeugen
-- neue Adress-Datensätze von einer CSV-Datei importieren
-- vorhandene Empfängerliste editieren
-- vorhandene Empfängerliste auswählen; Wird eine Empfängerliste ausgewählt, können Sie die Anzahl der Empfängern, einzelne Empfänger auflisten lassen oder die Liste als CSV Datei herunteladen.
-			</target>
-		</trans-unit>
-		<trans-unit id="_.seeAlso" approved="yes">
-			<source>sys_dmail_group</source>
-			<target>sys_dmail_group</target>
-		</trans-unit>
-		<trans-unit id="folders.alttitle" approved="yes">
-			<source>Available Direct Mail folders</source>
-			<target>Verfügbare Direct-Mail-Ordner</target>
-		</trans-unit>
-		<trans-unit id="folders.description" approved="yes">
-			<source>Select the Direct Mail folder you wish to work with.</source>
-			<target>Wählen Sie den Direct-Mail-Ordner, mit dem Sie arbeiten wollen.</target>
-		</trans-unit>
-		<trans-unit id="folders.details" approved="yes">
-			<source>Each Direct Mail folder is a specifically configured work area for the Direct Mail module.</source>
-			<target>Jeder Direct-Mail-Ordner enthält eine eigene Newsletter-Konfiguration. Für unterschiedliche Zwecke oder Empfänger können Sie so unterschiedlich gestaltete Newsletter versenden.</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import.alttitle" approved="yes">
-			<source>Import CSV into 'Address' table</source>
-			<target>Import CSV into 'Address' table</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import.description" approved="yes">
-			<source>This option lets you import a csv, or comma-separated, list of address records and create a recipient list containing the imported records.</source>
-			<target>This option lets you import a csv, or comma-separated, list of address records and create a recipient list containing the imported records.</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import.details" approved="yes" xml:space="preserve">
-			<source>The records to import are entered one per line. Each record to import is a comma-separated list of field values. You may also specify the use of a semicolon(;) or of a colon (:) as separator instead of the comma.
-
-On the first line you may enter a comma-separated list of field names. This first line provides the structure for the records that follow. If you do not provide a list of field names on the first line, then the structure of the records is assumed to be &quot;name, email&quot;.
-
-Each field name listed on the first line is analyzed as follows:
-
-1.the field name may one of the field names from the following list: uid, name, title, email, phone, www, address, company, city, zip, country, fax, module_sys_dmail_html, module_sys_dmail_category;
-
-2.the field name may be omitted in which case the corresponding values will be skipped or omitted;
-
-3.the field name may start with &quot;user_&quot;, assuming that table tt_address was extended with the specified field name;
-
-4.in addition, fields may be suffixed with &quot;[code]&quot;; in this case, when the value in the imported record is not null, &quot;[+value]&quot; adds that number to the field value and &quot;[=value]&quot; overrides any existing value in the field.
-
-Example of csv field specification:
-;user_date;name;email;zip;phone;user_age[=20]
-185;12-02-01;Connie Greffel;c.greffel@get2net.dk;;39905067;x
-186;12-02-01;Stine Holm;ravnsbjergholm@hotmail.com;;32 96 70 75;
-187;12-02-01;Anette Bentholm;madsenbentholm@mail.net4you.dk;;98373677;x</source>
-			<target>The records to import are entered one per line. Each record to import is a comma-separated list of field values. You may also specify the use of a semicolon(;) or of a colon (:) as separator instead of the comma.
-
-On the first line you may enter a comma-separated list of field names. This first line provides the structure for the records that follow. If you do not provide a list of field names on the first line, then the structure of the records is assumed to be &quot;name, email&quot;.
-
-Each field name listed on the first line is analyzed as follows:
-
-1.the field name may one of the field names from the following list: uid, name, title, email, phone, www, address, company, city, zip, country, fax, module_sys_dmail_html, module_sys_dmail_category;
-
-2.the field name may be omitted in which case the corresponding values will be skipped or omitted;
-
-3.the field name may start with &quot;user_&quot;, assuming that table tt_address was extended with the specified field name;
-
-4.in addition, fields may be suffixed with &quot;[code]&quot;; in this case, when the value in the imported record is not null, &quot;[+value]&quot; adds that number to the field value and &quot;[=value]&quot; overrides any existing value in the field.
-
-Example of csv field specification:
-;user_date;name;email;zip;phone;user_age[=20]
-185;12-02-01;Connie Greffel;c.greffel@get2net.dk;;39905067;x
-186;12-02-01;Stine Holm;ravnsbjergholm@hotmail.com;;32 96 70 75;
-187;12-02-01;Anette Bentholm;madsenbentholm@mail.net4you.dk;;98373677;x</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallang_csh_Statistics.xlf b/Resources/Private/Language/de.locallang_csh_Statistics.xlf
deleted file mode 100644
index 983e31bca..000000000
--- a/Resources/Private/Language/de.locallang_csh_Statistics.xlf
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:02:40Z">
-		<header>
-			<description>CSH for Direct Mail Statistic Module</description>
-			<type>CSH</type>
-			<fileId>EXT:direct_mail/Resources/Private/Language/locallang_csh_txdirectmailM4</fileId>
-			<csh_table>_MOD_DirectMailNavFrametxdirectmailM4</csh_table>
-			<keep_original_text>1</keep_original_text>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id=".alttitle" approved="yes">
-			<source>Direct Mail &gt; Statistics module</source>
-			<target>Direct Mail &gt; Statistik-Modul </target>
-		</trans-unit>
-		<trans-unit id=".description" approved="yes">
-			<source>Show statictics of sent newsletter.</source>
-			<target>Zeigt Statistiken eines versendeten Newsletter.</target>
-		</trans-unit>
-		<trans-unit id=".details" approved="yes">
-			<source>Show detailed information of sent newsletter.</source>
-			<target>Zeigt detaillierte Statistiken eines versendeten Newsletter</target>
-		</trans-unit>
-		<trans-unit id="_.seeAlso" approved="yes">
-			<source>sys_dmail, sys_dmail_group, sys_dmail_category</source>
-			<target>sys_dmail, sys_dmail_group, sys_dmail_category</target>
-		</trans-unit>
-		<trans-unit id="folders.alttitle" approved="yes">
-			<source>Available Direct Mail folders</source>
-			<target>Verfügbare Direct-Mail-Ordner</target>
-		</trans-unit>
-		<trans-unit id="folders.description" approved="yes">
-			<source>Select the Direct Mail folder you wish to work with.</source>
-			<target>Wählen Sie den Direct-Mail-Ordner, mit dem Sie arbeiten wollen.</target>
-		</trans-unit>
-		<trans-unit id="folders.details" approved="yes">
-			<source>Each Direct Mail folder is a specifically configured work area for the Direct Mail module.</source>
-			<target>Jeder Direct-Mail-Ordner enthält eine eigene Newsletter-Konfiguration. Für unterschiedliche Zwecke oder Empfänger können Sie so unterschiedlich gestaltete Newsletter versenden.</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallang_csh_web_txdirectmail.xlf b/Resources/Private/Language/de.locallang_csh_web_txdirectmail.xlf
deleted file mode 100644
index 8aca0ad65..000000000
--- a/Resources/Private/Language/de.locallang_csh_web_txdirectmail.xlf
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-11T21:42:51Z">
-		<header>
-			<description>CSH for Direct Mail Module</description>
-			<type>CSH</type>
-			<fileId>EXT:direct_mail/mod/locallang_csh_web_DirectMailNavFrame</fileId>
-			<csh_table>_MOD_web_DirectMailNavFrame</csh_table>
-			<keep_original_text>1</keep_original_text>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id=".alttitle" approved="yes">
-			<source>Web &gt; Direct Mail module</source>
-			<target>Web &gt; Direct-Mail-Modul </target>
-		</trans-unit>
-		<trans-unit id=".description" approved="yes">
-			<source>Select the function of the Direct Mail module that you want to use.</source>
-			<target>Wählen Sie eine Funktion des Direct-Mail-Moduls.</target>
-		</trans-unit>
-		<trans-unit id=".details" approved="yes" xml:space="preserve">
-			<source><![CDATA[The functions of the Direct Mail module are the following, but their availability may be restricted depending on user access rights:
-
-1. Newsletters: this function lets you create a new newsletter or select an existing one; you may also select an existing newsletter in the page tree of the Direct Mail folder; selecting an existing newsletter leads you to a screen that lets you view or edit the newsletter, assign categories to the content elements of the page, view the list of direct mails already based on this newsletter page, or create a new one based on it.
-
-2. Direct Mails: this function lets you create a new direct mail based on a newsletter that has not yet been used to create one, or based on an external URL, or select an existing direct mail; selecting an existing direct mail leads you to a screen that lets you view the current information on the direct mail, edit the properties of the direct mail, and select from a menu of options the action you want to take on the selected direct mail.
-
-3. Recipient Lists: this function lets you create a new recipient list, import Addresses records from csv data to create a new recipient list, link to the diting form of an existing recipient list, or select an existing recipient list; selecting an existing recipient list leads you to a screen that lets you view the number of recipients of each type in the list, with the options to list the recipients or download a csv file.
-
-4. Mailer Engine Status: this function lets you review the current status of the direct mails that have been scheduled for mass sending, and invoke manually the mailer engine, if it is not configured to be automatically invoked; selecting one of the listed direct mails leads you to the Direct Mails function where you may select to review the statistics of the selected direct mail.
-
-5. QuickMail: this function lets you enter a short message and send it immediately to a recipient list. No newsletter, nor any direct mail is involved in this function.
-
-6. Categories Conversion: this function is a migration tool that lets you convert your database to the new Direct Mail Categories introduced in version 2.0 of Direct Mail. Please refer to the manual for more information.
-
-7. Module Configuration: this function is an administration tool used to configure a Direct Mail folder. Please refer to the manual for more information.]]></source>
-			<target><![CDATA[The functions of the Direct Mail module are the following, but their availability may be restricted depending on user access rights:
-
-1. Newsletter: this function lets you create a new newsletter or select an existing one; you may also select an existing newsletter in the page tree of the Direct Mail folder; selecting an existing newsletter leads you to a screen that lets you view or edit the newsletter, assign categories to the content elements of the page, view the list of direct mails already based on this newsletter page, or create a new one based on it.
-
-2. Versand: this function lets you create a new direct mail based on a newsletter that has not yet been used to create one, or based on an external URL, or select an existing direct mail; selecting an existing direct mail leads you to a screen that lets you view the current information on the direct mail, edit the properties of the direct mail, and select from a menu of options the action you want to take on the selected direct mail.
-
-3. Empfängerliste: this function lets you create a new recipient list, import Addresses records from csv data to create a new recipient list, link to the diting form of an existing recipient list, or select an existing recipient list; selecting an existing recipient list leads you to a screen that lets you view the number of recipients of each type in the list, with the options to list the recipients or download a csv file.
-
-4. Versand-Status: this function lets you review the current status of the direct mails that have been scheduled for mass sending, and invoke manually the mailer engine, if it is not configured to be automatically invoked; selecting one of the listed direct mails leads you to the Direct Mails function where you may select to review the statistics of the selected direct mail.
-
-5. QuickMail: this function lets you enter a short message and send it immediately to a recipient list. No newsletter, nor any direct mail is involved in this function.
-
-6. Konvertierung von Kategorien: this function is a migration tool that lets you convert your database to the new Direct Mail Categories introduced in version 2.0 of Direct Mail. Please refer to the manual for more information.
-
-7. Modulkonfiguration: this function is an administration tool used to configure a Direct Mail folder. Please refer to the manual for more information.]]></target>
-		</trans-unit>
-		<trans-unit id="_.seeAlso" approved="yes">
-			<source>sys_dmail, sys_dmail_group, sys_dmail_category</source>
-			<target>sys_dmail, sys_dmail_group, sys_dmail_category</target>
-		</trans-unit>
-		<trans-unit id="assign_categories.alttitle" approved="yes">
-			<source>Select a direct mail</source>
-			<target>Select a direct mail</target>
-		</trans-unit>
-		<trans-unit id="assign_categories.description" approved="yes">
-			<source>Assigning categories to a content element means that the element will appear in the mail only if the recipient user has chosen that category in his profile.</source>
-			<target>Assigning categories to a content element means that the element will appear in the mail only if the recipient user has chosen that category in his profile.</target>
-		</trans-unit>
-		<trans-unit id="assign_categories.details" approved="yes" xml:space="preserve">
-			<source><![CDATA[Check a checkbox in order to assign a category to a content element.
-
-If you do not assign any category to an element, the element will appear in all mails.]]></source>
-			<target><![CDATA[Check a checkbox in order to assign a category to a content element.
-
-If you do not assign any category to an element, the element will appear in all mails.]]></target>
-		</trans-unit>
-		<trans-unit id="assign_categories.seeAlso" approved="yes">
-			<source>sys_dmail_category</source>
-			<target>sys_dmail_category</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_nl.alttitle" approved="yes">
-			<source>Create a new direct mail from newsletter</source>
-			<target>Create a new direct mail from newsletter</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_nl.description" approved="yes">
-			<source>No direct mail has been created using the content of the following newsletters. Click on the one you want to use to create a new direct mail.</source>
-			<target>No direct mail has been created using the content of the following newsletters. Click on the one you want to use to create a new direct mail.</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_nl.seeAlso" approved="yes">
-			<source>sys_dmail</source>
-			<target>sys_dmail</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_url.alttitle" approved="yes">
-			<source>Create a new direct mail from an external URL</source>
-			<target>Create a new direct mail from an external URL</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_url.description" approved="yes">
-			<source>Use this form to create a new direct mail based on content grabbed from an external URL.</source>
-			<target>Use this form to create a new direct mail based on content grabbed from an external URL.</target>
-		</trans-unit>
-		<trans-unit id="create_directmail_from_url.seeAlso" approved="yes">
-			<source>sys_dmail</source>
-			<target>sys_dmail</target>
-		</trans-unit>
-		<trans-unit id="create_newsletter.alttitle" approved="yes">
-			<source>Create a newsletter</source>
-			<target>Newsletter anlegen</target>
-		</trans-unit>
-		<trans-unit id="create_newsletter.description" approved="yes">
-			<source>Click on this link if you want to create a new newsletter.</source>
-			<target>Klicken Sie hier, um eine neue Newsletter-Seite anzulegen.</target>
-		</trans-unit>
-		<trans-unit id="create_newsletter.details" approved="yes" xml:space="preserve">
-			<source><![CDATA[A newsletter is basically a regular TYPO3 page which resides in the Direct Mail folder. Clicking on this link will lead you to a combined page creation and first content element creation form. After creating the page, you may add more content to it.
-
-You may personalize the direct mails that will be sent to each recipient by inserting the following markers in content elements of the newsletter page. The markers will be substituted with the corresponding value found in each recipient record, whenever available:
-
-###USER_uid### (the unique id of the recipient)
-###USER_name### (full name)
-###USER_firstname### (first name calculated)
-###USER_NAME### and ###USER_FIRSTNAME### will insert uppercase versions of the equivalents
-###USER_title###
-###USER_email###
-###USER_phone###
-###USER_www###
-###USER_address###
-###USER_company###
-###USER_city###
-###USER_zip###
-###USER_country###
-###USER_fax###
-###SYS_TABLE_NAME###
-###SYS_MAIL_ID###
-###SYS_AUTHCODE###]]></source>
-			<target><![CDATA[A newsletter is basically a regular TYPO3 page which resides in the Direct Mail folder. Clicking on this link will lead you to a combined page creation and first content element creation form. After creating the page, you may add more content to it.
-
-You may personalize the direct mails that will be sent to each recipient by inserting the following markers in content elements of the newsletter page. The markers will be substituted with the corresponding value found in each recipient record, whenever available:
-
-###USER_uid### (the unique id of the recipient)
-###USER_name### (full name)
-###USER_firstname### (first name calculated)
-###USER_NAME### and ###USER_FIRSTNAME### will insert uppercase versions of the equivalents
-###USER_title###
-###USER_email###
-###USER_phone###
-###USER_www###
-###USER_address###
-###USER_company###
-###USER_city###
-###USER_zip###
-###USER_country###
-###USER_fax###
-###SYS_TABLE_NAME###
-###SYS_MAIL_ID###
-###SYS_AUTHCODE###]]></target>
-		</trans-unit>
-		<trans-unit id="directmail_actions.alttitle" approved="yes">
-			<source>Direct Mails options menu</source>
-			<target>Direct Mails options menu</target>
-		</trans-unit>
-		<trans-unit id="directmail_actions.description" approved="yes">
-			<source>Select the action you want to perform on this direct mail.</source>
-			<target>Select the action you want to perform on this direct mail.</target>
-		</trans-unit>
-		<trans-unit id="directmail_actions.details" approved="yes" xml:space="preserve">
-			<source><![CDATA[Possible actions are the following, but their availability vary depending on the current state of the direct mail:
-
-1. Fetch and compile mail content: this option lets you fetch or acquire the content of the direct mail which will be compiled in a special format for later mailing; this action must be performed before any other action may be taken; you should review the properties of the direct mail as presented on the screen, and edit them, if required, before fetching content.
-
-2. Send a testmail: this option lets you send a test mail to make sure that the email messages that will be sent to the recipient list look as expected when received in a client email application.
-
-3. Mass-send mail: this option lets you schedule the actual sending of the direct mail to a specific recipient list.
-
-4. See statistics of this mail: this option lets you review statistics on the direct mail and the responses, and take action on returned mails; this option is available only after mass-sending the mail has been initiated.]]></source>
-			<target><![CDATA[Possible actions are the following, but their availability vary depending on the current state of the direct mail:
-
-1. Fetch and compile mail content: this option lets you fetch or acquire the content of the direct mail which will be compiled in a special format for later mailing; this action must be performed before any other action may be taken; you should review the properties of the direct mail as presented on the screen, and edit them, if required, before fetching content.
-
-2. Send a testmail: this option lets you send a test mail to make sure that the email messages that will be sent to the recipient list look as expected when received in a client email application.
-
-3. Mass-send mail: this option lets you schedule the actual sending of the direct mail to a specific recipient list.
-
-4. See statistics of this mail: this option lets you review statistics on the direct mail and the responses, and take action on returned mails; this option is available only after mass-sending the mail has been initiated.]]></target>
-		</trans-unit>
-		<trans-unit id="directmail_actions.seeAlso" approved="yes">
-			<source>sys_dmail</source>
-			<target>sys_dmail</target>
-		</trans-unit>
-		<trans-unit id="folders.alttitle" approved="yes">
-			<source>Available Direct Mail folders</source>
-			<target>Verfügbare Direct-Mail-Ordner</target>
-		</trans-unit>
-		<trans-unit id="folders.description" approved="yes">
-			<source>Select the Direct Mail folder you wish to work with.</source>
-			<target>Wählen Sie den Direct-Mail-Ordner, mit dem Sie arbeiten wollen.</target>
-		</trans-unit>
-		<trans-unit id="folders.details" approved="yes">
-			<source>Each Direct Mail folder is a specifically configured work area for the Direct Mail module.</source>
-			<target>Jeder Direct-Mail-Ordner enthält eine eigene Newsletter-Konfiguration. Für unterschiedliche Zwecke oder Empfänger können Sie so unterschiedlich gestaltete Newsletter versenden.</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import.alttitle" approved="yes">
-			<source>Import CSV into 'Address' table</source>
-			<target>Import CSV into 'Address' table</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import.description" approved="yes">
-			<source>This option lets you import a csv, or comma-separated, list of address records and create a recipient list containing the imported records.</source>
-			<target>This option lets you import a csv, or comma-separated, list of address records and create a recipient list containing the imported records.</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import.details" approved="yes" xml:space="preserve">
-			<source><![CDATA[The records to import are entered one per line. Each record to import is a comma-separated list of field values. You may also specify the use of a semicolon(;) or of a colon (:) as separator instead of the comma.
-
-On the first line you may enter a comma-separated list of field names. This first line provides the structure for the records that follow. If you do not provide a list of field names on the first line, then the structure of the records is assumed to be "name, email".
-
-Each field name listed on the first line is analyzed as follows:
-
-1.the field name may one of the field names from the following list: uid, name, title, email, phone, www, address, company, city, zip, country, fax, module_sys_dmail_html, module_sys_dmail_category;
-
-2.the field name may be omitted in which case the corresponding values will be skipped or omitted;
-
-3.the field name may start with "user_", assuming that table tt_address was extended with the specified field name;
-
-4.in addition, fields may be suffixed with "[code]"; in this case, when the value in the imported record is not null, "[+value]" adds that number to the field value and "[=value]" overrides any existing value in the field.
-
-Example of csv field specification:
-;user_date;name;email;zip;phone;user_age[=20]
-185;12-02-01;Connie Greffel;c.greffel@get2net.dk;;39905067;x
-186;12-02-01;Stine Holm;ravnsbjergholm@hotmail.com;;32 96 70 75;
-187;12-02-01;Anette Bentholm;madsenbentholm@mail.net4you.dk;;98373677;x]]></source>
-			<target><![CDATA[The records to import are entered one per line. Each record to import is a comma-separated list of field values. You may also specify the use of a semicolon(;) or of a colon (:) as separator instead of the comma.
-
-On the first line you may enter a comma-separated list of field names. This first line provides the structure for the records that follow. If you do not provide a list of field names on the first line, then the structure of the records is assumed to be "name, email".
-
-Each field name listed on the first line is analyzed as follows:
-
-1.the field name may one of the field names from the following list: uid, name, title, email, phone, www, address, company, city, zip, country, fax, module_sys_dmail_html, module_sys_dmail_category;
-
-2.the field name may be omitted in which case the corresponding values will be skipped or omitted;
-
-3.the field name may start with "user_", assuming that table tt_address was extended with the specified field name;
-
-4.in addition, fields may be suffixed with "[code]"; in this case, when the value in the imported record is not null, "[+value]" adds that number to the field value and "[=value]" overrides any existing value in the field.
-
-Example of csv field specification:
-;user_date;name;email;zip;phone;user_age[=20]
-185;12-02-01;Connie Greffel;c.greffel@get2net.dk;;39905067;x
-186;12-02-01;Stine Holm;ravnsbjergholm@hotmail.com;;32 96 70 75;
-187;12-02-01;Anette Bentholm;madsenbentholm@mail.net4you.dk;;98373677;x]]></target>
-		</trans-unit>
-		<trans-unit id="select_directmail.description" approved="yes">
-			<source>The following direct mails have not yet been sent. Click on the one you want to work on.</source>
-			<target>The following direct mails have not yet been sent. Click on the one you want to work on.</target>
-		</trans-unit>
-		<trans-unit id="select_directmail.seeAlso" approved="yes">
-			<source>sys_dmail</source>
-			<target>sys_dmail</target>
-		</trans-unit>
-		<trans-unit id="select_newsletter.alttitle" approved="yes">
-			<source>Select a newsletter</source>
-			<target>Wählen Sie eine Newsletter-Seite.</target>
-		</trans-unit>
-		<trans-unit id="select_newsletter.description" approved="yes">
-			<source>Click on one of these already created newsletters.</source>
-			<target>Klicken Sie einen der bereits angelegten Newsletter.</target>
-		</trans-unit>
-		<trans-unit id="select_newsletter.details" approved="yes">
-			<source>You may click on one of the listed newsletter to view information about it, categorize its content elements, and eventually use it to create a direct mail.</source>
-			<target>Sie können einen der aufgelisteten Newsletter anklicken, um Informationen über ihn zu erhalten, ihn zu bearbeiten und einen Versand daraus zu erstellen.</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallang_mod2-6.xlf b/Resources/Private/Language/de.locallang_mod2-6.xlf
deleted file mode 100644
index 36d7e35af..000000000
--- a/Resources/Private/Language/de.locallang_mod2-6.xlf
+++ /dev/null
@@ -1,1337 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-11T21:43:38Z">
-		<header>
-			<description>Labels for the main Direct Mail module</description>
-			<type>module</type>
-			<fileId>EXT:direct_mail/mod/locallang.xml</fileId>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id="configure_HTMLParams_description" approved="yes">
-			<source>Enter the additional URL parameters used to fetch the HTML content from a TYPO3 page.</source>
-			<target>Gibt die zusätzliche URL-Parameter, die während des Auslesen der HTML-Inhalten einer TYPO3 Seite ein.</target>
-		</trans-unit>
-		<trans-unit id="configure_HTMLParams_details" approved="yes">
-			<source>The specified parameters will be added to the URL used to fetch the HTML content of the direct mail from a TYPO3 page. If in doubt, leave it blank.</source>
-			<target>Die eingegebene Parameter werden in der URL hinzugefügt, um HTML Inhalten einer TYPO3 Seite auszulesen. Im Zweifel lass es leer.</target>
-		</trans-unit>
-		<trans-unit id="configure_default_content" approved="yes">
-			<source>Set default values for mail content format:</source>
-			<target>Setze Standardwerte des Formats von E-Mail-Inhalten fest:</target>
-		</trans-unit>
-		<trans-unit id="configure_default_fetching" approved="yes">
-			<source>Set default values for mail content fetching options:</source>
-			<target>Setze Standardwerte für Auslesen der E-Mail-Inhalten fest:</target>
-		</trans-unit>
-		<trans-unit id="configure_default_headers" approved="yes">
-			<source>Set default values for Direct Mails headers:</source>
-			<target>Setze Standardwerte des Direct Mail Headers fest:</target>
-		</trans-unit>
-		<trans-unit id="configure_direct_mail_module" approved="yes">
-			<source>Configure direct mail module</source>
-			<target>Konfigurieren des Direct Mail-Moduls</target>
-		</trans-unit>
-		<trans-unit id="configure_directmail_charset" approved="yes">
-			<source>Default character set for direct mails built from external pages</source>
-			<target>Standard Zeichensatz des Direct Mails, die auf externe Seite basiert sind</target>
-		</trans-unit>
-		<trans-unit id="configure_directmail_charset_description" approved="yes">
-			<source>Specify the character set used in direct mails when they are built from external pages and character set cannot be auto-detected.</source>
-			<target>Gibt das Zeichensatz der Direct Mails an, die auf externe Seite basiert sind und das Zeichensatz kann nicht automatisch erkannt werden.</target>
-		</trans-unit>
-		<trans-unit id="configure_directmail_encoding" approved="yes">
-			<source>Default encoding of direct mails</source>
-			<target>Standardkodierung des Direct Mails</target>
-		</trans-unit>
-		<trans-unit id="configure_directmail_encoding_description" approved="yes">
-			<source>Select the default content transfer encoding of direct mails.</source>
-			<target>Wähle der Standardkodierung der Direct Mail-Inhalten</target>
-		</trans-unit>
-		<trans-unit id="configure_html_only" approved="yes">
-			<source>HTML only</source>
-			<target>Nur HTML</target>
-		</trans-unit>
-		<trans-unit id="configure_http_password" approved="yes">
-			<source>HTTP Password</source>
-			<target>HTTP Kennwort</target>
-		</trans-unit>
-		<trans-unit id="configure_http_password_description" approved="yes">
-			<source>If mail content is protected by HTTP authentication, enter the password here.</source>
-			<target>Wenn E-Mail-Inhalte mit HTTP Authentifikation geschützt sind, gibt das Kennwort ein.</target>
-		</trans-unit>
-		<trans-unit id="configure_http_username" approved="yes">
-			<source>HTTP Username</source>
-			<target>HTTP Benutzername</target>
-		</trans-unit>
-		<trans-unit id="configure_http_username_description" approved="yes">
-			<source>If mail content is protected by HTTP authentication, enter the username here.</source>
-			<target>Wenn E-Mail-Inhalte mit HTTP Authentifikation geschützt sind, gibt der Benutzername ein.</target>
-		</trans-unit>
-		<trans-unit id="configure_http_username_details" approved="yes" xml:space="preserve">
-			<source><![CDATA[The username and password is used to fetch mail content. They are NOT sent in the mail!
-If you do not specify a username and password and the newsletter pages happen to be protected, an error will occur and no mail content will be fetched.]]></source>
-			<target><![CDATA[Benutzername und Kennwort werden nur benutzt, um E-Mail-Inhalten auszulesen. Sie werden NICHT in der E-Mail verschickt!
-Wenn Benutzername und Kennwort nicht angegeben sind und die Newsletter-Seite ist mit Kennwort geschützt, es wird ein Fehler geben und keine Inhalten werden ausgelesen.]]></target>
-		</trans-unit>
-		<trans-unit id="configure_jumpurl_tracking_privacy" approved="yes">
-			<source>Privacy jumpurl</source>
-			<target>Anonyme jumpurl</target>
-		</trans-unit>
-		<trans-unit id="configure_jumpurl_tracking_privacy_description" approved="yes">
-			<source>Set this option, to anonymize click statistics </source>
-			<target>Setze diese Option ein, um die Klick-Statistiken zu anonymisieren</target>
-		</trans-unit>
-		<trans-unit id="configure_options_additional" approved="yes">
-			<source>Set additional module options:</source>
-			<target>Lege die zusätzliche Moduleinstellungen fest:</target>
-		</trans-unit>
-		<trans-unit id="configure_options_encoding" approved="yes">
-			<source>Set options for content transfer encoding and character set:</source>
-			<target>Setze die Optionen der Versandkodierung und des Zeichensatzes fest:</target>
-		</trans-unit>
-		<trans-unit id="configure_options_links" approved="yes">
-			<source>Set options for links in mail content:</source>
-			<target>Setze die Einstellungen der Links in E-Mail ein:</target>
-		</trans-unit>
-		<trans-unit id="configure_options_links_jumpurl" approved="yes">
-			<source>Enable jump URL's:</source>
-			<target>Aktiviere Jump URL's:</target>
-		</trans-unit>
-		<trans-unit id="configure_options_links_jumpurl_description" approved="yes">
-			<source>Check this option to enable jump URL's and the collection of click statistics.</source>
-			<target>Kreuze diese Einstellung an, um die Jump URL's zu aktivieren und Statistiken von Klicks zu sammeln.</target>
-		</trans-unit>
-		<trans-unit id="configure_options_links_rdct" approved="yes">
-			<source>This configuration determines how QuickMails are handled and further sets the default value for Direct Mails.</source>
-			<target>Diese Einstellung stellt fest, wie Quickmails behandelt und die Standardwerte der Direct Mails einsetze.</target>
-		</trans-unit>
-		<trans-unit id="configure_options_mailto_jumpurl" approved="yes">
-			<source>Enable jump URL's for mailto links:</source>
-			<target>Aktivere Jump URL's für mailto-Links:</target>
-		</trans-unit>
-		<trans-unit id="configure_options_mailto_jumpurl_description" approved="yes">
-			<source>Check this option to enable jump URL's for mailto links.</source>
-			<target>Kreuze diese Einstellung en, um die Jump URL's für mailto-Links zu aktivieren.</target>
-		</trans-unit>
-		<trans-unit id="configure_plainParams_description" approved="yes">
-			<source>Enter the additional URL parameters used to fetch the plain text content from a TYPO3 page.</source>
-			<target>Gibt die zusätzliche URL-Parameter, die während des Auslesen der Text-Inhalten einer TYPO3 Seite ein.</target>
-		</trans-unit>
-		<trans-unit id="configure_plainParams_details" approved="yes">
-			<source>The specified parameters will be added to the URL used to fetch the plain text content of the direct mail from a TYPO3 page. If in doubt, set it either to '&amp;type=99' or, when using TemplaVoila, to '&amp;print=1'.</source>
-			<target>Die eingegebene Parameter werden in der URL hinzugefügt, um HTML Inhalten einer TYPO3 Seite auszulesen. Im Zweifel, setzt entweder '&amp;type=99' oder '&amp;print=1' (nur TemplaVoila).</target>
-		</trans-unit>
-		<trans-unit id="configure_plain_and_html" approved="yes">
-			<source>Plain text and HTML</source>
-			<target>Text und HTML</target>
-		</trans-unit>
-		<trans-unit id="configure_plain_only" approved="yes">
-			<source>Plain text only</source>
-			<target>Nur text</target>
-		</trans-unit>
-		<trans-unit id="configure_priority_high" approved="yes">
-			<source>High</source>
-			<target>hoch</target>
-		</trans-unit>
-		<trans-unit id="configure_priority_low" approved="yes">
-			<source>Low</source>
-			<target>niedrig</target>
-		</trans-unit>
-		<trans-unit id="configure_priority_normal" approved="yes">
-			<source>Normal</source>
-			<target>Normal</target>
-		</trans-unit>
-		<trans-unit id="configure_quickmail_charset" approved="yes">
-			<source>Character set for quick mails</source>
-			<target>Zeichensatz des Quickmails</target>
-		</trans-unit>
-		<trans-unit id="configure_quickmail_charset_description" approved="yes">
-			<source>Specify the character set to use when sending quick mails.</source>
-			<target>Gibt das Zaichensatz für das Versand von Quickmail an:</target>
-		</trans-unit>
-		<trans-unit id="configure_quickmail_encoding" approved="yes">
-			<source>Encoding for quick mails</source>
-			<target>Kodierung des Quickmails</target>
-		</trans-unit>
-		<trans-unit id="configure_quickmail_encoding_description" approved="yes">
-			<source>Select the content transfer encoding to use when sending quick mails.</source>
-			<target>Select the content transfer encoding to use when sending quick mails.</target>
-		</trans-unit>
-		<trans-unit id="configure_test_dmail_group_uids" approved="yes">
-			<source>List of UID numbers of test recipient lists:</source>
-			<target>Liste der UID Nummern von Testempfängern:</target>
-		</trans-unit>
-		<trans-unit id="configure_test_dmail_group_uids_description" approved="yes">
-			<source>Alternatively to sending test-mails to individuals, you can choose to send to a whole list. This is the list of recipient lists UID numbers available for this action.</source>
-			<target>Alternativ können Sie Test-E-Mails an einer Liste verschicken. Es ist die UID-Nummer der Liste, die für das Testversand verfügbar soll.</target>
-		</trans-unit>
-		<trans-unit id="configure_test_tt_address_uids" approved="yes">
-			<source>List of UID numbers of test recipients (tt_address):</source>
-			<target>Liste der UID (tt_address) von Testempfängern:</target>
-		</trans-unit>
-		<trans-unit id="configure_test_tt_address_uids_description" approved="yes">
-			<source>Before sending mails, you should test the mail content by sending test mails to one or more test recipients. The available recipients for testing are determined by this list of UID numbers. So first, find out the UID numbers (tt_address) of the recipients you wish to use for testing, then enter them here in a comma-separated list.</source>
-			<target>Vor dem Versand sollten Sie die E-Mail überprüfen, in dem Sie die E-Mail an ein oder mehrere Empfängern verschicken. Die verfügbaren Empfänger sind in eine Liste von UID bestimmt. Finde die UID Nummer der Empfängern (tt_address), die als Testempfängern fungieren und gibt in einer komma getrennte Liste ein.</target>
-		</trans-unit>
-		<trans-unit id="configure_testmail" approved="yes">
-			<source>Subject for the testmail.</source>
-			<target>Betreff des Test-Newsletters.</target>
-		</trans-unit>
-		<trans-unit id="configure_testmail_description" approved="yes">
-			<source>This will be prepended to the test newsletter subject</source>
-			<target>Dies wird vor dem Betreff des Test-Newsletter angehängt.</target>
-		</trans-unit>
-		<trans-unit id="configure_update_configuration" approved="yes">
-			<source>Update configuration</source>
-			<target>Aktualisiere Konfigurationen</target>
-		</trans-unit>
-		<trans-unit id="configure_user_table" approved="yes">
-			<source>Custom-defined table:</source>
-			<target>Benutzerdefinierte Tabelle:</target>
-		</trans-unit>
-		<trans-unit id="configure_user_table_description" approved="yes">
-			<source>Enter the name of a custom-defined table, with compatible columns defined, which may also be used for direct mails distribution.</source>
-			<target>Gibt der benutzerdefinierte Tabellenname ein, die für das Versand der Direct Mails benutzt werden soll.</target>
-		</trans-unit>
-		<trans-unit id="dmail_HTML_url" approved="yes">
-			<source>URL of HTML content:</source>
-			<target>HTML URL:</target>
-		</trans-unit>
-		<trans-unit id="dmail_cancel" approved="yes">
-			<source>Cancel</source>
-			<target>Abbrechen</target>
-		</trans-unit>
-		<trans-unit id="dmail_createMail" approved="yes">
-			<source>Create mail</source>
-			<target>E-Mail erstellen</target>
-		</trans-unit>
-		<trans-unit id="dmail_dovsk_crFromNL" approved="yes">
-			<source>Create a new Direct Mail from a page</source>
-			<target>Neuen Versand anhand einer Seite erstellen</target>
-		</trans-unit>
-		<trans-unit id="dmail_dovsk_crFromUrl" approved="yes">
-			<source>Create a new Direct Mail from external URL</source>
-			<target>Neuen Versand anhand einer externen URL erstellen</target>
-		</trans-unit>
-		<trans-unit id="dmail_edit" approved="yes">
-			<source>Edit</source>
-			<target>Ändern</target>
-		</trans-unit>
-		<trans-unit id="dmail_error" approved="yes">
-			<source>An error was encountered.</source>
-			<target>FEHLER</target>
-		</trans-unit>
-		<trans-unit id="dmail_folders" approved="yes">
-			<source>Available Direct Mail folders</source>
-			<target>Für Direct Mail konfigurierte Ordner</target>
-		</trans-unit>
-		<trans-unit id="dmail_frames_not allowed" approved="yes">
-			<source>Pages with HTML frames may not be fetched.</source>
-			<target>Seiten mit HTML Frame können nicht ausgelesen werden.</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_caution" approved="yes">
-			<source>Caution</source>
-			<target>Achtung</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_caution_msg" approved="yes">
-			<source>Please check the cronjob or cronjob is not set.</source>
-			<target>Cronjob prüfen oder Cronjob ist nicht konfiguriert.</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_lastrun" approved="yes">
-			<source>Last run: </source>
-			<target>Zuletzt ausgeführt: </target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_ok" approved="yes">
-			<source>OK</source>
-			<target>OK</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_ok_msg" approved="yes">
-			<source>Cronjob is running.</source>
-			<target>Cronjob läuft.</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_status" approved="yes">
-			<source>Cron job status</source>
-			<target>Cron job Status</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_warning" approved="yes">
-			<source>Warning</source>
-			<target>Warnung</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_warning_msg" approved="yes">
-			<source>Please check the cronjob.</source>
-			<target>Cronjob prüfen.</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_current_time" approved="yes">
-			<source>Current time:</source>
-			<target>Aktuelle Zeit:</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_delete" approved="yes">
-			<source>delete</source>
-			<target>Entfernen</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_delivery_begun" approved="yes">
-			<source>Delivery begun</source>
-			<target>Versand-Start</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_delivery_ended" approved="yes">
-			<source>Delivery ended</source>
-			<target>Versand-Ende</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_invoke_now" approved="yes">
-			<source>Invoke Mailer Engine</source>
-			<target>Versand anstoßen</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_invoked" approved="yes">
-			<source>Mailer Engine Invoked!</source>
-			<target>Versand wurde angestoßen!</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_log" approved="yes">
-			<source>Log:</source>
-			<target>Protokoll:</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_manual_explain" approved="yes">
-			<source>If TYPO3 is not configured to automatically invoke the Mailer Engine, you can invoke it by clicking here:</source>
-			<target>Falls TYPO3 nicht so konfiguriert ist, um automatisch einen Versand anzustoßen, so haben Sie hier die Gelegenheit, dies manuell durchzuführen: </target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_manual_invoke" approved="yes">
-			<source>Manually Invoke Engine</source>
-			<target>Manueller Versandstart</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_number_sent" approved="yes">
-			<source># sent</source>
-			<target># verschickt</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_scheduled" approved="yes">
-			<source>Scheduled</source>
-			<target>Planzeit</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_status" approved="yes">
-			<source>Mail Engine Status</source>
-			<target>Status</target>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_subject" approved="yes">
-			<source>Subject</source>
-			<target>Betreff</target>
-		</trans-unit>
-		<trans-unit id="dmail_makeQuery" approved="yes">
-			<source>Make query</source>
-			<target>Generiere Abfrage</target>
-		</trans-unit>
-		<trans-unit id="dmail_menuItems_testmail" approved="yes">
-			<source>Send a testmail</source>
-			<target>Eine Testmail versenden</target>
-		</trans-unit>
-		<trans-unit id="dmail_menu_conf" approved="yes">
-			<source>Module configuration</source>
-			<target>Modulkonfiguration</target>
-		</trans-unit>
-		<trans-unit id="dmail_menu_convert_categories" approved="yes">
-			<source>Categories Conversion</source>
-			<target>Konvertierung von Kategorien</target>
-		</trans-unit>
-		<trans-unit id="dmail_menu_quickMail" approved="yes">
-			<source>QuickMail</source>
-			<target>QuickMail</target>
-		</trans-unit>
-		<trans-unit id="dmail_newsletters" approved="yes">
-			<source>Direct Mail Extension</source>
-			<target>Direct Mail Erweiterung</target>
-		</trans-unit>
-		<trans-unit id="dmail_no" approved="yes">
-			<source>NO</source>
-			<target>NEIN</target>
-		</trans-unit>
-		<trans-unit id="dmail_noCreateAccess" approved="yes">
-			<source>You cannot create direct mails using pages that are hidden or access-restricted.</source>
-			<target>Sie besitzen nicht die Möglichkeit, versteckte oder zugriffsbeschränkte Seiten zu verschicken.</target>
-		</trans-unit>
-		<trans-unit id="dmail_noEdit_isSent" approved="yes">
-			<source>Cannot edit - mail has been sent</source>
-			<target>Kein Editieren möglich - E-Mail wurde bereits versandt.</target>
-		</trans-unit>
-		<trans-unit id="dmail_noEdit_noPerms" approved="yes">
-			<source>Cannot edit - you don't have permissions to edit Direct Mails.</source>
-			<target>Kein Editieren möglich - Sie haben nicht die Berechtigung, Versandobjekte zu editieren.</target>
-		</trans-unit>
-		<trans-unit id="dmail_noRegular" approved="yes">
-			<source>This type of page cannot be used to create direct mails. Please select a regular page.</source>
-			<target>Dieser Seitentyp kann nicht als E-Mail versendet werden. Bitte wählen Sie eine reguläre Seite.</target>
-		</trans-unit>
-		<trans-unit id="dmail_no_html_boundaries" approved="yes">
-			<source>The HTML content does not contain any direct mail boundaries.</source>
-			<target>The HTML content does not contain any direct mail boundaries.</target>
-		</trans-unit>
-		<trans-unit id="dmail_no_html_content" approved="yes">
-			<source>The HTML content could not be fetched.</source>
-			<target>Die HTML Inhalten können nicht ausgelesen werden.</target>
-		</trans-unit>
-		<trans-unit id="dmail_no_plain_boundaries" approved="yes">
-			<source>The plain text content does not contain any direct mail boundaries.</source>
-			<target>The plain text content does not contain any direct mail boundaries.</target>
-		</trans-unit>
-		<trans-unit id="dmail_no_plain_content" approved="yes">
-			<source>The plain text content could not be fetched.</source>
-			<target>Die Text Inhalten können nicht ausgelesen werden.</target>
-		</trans-unit>
-		<trans-unit id="dmail_no_valid_url" approved="yes">
-			<source>Enter at least one valid URL!</source>
-			<target>Gibt eine gültige URL ein!</target>
-		</trans-unit>
-		<trans-unit id="dmail_number_records" approved="yes">
-			<source>Number of records:</source>
-			<target>Anzahl der Einträge:</target>
-		</trans-unit>
-		<trans-unit id="dmail_plaintext_url" approved="yes">
-			<source>URL of plain text content:</source>
-			<target>Plain Text URL:</target>
-		</trans-unit>
-		<trans-unit id="dmail_query" approved="yes">
-			<source>Query</source>
-			<target>Abfrage</target>
-		</trans-unit>
-		<trans-unit id="dmail_send" approved="yes">
-			<source>Send</source>
-			<target>Senden</target>
-		</trans-unit>
-		<trans-unit id="dmail_subject" approved="yes">
-			<source>Subject:</source>
-			<target>Betreff:</target>
-		</trans-unit>
-		<trans-unit id="dmail_updateQuery" approved="yes">
-			<source>Update query</source>
-			<target>Aktualisiere Abfrage</target>
-		</trans-unit>
-		<trans-unit id="dmail_view" approved="yes">
-			<source>Information on direct mail record:</source>
-			<target>Versand</target>
-		</trans-unit>
-		<trans-unit id="dmail_warning" approved="yes">
-			<source>Check the following warning.</source>
-			<target>WARNUNG</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_external_page" approved="yes">
-			<source>External Pages</source>
-			<target>Externe Seite</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_internal_page" approved="yes">
-			<source>Internal Pages</source>
-			<target>Interne Seite</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_list_dmail" approved="yes">
-			<source>Direct Mail</source>
-			<target>Direct Mail</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_list_header" approved="yes">
-			<source>Select a newsletter to continue sending:</source>
-			<target>Wähle ein Newsletter um weiter zu versenden:</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_new_newsletter" approved="yes">
-			<source>New Newsletter</source>
-			<target>Neue Newsletter</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_quickmail" approved="yes">
-			<source>Quickmail</source>
-			<target>Quickmail</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_quickmail_header" approved="yes">
-			<source>New Quickmail</source>
-			<target>Neue Quickmail</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_select_nl_source" approved="yes">
-			<source>Select newsletter source:</source>
-			<target>Wählen Sie Quelle des Newsletters aus:</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz2_detail" approved="yes">
-			<source>Detailed Information</source>
-			<target>Detaillierte Informationen</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz2_fetch_success" approved="yes">
-			<source>Page is successfully fetched.</source>
-			<target>Seite ist erfolgreich ausgelesen.</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz3_cats" approved="yes">
-			<source>Categories</source>
-			<target>Kategorien</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz4_testmail" approved="yes">
-			<source>Test Mail</source>
-			<target>Testversand</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz5_sendmass" approved="yes">
-			<source>Mass Send</source>
-			<target>Massenversand</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz_back" approved="yes">
-			<source>back</source>
-			<target>zurück</target>
-		</trans-unit>
-		<trans-unit id="dmail_wiz_next" approved="yes">
-			<source>next</source>
-			<target>weiter</target>
-		</trans-unit>
-		<trans-unit id="dmail_write_subject" approved="yes">
-			<source>[write subject]</source>
-			<target>[Betreff schreiben]</target>
-		</trans-unit>
-		<trans-unit id="dmail_yes" approved="yes">
-			<source>YES</source>
-			<target>JA</target>
-		</trans-unit>
-		<trans-unit id="dmailer_ending" approved="yes">
-			<source>Ending, parsetime:</source>
-			<target>Beendet, Laufzeit:</target>
-		</trans-unit>
-		<trans-unit id="dmailer_invoked_at" approved="yes">
-			<source>Invoked at</source>
-			<target>Aufgerufen:</target>
-		</trans-unit>
-		<trans-unit id="dmailer_job_begin" approved="yes">
-			<source>Job begin</source>
-			<target>Auftrag begonnen</target>
-		</trans-unit>
-		<trans-unit id="dmailer_job_end" approved="yes">
-			<source>Job end</source>
-			<target>Auftrag beendet</target>
-		</trans-unit>
-		<trans-unit id="dmailer_mid" approved="yes">
-			<source>Job No:</source>
-			<target>Auftrags-Nr.:</target>
-		</trans-unit>
-		<trans-unit id="dmailer_nothing_to_do" approved="yes">
-			<source>Nothing to do.</source>
-			<target>Keine Aufträge.</target>
-		</trans-unit>
-		<trans-unit id="dmailer_processed" approved="yes">
-			<source>processed...</source>
-			<target>bearbeitet...</target>
-		</trans-unit>
-		<trans-unit id="dmailer_sending" approved="yes">
-			<source>Sending</source>
-			<target>senden</target>
-		</trans-unit>
-		<trans-unit id="dmailer_sending_to_table" approved="yes">
-			<source>mails using records from table</source>
-			<target>Sende E-Mail an Empfängern von Tabelle</target>
-		</trans-unit>
-		<trans-unit id="dmailer_sys_dmail_record" approved="yes">
-			<source>sys_dmail record</source>
-			<target>Inhalt der Tabelle sys_dmail</target>
-		</trans-unit>
-		<trans-unit id="header_conf" approved="yes">
-			<source>Configuration</source>
-			<target>Konfigurationen</target>
-		</trans-unit>
-		<trans-unit id="header_directmail" approved="yes">
-			<source>Direct Mail</source>
-			<target>Direct Mail</target>
-		</trans-unit>
-		<trans-unit id="header_mailer" approved="yes">
-			<source>Mailer Engine</source>
-			<target>Versand-Status</target>
-		</trans-unit>
-		<trans-unit id="header_recip" approved="yes">
-			<source>Recipient Lists</source>
-			<target>Empfängerliste</target>
-		</trans-unit>
-		<trans-unit id="header_stat" approved="yes">
-			<source>Statistics</source>
-			<target>Statistiken</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_download" approved="yes">
-			<source>Download CSV file</source>
-			<target>Download CSV-Datei</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_header" approved="yes">
-			<source>Recipient List</source>
-			<target>Empfängerliste</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import" approved="yes">
-			<source>Import CSV into 'ADDRESS' table</source>
-			<target>Import: CSV-Datei =&gt; 'ADDRESS' - Tabelle</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_back" approved="yes">
-			<source>Back</source>
-			<target>Zurück</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_csv_dublette-description" approved="yes">
-			<source>Filter email dublettes from csv data. If a dublette is found, only the first entry is imported.</source>
-			<target>E-Mail-Dubletten in den CSV-Daten herausfiltern. Nur der erste CSV-Datensatz mit einer mehrfach vorkommenden E-Mail-Adresse wird importiert.</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_csv_validemail-description" approved="yes">
-			<source>Only update/import valid emails from csv data.</source>
-			<target>Nur aktualisieren/importieren, wenn die zu importierende E-Mail ein gültiges Format besitzt.</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_current_file" approved="yes">
-			<source>Current file:</source>
-			<target>Derzeit gewählte Datei:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_done" approved="yes">
-			<source>Import is finished.</source>
-			<target>Importvorgang ist fertig.</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_encapsulation" approved="yes">
-			<source>Field encapsulation character (data fields are encapsed with...):</source>
-			<target>Datenfelder sind mit diesem Zeichen eingeschlossen:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_first_fieldnames" approved="yes">
-			<source>First row of import file has fieldnames:</source>
-			<target>Erste Datenreihe des CSV Importfiles enthält Feldnamen:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_header_conf" approved="yes">
-			<source>Import settings</source>
-			<target>Import Konfigurationen</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_header_upload" approved="yes">
-			<source>Upload CSV</source>
-			<target>Hochladen CSV-Daten</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_import" approved="yes">
-			<source>Import</source>
-			<target>Importieren</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_all_html" approved="yes">
-			<source>All recipients receive HTML newsletter</source>
-			<target>Alle Empfängern bekommen HTML Newsletter</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_categories" approved="yes">
-			<source>Categories</source>
-			<target>Kategorien</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_cats" approved="yes">
-			<source>Assign the following categories to all recipients:</source>
-			<target>Weist folgende Kategorien an allen empfängern:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_cats_add" approved="yes">
-			<source>Add categories</source>
-			<target>Kategorien hinzufügen</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_charset" approved="yes">
-			<source>Settings</source>
-			<target>Einstellungen</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_charset_choose" approved="yes">
-			<source>Please select the character set of the import file:</source>
-			<target>Wählen Sie den Zeichensatz der Import-Datei:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_conf" approved="yes">
-			<source>Field mapping</source>
-			<target>Feldzuordnung</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_conf_add" approved="yes">
-			<source>Additional options</source>
-			<target>Zusatzoptionen</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_description" approved="yes">
-			<source>Description</source>
-			<target>Bezeichnung</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_error" approved="yes">
-			<source>Mapping error</source>
-			<target>Zuordnungsfehler</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_error_detail" approved="yes">
-			<source>Please fix following error(s):</source>
-			<target>Korrigieren Sie folgenden Fehler:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_error_email" approved="yes">
-			<source>&quot;Email&quot; field has to be mapped.</source>
-			<target>&quot;Email&quot; Feld muss zugeordnet werden.</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_error_noMap" approved="yes">
-			<source>No mapping is found. You have to map at least &quot;email&quot; field.</source>
-			<target>Es gib keine Zuordnung. &quot;Email&quot; Feld muss zugeordnet werden.</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_mapTo" approved="yes">
-			<source>Maps to ...</source>
-			<target>Zuordnung ...</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_mapping" approved="yes">
-			<source>Mapping</source>
-			<target>Zuordnung</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_number" approved="yes">
-			<source>#</source>
-			<target>#</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_value" approved="yes">
-			<source>Value</source>
-			<target>Wert</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_next" approved="yes">
-			<source>Next</source>
-			<target>Weiter</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_or" approved="yes">
-			<source>OR</source>
-			<target>ODER</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_overwrite" approved="yes">
-			<source>Overwrite existing file: </source>
-			<target>Bestehende Dateien überschreiben:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_paste_csv" approved="yes">
-			<source>Paste the CSV data:</source>
-			<target>Einfügen der CSV-Daten:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_ready_import" approved="yes">
-			<source>Ready to import</source>
-			<target>Bereit zum Importieren</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_ready_import_label" approved="yes" xml:space="preserve">
-			<source><![CDATA[All necessary information for the import have been entered.
-By clicking on the "Import" button below, all data will be written in tt_address.]]></source>
-			<target><![CDATA[Alle notwendigen Importeinstellungen sind eingetragen worden.
-Wenn Sie auf "Importieren" klicken, werden die Daten in tt_address Tabelle importiert.]]></target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_record_unique" approved="yes">
-			<source>Specify the field which determines the uniqueness of imported users:</source>
-			<target>Feld, das die Einzigartigkeit der importierten Benutzer feststellt:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_remove_existing" approved="yes">
-			<source>Remove all Addresses in the storage folder before importing:</source>
-			<target>Lösche alle vorhandenen Adresse-Datensätze im Speicherort vor dem Import:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_report_double" approved="yes">
-			<source>Double records found in the CSV Data:</source>
-			<target>doppelte Datensatz in CSV-Daten:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_report_invalid_email" approved="yes">
-			<source>Do not insert/update invalid emails found in csv data:</source>
-			<target>Folgende Einträge werden nicht aktualisiert/importiert, da die E-Mail-Adresse kein gültiges Format besitzt:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_report_new" approved="yes">
-			<source>Insert the following records:</source>
-			<target>Folgende Einträge werden importiert:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_report_update" approved="yes">
-			<source>Update the following records:</source>
-			<target>Folgende Einträge werden aktualisiert:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator" approved="yes">
-			<source>Field delimiter (data fields are separated by...):</source>
-			<target>Trennzeichen zwischen den einzelnen Datenfeldern (Feldtrenner):</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator_colon" approved="yes">
-			<source>colon [:]</source>
-			<target>Doppelpunkt [:]</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator_comma" approved="yes">
-			<source>comma [,]</source>
-			<target>Komma [,]</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator_semicolon" approved="yes">
-			<source>semicolon [;]</source>
-			<target>Semikolon [;]</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator_tab" approved="yes">
-			<source>horizontal tab [TAB]</source>
-			<target>Tabulator [TAB]</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_storage" approved="yes">
-			<source>Please select the storage folder for the imported users:</source>
-			<target>Wählen Sie den Speicherort für die importierten Benutzer:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_update" approved="yes">
-			<source>update</source>
-			<target>aktualisieren</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_update_unique" approved="yes">
-			<source>Update existing user, instead renaming the new user:</source>
-			<target>Vorhandene Benutzer wird aktualisiert statt neuer Benutzer umzubenennen:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_upload_file" approved="yes">
-			<source>Choose a file from your local computer:</source>
-			<target>Wählen Sie eine CSV Import Datei von Ihrem lokalen Rechner:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_list_all" approved="yes">
-			<source>List all recipients</source>
-			<target>Empfänger anzeigen</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_plain_list" approved="yes">
-			<source>Plain List</source>
-			<target>Liste</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_recip_from" approved="yes">
-			<source>Recipients from recipient list:</source>
-			<target>Empfänger der Gruppe:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_recip_number" approved="yes">
-			<source>Number of recipients:</source>
-			<target>Anzahl der Empfänger:</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_table_address" approved="yes">
-			<source>Address Table</source>
-			<target>Tabelle: Address</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_table_custom" approved="yes">
-			<source>Custom Table</source>
-			<target>Benutzerdefinierte Tabelle</target>
-		</trans-unit>
-		<trans-unit id="mailgroup_table_fe_users" approved="yes">
-			<source>Website User Table</source>
-			<target>Tabelle: Website User</target>
-		</trans-unit>
-		<trans-unit id="nl_cat" approved="yes">
-			<source>Assign categories to content elements</source>
-			<target>Ausschluss von Seiteninhalten anhand von Kategorien</target>
-		</trans-unit>
-		<trans-unit id="nl_cat_msg1" approved="yes">
-			<source>There are no content elements on the page.</source>
-			<target>Es wurden keine Seiteninhalte auf der Seite gefunden.</target>
-		</trans-unit>
-		<trans-unit id="nl_create" approved="yes">
-			<source>Create a newsletter</source>
-			<target>Newsletter erstellen</target>
-		</trans-unit>
-		<trans-unit id="nl_create_msg1" approved="yes">
-			<source>Click here to create a new page that you can later send as a direct mail.</source>
-			<target>Klicken Sie hier, um eine neue TYPO3-Seite, die Sie später als Newsletter verschicken können, anzulegen.</target>
-		</trans-unit>
-		<trans-unit id="nl_editPage" approved="yes">
-			<source>Edit page</source>
-			<target>Seite ändern</target>
-		</trans-unit>
-		<trans-unit id="nl_l_ALL" approved="yes">
-			<source>ALL</source>
-			<target>ALLE</target>
-		</trans-unit>
-		<trans-unit id="nl_l_ONLY" approved="yes">
-			<source>ONLY</source>
-			<target>NUR</target>
-		</trans-unit>
-		<trans-unit id="nl_l_attach" approved="yes">
-			<source>Attach.</source>
-			<target>Anhang</target>
-		</trans-unit>
-		<trans-unit id="nl_l_column" approved="yes">
-			<source>Column</source>
-			<target>Spalte</target>
-		</trans-unit>
-		<trans-unit id="nl_l_lastM" approved="yes">
-			<source>Last mod.</source>
-			<target>Letzte Änderung:</target>
-		</trans-unit>
-		<trans-unit id="nl_l_sent" approved="yes">
-			<source>Sent?</source>
-			<target>Verschickt?</target>
-		</trans-unit>
-		<trans-unit id="nl_l_size" approved="yes">
-			<source>Size</source>
-			<target>Größe</target>
-		</trans-unit>
-		<trans-unit id="nl_l_subject" approved="yes">
-			<source>Subject</source>
-			<target>Betreff</target>
-		</trans-unit>
-		<trans-unit id="nl_l_tDraft" approved="yes">
-			<source>Draft</source>
-			<target>Entwurf</target>
-		</trans-unit>
-		<trans-unit id="nl_l_tPage" approved="yes">
-			<source>PAGE</source>
-			<target>SEITE</target>
-		</trans-unit>
-		<trans-unit id="nl_l_tUrl" approved="yes">
-			<source>EXT URL</source>
-			<target>Externe URL</target>
-		</trans-unit>
-		<trans-unit id="nl_l_type" approved="yes">
-			<source>Type</source>
-			<target>Typ</target>
-		</trans-unit>
-		<trans-unit id="nl_l_update" approved="yes">
-			<source>Update category settings</source>
-			<target>Kategorie-Einstellungen ändern</target>
-		</trans-unit>
-		<trans-unit id="nl_l_warning" approved="yes">
-			<source>There are already %s Direct Mails based on this newsletter. Are you sure you want to create another one?</source>
-			<target>Für diesen Newsletter wurden bereits %s Versandobjekte erstellt. Sind Sie sicher, dass Sie einen weiteren Versand erstellen möchten?</target>
-		</trans-unit>
-		<trans-unit id="nl_select" approved="yes">
-			<source>Select a newsletter</source>
-			<target>Newsletter auswählen</target>
-		</trans-unit>
-		<trans-unit id="nl_select_msg1" approved="yes">
-			<source>There are no pages in the mail module.</source>
-			<target>Es gibt keine Seiten für diese Extension.</target>
-		</trans-unit>
-		<trans-unit id="nl_viewPage_HTML" approved="yes">
-			<source>View page in HTML format</source>
-			<target>Seite in HTML-Format anzeigen</target>
-		</trans-unit>
-		<trans-unit id="nl_viewPage_TXT" approved="yes">
-			<source>View page in Text format</source>
-			<target>Seite in TEXT-Format anzeigen</target>
-		</trans-unit>
-		<trans-unit id="quickmail_break_lines" approved="yes">
-			<source>Break lines to 76 char:</source>
-			<target>Zeile nach 76 Buchstaben umbrechen:</target>
-		</trans-unit>
-		<trans-unit id="quickmail_message" approved="yes">
-			<source>Message:</source>
-			<target>Nachricht:</target>
-		</trans-unit>
-		<trans-unit id="quickmail_sender_email" approved="yes">
-			<source>Sender Email:</source>
-			<target>Absender (E-Mail):</target>
-		</trans-unit>
-		<trans-unit id="quickmail_sender_name" approved="yes">
-			<source>Sender Name:</source>
-			<target>Absender (Name):</target>
-		</trans-unit>
-		<trans-unit id="recip_create_mailgroup" approved="yes">
-			<source>New recipient list</source>
-			<target>Neue Versandgruppe</target>
-		</trans-unit>
-		<trans-unit id="recip_create_mailgroup_msg" approved="yes">
-			<source>Create a new recipient list?</source>
-			<target>Neue Versandgruppe erstellen?</target>
-		</trans-unit>
-		<trans-unit id="recip_group_amount" approved="yes">
-			<source>Amount:</source>
-			<target>Summe:</target>
-		</trans-unit>
-		<trans-unit id="recip_import_mailgroup_msg" approved="yes">
-			<source>Click here to import CSV</source>
-			<target>Klicken Sie hier, um eine CSV-Datei einzulesen.</target>
-		</trans-unit>
-		<trans-unit id="recip_select_mailgroup" approved="yes">
-			<source>Select a recipient list</source>
-			<target>Auswahl der Versandgruppe</target>
-		</trans-unit>
-		<trans-unit id="schedule_mailgroup" approved="yes">
-			<source>Recipient list:</source>
-			<target>Empfängerliste:</target>
-		</trans-unit>
-		<trans-unit id="schedule_select_mailgroup" approved="yes">
-			<source>Send mail - recipient list</source>
-			<target>Auswahl der Versandgruppe</target>
-		</trans-unit>
-		<trans-unit id="schedule_send_all" approved="yes">
-			<source>Send to all subscribers in recipient list</source>
-			<target>An alle Empfänger der Versandgruppe versenden</target>
-		</trans-unit>
-		<trans-unit id="schedule_testmail" approved="yes">
-			<source>Send this as test newsletter</source>
-			<target>Dies ist ein Test-Newsletter</target>
-		</trans-unit>
-		<trans-unit id="schedule_time" approved="yes">
-			<source>Distribution time (hh:mm dd-mm-yyyy):</source>
-			<target>Zeitpunkt des Versands (SS:MM TT-MM-YY):</target>
-		</trans-unit>
-		<trans-unit id="select_folder" approved="yes">
-			<source>Please select Direct Mail folder.</source>
-			<target>Bitte einen Direct Mail Verzeichnis auswählen.</target>
-		</trans-unit>
-		<trans-unit id="send_recipients" approved="yes">
-			<source>Recipients:</source>
-			<target>Empfänger:</target>
-		</trans-unit>
-		<trans-unit id="send_sending" approved="yes">
-			<source>Sending mail</source>
-			<target>Mail verschicken</target>
-		</trans-unit>
-		<trans-unit id="send_was_scheduled" approved="yes">
-			<source>Mail scheduled for distribution</source>
-			<target>Die E-Mail wurde für den Versand freigeben.</target>
-		</trans-unit>
-		<trans-unit id="send_was_scheduled_for" approved="yes">
-			<source>The mail was scheduled for distribution at</source>
-			<target>Planversand der E-Mail:</target>
-		</trans-unit>
-		<trans-unit id="send_was_sent" approved="yes">
-			<source>The mail was sent.</source>
-			<target>Die E-Mail wurde verschickt.</target>
-		</trans-unit>
-		<trans-unit id="send_was_sent_to_name" approved="yes">
-			<source>The mail was sent to &lt;strong&gt;%s&lt;/strong&gt;.</source>
-			<target>Die E-Mail wurde an &lt;strong&gt;%s&lt;/strong&gt; verschickt.</target>
-		</trans-unit>
-		<trans-unit id="send_was_sent_to_number" approved="yes">
-			<source>The mail was sent to &lt;strong&gt;%s&lt;/strong&gt; recipients.</source>
-			<target>Die E-Mail wurde an &lt;strong&gt;%s&lt;/strong&gt; Empfänger verschickt.</target>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned" approved="yes">
-			<source>CSV of returned recipients</source>
-			<target>CSV-Export der zurückgekommenen Empfänger</target>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_bad_header" approved="yes">
-			<source>CSV of returned recipients with error in header</source>
-			<target>CSV-Datei der zurückgekommenen E-Mails (Fehler in Kopfzeile)</target>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_bad_host" approved="yes">
-			<source>CSV of returned recipients with bad host</source>
-			<target>CSV-Datei der zurückgekommenen E-Mails (Unbekannter Server)</target>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_mailbox_full" approved="yes">
-			<source>CSV of returned recipients with mailbox full</source>
-			<target>CSV-Datei der zurückgekommenen E-Mails (Postfach voll)</target>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_reason_unknown" approved="yes">
-			<source>CSV of returned recipients for unknown reason</source>
-			<target>CSV-Datei der zurückgekommenen E-Mails (unbekannter Grund)</target>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_unknown_recipient" approved="yes">
-			<source>CSV of returned recipients with unknown recipient</source>
-			<target>CSV-Datei der zurückgekommenen E-Mails (Empfänger unbekannt)</target>
-		</trans-unit>
-		<trans-unit id="stats_HTML" approved="yes">
-			<source>HTML:</source>
-			<target>HTML:</target>
-		</trans-unit>
-		<trans-unit id="stats_HTML_link_nr" approved="yes">
-			<source>HTML Link #</source>
-			<target>HTML Link #</target>
-		</trans-unit>
-		<trans-unit id="stats_HTML_mails_viewed" approved="yes">
-			<source>HTML mails viewed:</source>
-			<target>Gelesen (HTML-Mails):</target>
-		</trans-unit>
-		<trans-unit id="stats_bad_host" approved="yes">
-			<source>Bad host:</source>
-			<target>Falscher Host:</target>
-		</trans-unit>
-		<trans-unit id="stats_count" approved="yes">
-			<source>Count:</source>
-			<target>Anzahl:</target>
-		</trans-unit>
-		<trans-unit id="stats_direct_mail" approved="yes">
-			<source>Statistics for direct mail:</source>
-			<target>Versand-Statistik:</target>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned" approved="yes">
-			<source>Disable returned recipients</source>
-			<target>Deaktiverung der zurückgekommenen Empfänger</target>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_bad_header" approved="yes">
-			<source>Disable returned recipients with error in header</source>
-			<target>Zurückgekommene E-Mails (Fehler in Kopfzeile) deaktivieren</target>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_bad_host" approved="yes">
-			<source>Disable returned recipients with bad host</source>
-			<target>Zurückgekommene E-Mails (Unbekannter Server) deaktivieren</target>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_mailbox_full" approved="yes">
-			<source>Disable returned recipients with mailbox full</source>
-			<target>Zurückgekommene E-Mails (Postfach voll) deaktivieren</target>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_reason_unknown" approved="yes">
-			<source>Disable returned recipients for unknown reason</source>
-			<target>Zurückgekommene E-Mails (unbekannter Grund) deaktivieren</target>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_unknown_recipient" approved="yes">
-			<source>Disable returned recipients with unknown recipient</source>
-			<target>Zurückgekommene E-Mail-Adressen (Empfänger unbekannt) deaktivieren</target>
-		</trans-unit>
-		<trans-unit id="stats_emails" approved="yes">
-			<source>List of recipients from tt_address table:</source>
-			<target>Liste der tt_address Empfängern:</target>
-		</trans-unit>
-		<trans-unit id="stats_emails_disabled" approved="yes">
-			<source>adresses disabled</source>
-			<target>Adressen deaktiviert</target>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_bad_header_list" approved="yes">
-			<source>Email adresses of returned mails with error in header:</source>
-			<target>E-Mail-Adressen der zurückgekommen E-Mails (Fehler in Kopfzeile):</target>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_bad_host_list" approved="yes">
-			<source>Email adresses of returned mails with bad host:</source>
-			<target>E-Mail-Adressen der zurückgekommen E-Mails (Unbekannter Server):</target>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_list" approved="yes">
-			<source>Email adresses of returned mails:</source>
-			<target>E-Mail-Adressen der zurückgekommenen Mails:</target>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_mailbox_full_list" approved="yes">
-			<source>Email adresses of returned mails with mailbox full:</source>
-			<target>E-Mail-Adressen der zurückgekommen E-Mails (Postfach voll):</target>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_reason_unknown_list" approved="yes">
-			<source>Email adresses of returned mails for unknown reason:</source>
-			<target>E-Mail-Adressen der zurückgekommen E-Mails (unbekannter Grund):</target>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_unknown_recipient_list" approved="yes">
-			<source>Email adresses of returned mails with unknown recipient:</source>
-			<target>E-Mail-Adressen der zurückgekommen E-Mails (Empfänger unbekannt):</target>
-		</trans-unit>
-		<trans-unit id="stats_error_in_header" approved="yes">
-			<source>Error in Header:</source>
-			<target>Fehler im Mail-Header:</target>
-		</trans-unit>
-		<trans-unit id="stats_general_information" approved="yes">
-			<source>General information:</source>
-			<target>Allgemeine Informationen:</target>
-		</trans-unit>
-		<trans-unit id="stats_img_link" approved="yes">
-			<source>Imagelink:</source>
-			<target>Bildlink: </target>
-		</trans-unit>
-		<trans-unit id="stats_links_clicked_per_respondent" approved="yes">
-			<source>Total responses/Unique responses:</source>
-			<target>Angeklickte Links per Empfänger:</target>
-		</trans-unit>
-		<trans-unit id="stats_list_returned" approved="yes">
-			<source>List returned recipients</source>
-			<target>Liste der zurückgekommenen Empfänger</target>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_bad_header" approved="yes">
-			<source>List returned recipients with error in header</source>
-			<target>Liste der zurückgekommenen E-Mails (Fehler in Kopfzeile)</target>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_bad_host" approved="yes">
-			<source>List returned recipients with bad host</source>
-			<target>Liste der zurückgekommenen E-Mails (Unbekannter Server)</target>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_mailbox_full" approved="yes">
-			<source>List returned recipients with mailbox full</source>
-			<target>Liste der zurückgekommenen E-Mails (Postfach voll)</target>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_reason_unknown" approved="yes">
-			<source>List returned recipients for unknown reason</source>
-			<target>Liste der zurückgekommenen E-Mails (unbekannter Grund)</target>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_unknown_recipient" approved="yes">
-			<source>List returned recipients with unknown recipient</source>
-			<target>Liste der zurückgekommenen E-Mails (Empfänger unbekannt)</target>
-		</trans-unit>
-		<trans-unit id="stats_mailbox_full" approved="yes">
-			<source>Mailbox full:</source>
-			<target>Postfach voll:</target>
-		</trans-unit>
-		<trans-unit id="stats_mails_returned" approved="yes">
-			<source>Mails returned:</source>
-			<target>Zurückgekommene E-Mails:</target>
-		</trans-unit>
-		<trans-unit id="stats_mails_sent" approved="yes">
-			<source>Mails sent:</source>
-			<target>Verschickte E-Mails:</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_choose" approved="yes">
-			<source>Choose a newsletter</source>
-			<target>Wähle ein Newsletter aus</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_delivery_begun" approved="yes">
-			<source>Delivery begun</source>
-			<target>Versand-Start</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_delivery_ended" approved="yes">
-			<source>Delivery ended</source>
-			<target>Versand-Ende</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_header" approved="yes">
-			<source>Newsletter Statistics</source>
-			<target>Newsletter Statistiken</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_queuing" approved="yes">
-			<source>queuing</source>
-			<target>in der Warteschlange</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_scheduled" approved="yes">
-			<source>Scheduled</source>
-			<target>Planzeit</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_sending" approved="yes">
-			<source>sending</source>
-			<target>sendend</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_sent" approved="yes">
-			<source>sent</source>
-			<target>verschickt</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_status" approved="yes">
-			<source>Status</source>
-			<target>Status</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_subject" approved="yes">
-			<source>Subject</source>
-			<target>Betreff</target>
-		</trans-unit>
-		<trans-unit id="stats_overview_total_sent" approved="yes">
-			<source># sent</source>
-			<target># verschickt</target>
-		</trans-unit>
-		<trans-unit id="stats_plaintext" approved="yes">
-			<source>Plaintext:</source>
-			<target>Plaintext:</target>
-		</trans-unit>
-		<trans-unit id="stats_plaintext_link_nr" approved="yes">
-			<source>Plaintext Link #</source>
-			<target>Plaintext Link #</target>
-		</trans-unit>
-		<trans-unit id="stats_reason_unkown" approved="yes">
-			<source>Reason unknown:</source>
-			<target>Grund unbekannt:</target>
-		</trans-unit>
-		<trans-unit id="stats_recalculate_cached_data" approved="yes">
-			<source>Re-calculate Cached Data:</source>
-			<target>Neuberechnung der Daten aus dem Zwischenspeicher (Cache):</target>
-		</trans-unit>
-		<trans-unit id="stats_recalculate_stats" approved="yes">
-			<source>Re-calculate cached statistics data</source>
-			<target>Neuberechnung der Daten aus dem Zwischenspeicher (Cache)</target>
-		</trans-unit>
-		<trans-unit id="stats_recipient_unknown" approved="yes">
-			<source>Recipient unknown:</source>
-			<target>Unbekannte Empfänger:</target>
-		</trans-unit>
-		<trans-unit id="stats_response" approved="yes">
-			<source>Responses:</source>
-			<target>Reaktionen:</target>
-		</trans-unit>
-		<trans-unit id="stats_response_link" approved="yes">
-			<source>Link Responses:</source>
-			<target>Geklickte Links:</target>
-		</trans-unit>
-		<trans-unit id="stats_total" approved="yes">
-			<source>Total:</source>
-			<target>Insgesamt:</target>
-		</trans-unit>
-		<trans-unit id="stats_total_mails_returned" approved="yes">
-			<source>Total mails returned:</source>
-			<target>Insgesamt zurückgekommen:</target>
-		</trans-unit>
-		<trans-unit id="stats_total_responses" approved="yes">
-			<source>Total responses (links clicked):</source>
-			<target>Reaktionen insgesamt (Anzahl Klicks):</target>
-		</trans-unit>
-		<trans-unit id="stats_unique_responses" approved="yes">
-			<source>Unique responses (links clicked):</source>
-			<target>Anzahl der klickenden Empfänger:</target>
-		</trans-unit>
-		<trans-unit id="stats_website_users" approved="yes">
-			<source>List of recipients from fe_users:</source>
-			<target>Liste der fe_users Empfängern:</target>
-		</trans-unit>
-		<trans-unit id="stats_website_users_disabled" approved="yes">
-			<source>website users disabled</source>
-			<target>Website-Benutzer deaktiviert</target>
-		</trans-unit>
-		<trans-unit id="subscriber_info" approved="yes">
-			<source>Subscriber Info</source>
-			<target>Abonnentsinfo</target>
-		</trans-unit>
-		<trans-unit id="subscriber_profile" approved="yes">
-			<source>Subscriber Profile</source>
-			<target>Abonnentsprofil</target>
-		</trans-unit>
-		<trans-unit id="subscriber_profile_htmlemail" approved="yes">
-			<source>Receive HTML based mails</source>
-			<target>empfange HTML E-Mail</target>
-		</trans-unit>
-		<trans-unit id="subscriber_profile_instructions" approved="yes">
-			<source>Set categories of interest for the subscriber.</source>
-			<target>Stelle die Kategorien des Abonnents ein.</target>
-		</trans-unit>
-		<trans-unit id="subscriber_profile_update" approved="yes">
-			<source>Update profile settings</source>
-			<target>Aktualisiere Profileinstellungen</target>
-		</trans-unit>
-		<trans-unit id="testmail_individual" approved="yes">
-			<source>Testmail - Individual</source>
-			<target>Individuelle Testmail</target>
-		</trans-unit>
-		<trans-unit id="testmail_individual_msg" approved="yes">
-			<source>Select a recipient of the testmail. The mail will be generated based on the profile of the recipient you select.</source>
-			<target>Bitte geben Sie den Empfänger für die Testmail an. Die hier generierte E-Mail wird auf dem Profil des ausgewählten Empfängers basieren.</target>
-		</trans-unit>
-		<trans-unit id="testmail_mailgroup" approved="yes">
-			<source>Testmail - Recipient list</source>
-			<target>Testmail an eine Versandgruppe</target>
-		</trans-unit>
-		<trans-unit id="testmail_mailgroup_msg" approved="yes">
-			<source>Select a recipient list for the testmail. The mails will be generated based on the profiles of the recipients in that list.</source>
-			<target>Bitte geben Sie die Versandgruppe für die Testmail an. Die hier generierte E-Mail wird auf dem Profil der ausgewählten Versandgruppe basieren.</target>
-		</trans-unit>
-		<trans-unit id="testmail_simple" approved="yes">
-			<source>Testmail - Simple</source>
-			<target>Einfache Testmail versenden</target>
-		</trans-unit>
-		<trans-unit id="testmail_simple_msg" approved="yes">
-			<source>A simple testmail includes all mail elements regardless of category. But any USER_fields are not substituted with data. Enter an email-address for the testmail:</source>
-			<target>Eine einfache Testmail enthält alle Elemente ohne Rücksicht auf die Kategorie. Jedoch werden keine Benutzerdaten ersetzt. Dies ist nur im personalisierten Massenversand möglich. Geben Sie hier den Empfänger für die Testmail an:</target>
-		</trans-unit>
-		<trans-unit id="update_convert_do_it_now" approved="yes">
-			<source>Do it now</source>
-			<target>Jetzt konvertieren</target>
-		</trans-unit>
-		<trans-unit id="update_convert_now" approved="yes">
-			<source>The direct_mail data in the sys_dmail table need to be update. Please backup the sys_dmail table before clicking the following button. Convert the data?</source>
-			<target>Die direct_mail Datenformat in der sys_dmail Tabelle muss aktualisiert werden. Bitte sichern Sie die sys_dmail-Tabellen, bevor Sie den folgenden Button klicken. Die Konvertierung durchführen?</target>
-		</trans-unit>
-		<trans-unit id="update_convert_result" approved="yes">
-			<source>%d records are converted</source>
-			<target>%d Datensätze sind konvertiert.</target>
-		</trans-unit>
-		<trans-unit id="update_option" approved="yes">
-			<source>Updater</source>
-			<target>Update</target>
-		</trans-unit>
-		<trans-unit id="update_optionHeader" approved="yes">
-			<source>Important!</source>
-			<target>Wichtig!</target>
-		</trans-unit>
-		<trans-unit id="update_optionLink" approved="yes">
-			<source>[Click here to open the updater]</source>
-			<target>[Hier klicken um das Update-Skript auszuführen]</target>
-		</trans-unit>
-		<trans-unit id="update_optionMsg" approved="yes">
-			<source>For the old data working with direct_mail version 3.0, data must be converted.</source>
-			<target>Damit die alten Daten mit direct_mail 3.0 funktionieren, müssen die Daten konvertiert werden.</target>
-		</trans-unit>
-		<trans-unit id="update_warningHeader" approved="yes">
-			<source>Warning! Please read!</source>
-			<target>Achtung! Bitte lesen!</target>
-		</trans-unit>
-		<trans-unit id="update_warningMsg" approved="yes" xml:space="preserve">
-			<source><![CDATA[The updater manipulates your database.
-				So backup your database (at least the sys_dmail table) or do a t3d export of your site (direct_mail sysfolder)
-				<strong>BEFORE</strong> <br>
-				you click on the "Do it now" buttons.]]></source>
-			<target><![CDATA[Folgendes Skript ändert die Daten in der Datenbank.
-				Bitte sichern Sie Ihre Datenbank (zumindes die sys_dmail Tabelle) oder exportieren Sie den Seitenbaum in t3d-Format (direct_mail SysOrdner)
-				<strong>BEVOR</strong> <br>
-				Sie den "Jetzt konvertieren" Button klicken.]]></target>
-		</trans-unit>
-		<trans-unit id="view_delivery_begin_end" approved="yes">
-			<source>Delivery begun/ended:</source>
-			<target>Versand begonnen/beendet:</target>
-		</trans-unit>
-		<trans-unit id="view_dmail" approved="yes">
-			<source>Direct Mail:</source>
-			<target>Versand:</target>
-		</trans-unit>
-		<trans-unit id="view_flowed" approved="yes">
-			<source>Flowed text:</source>
-			<target>Fließender Text:</target>
-		</trans-unit>
-		<trans-unit id="view_from" approved="yes">
-			<source>Sender:</source>
-			<target>Absender:</target>
-		</trans-unit>
-		<trans-unit id="view_mail" approved="yes">
-			<source>Email format/attachments:</source>
-			<target>Email-Format/Anhänge:</target>
-		</trans-unit>
-		<trans-unit id="view_media" approved="yes">
-			<source>Include media:</source>
-			<target>Medien einbinden:</target>
-		</trans-unit>
-		<trans-unit id="view_recipient_total_sent" approved="yes">
-			<source>Recipient total/sent:</source>
-			<target>Empfänger insgesamt/verschickt:</target>
-		</trans-unit>
-		<trans-unit id="view_replyto" approved="yes">
-			<source>Reply:</source>
-			<target>Antwort:</target>
-		</trans-unit>
-		<trans-unit id="yes" approved="yes">
-			<source>Yes</source>
-			<target>Ja</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/de.locallang_tca.xlf b/Resources/Private/Language/de.locallang_tca.xlf
deleted file mode 100644
index 1413a545b..000000000
--- a/Resources/Private/Language/de.locallang_tca.xlf
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" target-language="de" datatype="plaintext" original="messages" date="2016-02-05T12:03:27Z">
-		<header>
-			<description>Labels for the Direct Mail tables</description>
-			<type>database</type>
-			<fileId>EXT:direct_mail/Resources/Private/Language/locallang_tca.xml</fileId>
-			<labelContext></labelContext>
-			<authorName>Ivan Kartolo</authorName>
-			<authorEmail>ivan.kartolo@gmail.com</authorEmail>
-			<generator>LFEditor</generator>
-		</header>
-		<body>
-		<trans-unit id="module_sys_dmail_group.category" approved="yes">
-			<source>Subscribe to categories</source>
-			<target>Kategorien abonnieren</target>
-		</trans-unit>
-		<trans-unit id="module_sys_dmail_group.htmlemail" approved="yes">
-			<source>Recieve e-mails as HTML?</source>
-			<target>E-Mails im HTML-Format empfangen?</target>
-		</trans-unit>
-		<trans-unit id="module_sys_dmail_group.newsletter" approved="yes">
-			<source>Activate Newsletter</source>
-			<target>Newsletter aktivieren</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail" approved="yes">
-			<source>Direct mails</source>
-			<target>Direct-Mails</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.HTMLParams" approved="yes">
-			<source>Parameters, HTML:</source>
-			<target>Parameter, HTML:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.HTMLParams.ALT.1" approved="yes">
-			<source>URL for HTML content:</source>
-			<target>URL für HTML-Inhalt:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.attachment" approved="yes">
-			<source>Attachments:</source>
-			<target>Anhänge:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.authcode_fieldList" approved="yes">
-			<source>Fields used in the computation of authentication codes:</source>
-			<target>Für die Authentifizierung verwendete Felder:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.charset" approved="yes">
-			<source>Message text character set:</source>
-			<target>E-Mail-Zeichensatz (character set):</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.flowedFormat" approved="yes">
-			<source>Use flowing text format in plain text content:</source>
-			<target>Fließendes Format (flowed) im Text-Format verwenden:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.from_email" approved="yes">
-			<source>Sender email:</source>
-			<target>Absender-E-Mail:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.from_name" approved="yes">
-			<source>Sender name:</source>
-			<target>Absender-Name:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.includeMedia" approved="yes">
-			<source>Include images and other media in HTML content:</source>
-			<target>Bilder und andere Medien im HTML-Format einbinden:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.issent" approved="yes">
-			<source>Is sent:</source>
-			<target>Gesendet:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.long_link_mode" approved="yes">
-			<source>Redirect not only links longer than 76 characters but ALL links:</source>
-			<target>Nicht nur Links länger als 76 Zeichen, sondern ALLE Links:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.long_link_rdct_url" approved="yes">
-			<source>Long links redirection url:</source>
-			<target>Lange Link-Redirect-URL (RDCT):</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.organisation" approved="yes">
-			<source>Organization:</source>
-			<target>Organisation:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.page" approved="yes">
-			<source>Mail page:</source>
-			<target>Seiten senden:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.plainParams" approved="yes">
-			<source>Parameters, Plain text:</source>
-			<target>Parameter, normaler Text:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.plainParams.ALT.1" approved="yes">
-			<source>URL for plain text content:</source>
-			<target>URL für normalen Text:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.priority" approved="yes">
-			<source>Priority:</source>
-			<target>Priorität:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.priority.I.0" approved="yes">
-			<source>Low</source>
-			<target>Niedrig</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.priority.I.2" approved="yes">
-			<source>High</source>
-			<target>Hoch</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.renderedsize" approved="yes">
-			<source>Compiled size:</source>
-			<target>Übertragungsgröße:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.replyto_email" approved="yes">
-			<source>Reply email:</source>
-			<target>Antwort-E-Mail:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.replyto_name" approved="yes">
-			<source>Reply name:</source>
-			<target>Antwort-Name:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.return_path" approved="yes">
-			<source>Return Path:</source>
-			<target>Retouradresse (Return Path):</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.scheduled" approved="yes">
-			<source>Scheduled time:</source>
-			<target>Planzeit:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.scheduled_begin" approved="yes">
-			<source>Delivery start:</source>
-			<target>Versand-Start:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.scheduled_end" approved="yes">
-			<source>Delivery end:</source>
-			<target>Versand-Ende:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.sendOptions" approved="yes">
-			<source>Format of mail content:</source>
-			<target>Format des E-Mails:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.sendOptions.I.0" approved="yes">
-			<source>Plain text</source>
-			<target>Normaler Text</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.sendOptions.I.1" approved="yes">
-			<source>HTML</source>
-			<target>HTML</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.subject" approved="yes">
-			<source>Subject:</source>
-			<target>Betreff:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.transfer_encoding" approved="yes">
-			<source>Content transfer encoding:</source>
-			<target>E-Mail-Übertragungsformat (transfer encoding):</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.type.I.0" approved="yes">
-			<source>TYPO3 Page</source>
-			<target>TYPO3-Seite</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.type.I.1" approved="yes">
-			<source>External URL</source>
-			<target>Externe URL</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail.use_rdct" approved="yes">
-			<source>Redirect links longer than 76 characters:</source>
-			<target>Links länger als 76 Zeichen umleiten (Redirect):</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_category" approved="yes">
-			<source>Direct Mail Category</source>
-			<target>Direct-Mail-Kategorie</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_category.category" approved="yes">
-			<source>Category:</source>
-			<target>Kategorie</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group" approved="yes">
-			<source>Recipient list</source>
-			<target>Versandgruppe</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.advanced" approved="yes">
-			<source>Configuration</source>
-			<target>Konfigurationen</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.csv.I.0" approved="yes">
-			<source>Separate emails by space/comma/linebreak</source>
-			<target>Trennung der Emails durch Leerzeichen/Kommata/Zeilenumbruch</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.csv.I.1" approved="yes">
-			<source>CSV [name],[email]</source>
-			<target>CSV [name],[email]</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.list" approved="yes">
-			<source>Recipients:</source>
-			<target>Empfänger:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.mail_groups" approved="yes">
-			<source>Other recipient lists:</source>
-			<target>Andere Versandgruppen:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories" approved="yes">
-			<source>Must subscribe to one of the categories:</source>
-			<target>Kategorien müssen übereinstimmen:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.0" approved="yes">
-			<source></source>
-			<target>Kat 0</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.1" approved="yes">
-			<source></source>
-			<target>Kat 1</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.2" approved="yes">
-			<source></source>
-			<target>Kat 2</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.3" approved="yes">
-			<source></source>
-			<target>Kat 3</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.4" approved="yes">
-			<source></source>
-			<target>Kat 4</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.5" approved="yes">
-			<source></source>
-			<target>Kat 5</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.6" approved="yes">
-			<source></source>
-			<target>Kat 6</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.7" approved="yes">
-			<source></source>
-			<target>Kat 7</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.8" approved="yes">
-			<source></source>
-			<target>Kat 8</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.select_categories.I.9" approved="yes">
-			<source></source>
-			<target>Kat 9</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.static_list" approved="yes">
-			<source>Recipients:</source>
-			<target>Empfänger:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.type.I.0" approved="yes">
-			<source>From pages</source>
-			<target>Von Seiten</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.type.I.1" approved="yes">
-			<source>Plain list</source>
-			<target>Normale Liste</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.type.I.2" approved="yes">
-			<source>Static list</source>
-			<target>Statische Gruppe</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.type.I.3" approved="yes">
-			<source>Special query</source>
-			<target>Spezielle Anfrage</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.type.I.4" approved="yes">
-			<source>From other recipient lists</source>
-			<target>Andere Mailgruppe</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.whichtables" approved="yes">
-			<source>Types of records:</source>
-			<target>Tabellen:</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.whichtables.I.0" approved="yes">
-			<source>Address</source>
-			<target>Adresse</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.whichtables.I.1" approved="yes">
-			<source>Website user</source>
-			<target>Website-Benutzer</target>
-		</trans-unit>
-		<trans-unit id="sys_dmail_group.whichtables.I.2" approved="yes">
-			<source>From custom-defined table</source>
-			<target>Benutzerdefinierte Tabelle</target>
-		</trans-unit>
-		</body>
-	</file>
-</xliff>
\ No newline at end of file
diff --git a/Resources/Private/Language/locallang_mod2-6.xlf b/Resources/Private/Language/locallang_mod2-6.xlf
index 4027042b3..3572f1288 100644
--- a/Resources/Private/Language/locallang_mod2-6.xlf
+++ b/Resources/Private/Language/locallang_mod2-6.xlf
@@ -10,1017 +10,1065 @@
 			<generator>LFEditor</generator>
 		</header>
 		<body>
-		<trans-unit id="configure_HTMLParams_description">
-			<source>Enter the additional URL parameters used to fetch the HTML content from a TYPO3 page.</source>
-		</trans-unit>
-		<trans-unit id="configure_HTMLParams_details">
-			<source>The specified parameters will be added to the URL used to fetch the HTML content of the direct mail from a TYPO3 page. If in doubt, leave it blank.</source>
-		</trans-unit>
-		<trans-unit id="configure_default_content">
-			<source>Set default values for mail content format:</source>
-		</trans-unit>
-		<trans-unit id="configure_default_fetching">
-			<source>Set default values for mail content fetching options:</source>
-		</trans-unit>
-		<trans-unit id="configure_default_headers">
-			<source>Set default values for Direct Mails headers:</source>
-		</trans-unit>
-		<trans-unit id="configure_direct_mail_module">
-			<source>Configure direct mail module</source>
-		</trans-unit>
-		<trans-unit id="configure_directmail_charset">
-			<source>Default character set for direct mails built from external pages</source>
-		</trans-unit>
-		<trans-unit id="configure_directmail_charset_description">
-			<source>Specify the character set used in direct mails when they are built from external pages and character set cannot be auto-detected.</source>
-		</trans-unit>
-		<trans-unit id="configure_directmail_encoding">
-			<source>Default encoding of direct mails</source>
-		</trans-unit>
-		<trans-unit id="configure_directmail_encoding_description">
-			<source>Select the default content transfer encoding of direct mails.</source>
-		</trans-unit>
-		<trans-unit id="configure_html_only">
-			<source>HTML only</source>
-		</trans-unit>
-		<trans-unit id="configure_http_password">
-			<source>HTTP Password</source>
-		</trans-unit>
-		<trans-unit id="configure_http_password_description">
-			<source>If mail content is protected by HTTP authentication, enter the password here.</source>
-		</trans-unit>
-		<trans-unit id="configure_http_username">
-			<source>HTTP Username</source>
-		</trans-unit>
-		<trans-unit id="configure_http_username_description">
-			<source>If mail content is protected by HTTP authentication, enter the username here.</source>
-		</trans-unit>
-		<trans-unit id="configure_http_username_details" xml:space="preserve">
-			<source><![CDATA[The username and password is used to fetch mail content. They are NOT sent in the mail!
-If you do not specify a username and password and the newsletter pages happen to be protected, an error will occur and no mail content will be fetched.]]></source>
-		</trans-unit>
-		<trans-unit id="configure_jumpurl_tracking_privacy">
-			<source>Privacy jumpurl</source>
-		</trans-unit>
-		<trans-unit id="configure_jumpurl_tracking_privacy_description">
-			<source>Set this option, to anonymize click statistics </source>
-		</trans-unit>
-		<trans-unit id="configure_options_additional">
-			<source>Set additional module options:</source>
-		</trans-unit>
-		<trans-unit id="configure_options_encoding">
-			<source>Set options for content transfer encoding and character set:</source>
-		</trans-unit>
-		<trans-unit id="configure_options_links">
-			<source>Set options for links in mail content:</source>
-		</trans-unit>
-		<trans-unit id="configure_options_links_jumpurl">
-			<source>Enable jump URL's:</source>
-		</trans-unit>
-		<trans-unit id="configure_options_links_jumpurl_description">
-			<source>Check this option to enable jump URL's and the collection of click statistics.</source>
-		</trans-unit>
-		<trans-unit id="configure_options_links_rdct">
-			<source>This configuration determines how QuickMails are handled and further sets the default value for Direct Mails.</source>
-		</trans-unit>
-		<trans-unit id="configure_options_mailto_jumpurl">
-			<source>Enable jump URL's for mailto links:</source>
-		</trans-unit>
-		<trans-unit id="configure_options_mailto_jumpurl_description">
-			<source>Check this option to enable jump URL's for mailto links.</source>
-		</trans-unit>
-		<trans-unit id="configure_plainParams_description">
-			<source>Enter the additional URL parameters used to fetch the plain text content from a TYPO3 page.</source>
-		</trans-unit>
-		<trans-unit id="configure_plainParams_details">
-			<source>The specified parameters will be added to the URL used to fetch the plain text content of the direct mail from a TYPO3 page. If in doubt, set it either to '&amp;type=99' or, when using TemplaVoila, to '&amp;print=1'.</source>
-		</trans-unit>
-		<trans-unit id="configure_plain_and_html">
-			<source>Plain text and HTML</source>
-		</trans-unit>
-		<trans-unit id="configure_plain_only">
-			<source>Plain text only</source>
-		</trans-unit>
-		<trans-unit id="configure_priority_high">
-			<source>High</source>
-		</trans-unit>
-		<trans-unit id="configure_priority_low">
-			<source>Low</source>
-		</trans-unit>
-		<trans-unit id="configure_priority_normal">
-			<source>Normal</source>
-		</trans-unit>
-		<trans-unit id="configure_quickmail_charset">
-			<source>Character set for quick mails</source>
-		</trans-unit>
-		<trans-unit id="configure_quickmail_charset_description">
-			<source>Specify the character set to use when sending quick mails.</source>
-		</trans-unit>
-		<trans-unit id="configure_quickmail_encoding">
-			<source>Encoding for quick mails</source>
-		</trans-unit>
-		<trans-unit id="configure_quickmail_encoding_description">
-			<source>Select the content transfer encoding to use when sending quick mails.</source>
-		</trans-unit>
-		<trans-unit id="configure_simulate_usergroup">
-			<source>Frontend User Group</source>
-		</trans-unit>
-		<trans-unit id="configure_simulate_usergroup_description">
-			<source>If mail content is protected by Frontend user authentication, enter the user group here.</source>
-		</trans-unit>
-		<trans-unit id="configure_simulate_usergroup_details" xml:space="preserve">
-			<source><![CDATA[The usergroup with the uid specified is used to to fetch the mail content.
-If you do not specify a usergroup uid and the page has frontend user restrictions, an error will occur and no mail content will be fetched.]]></source>
-		</trans-unit>
-		<trans-unit id="configure_test_dmail_group_uids">
-			<source>List of UID numbers of test recipient lists:</source>
-		</trans-unit>
-		<trans-unit id="configure_test_dmail_group_uids_description">
-			<source>Alternatively to sending test-mails to individuals, you can choose to send to a whole list. This is the list of recipient lists UID numbers available for this action.</source>
-		</trans-unit>
-		<trans-unit id="configure_test_tt_address_uids">
-			<source>List of UID numbers of test recipients (tt_address):</source>
-		</trans-unit>
-		<trans-unit id="configure_test_tt_address_uids_description">
-			<source>Before sending mails, you should test the mail content by sending test mails to one or more test recipients. The available recipients for testing are determined by this list of UID numbers. So first, find out the UID numbers (tt_address) of the recipients you wish to use for testing, then enter them here in a comma-separated list.</source>
-		</trans-unit>
-		<trans-unit id="configure_testmail">
-			<source>Subject for the testmail.</source>
-		</trans-unit>
-		<trans-unit id="configure_testmail_description">
-			<source>This will be prepended to the test newsletter subject</source>
-		</trans-unit>
-		<trans-unit id="configure_update_configuration">
-			<source>Update configuration</source>
-		</trans-unit>
-		<trans-unit id="configure_user_table">
-			<source>Custom-defined table:</source>
-		</trans-unit>
-		<trans-unit id="configure_user_table_description">
-			<source>Enter the name of a custom-defined table, with compatible columns defined, which may also be used for direct mails distribution.</source>
-		</trans-unit>
-		<trans-unit id="dmail_HTML_url">
-			<source>URL of HTML content:</source>
-		</trans-unit>
-		<trans-unit id="dmail_cancel">
-			<source>Cancel</source>
-		</trans-unit>
-		<trans-unit id="dmail_createMail">
-			<source>Create mail</source>
-		</trans-unit>
-		<trans-unit id="dmail_dovsk_crFromNL">
-			<source>Create a new Direct Mail from a page</source>
-		</trans-unit>
-		<trans-unit id="dmail_dovsk_crFromUrl">
-			<source>Create a new Direct Mail from external URL</source>
-		</trans-unit>
-		<trans-unit id="dmail_edit">
-			<source>Edit</source>
-		</trans-unit>
-		<trans-unit id="dmail_error">
-			<source>An error was encountered.</source>
-		</trans-unit>
-		<trans-unit id="dmail_folders">
-			<source>Available Direct Mail folders</source>
-		</trans-unit>
-		<trans-unit id="dmail_frames_not allowed">
-			<source>Pages with HTML frames may not be fetched.</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_caution">
-			<source>Caution</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_caution_msg">
-			<source>Please check the cronjob or cronjob is not set.</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_lastrun">
-			<source>Last run: </source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_ok">
-			<source>OK</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_ok_msg">
-			<source>Cronjob is running.</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_status">
-			<source>Cron job status</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_warning">
-			<source>Warning</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_cron_warning_msg">
-			<source>Please check the cronjob.</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_current_time">
-			<source>Current time:</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_delete">
-			<source>delete</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_delivery_begun">
-			<source>Delivery begun</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_delivery_ended">
-			<source>Delivery ended</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_invoke_now">
-			<source>Invoke Mailer Engine</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_invoked">
-			<source>Mailer Engine Invoked!</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_log">
-			<source>Log:</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_manual_explain">
-			<source>If TYPO3 is not configured to automatically invoke the Mailer Engine, you can invoke it by clicking here:</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_manual_invoke">
-			<source>Manually Invoke Engine</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_number_sent">
-			<source># sent</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_scheduled">
-			<source>Scheduled</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_status">
-			<source>Mail Engine Status</source>
-		</trans-unit>
-		<trans-unit id="dmail_mailerengine_subject">
-			<source>Subject</source>
-		</trans-unit>
-		<trans-unit id="dmail_makeQuery">
-			<source>Make query</source>
-		</trans-unit>
-		<trans-unit id="dmail_menuItems_testmail">
-			<source>Send a testmail</source>
-		</trans-unit>
-		<trans-unit id="dmail_menu_conf">
-			<source>Module configuration</source>
-		</trans-unit>
-		<trans-unit id="dmail_menu_convert_categories">
-			<source>Categories Conversion</source>
-		</trans-unit>
-		<trans-unit id="dmail_menu_quickMail">
-			<source>QuickMail</source>
-		</trans-unit>
-		<trans-unit id="dmail_newsletters">
-			<source>Direct Mail Extension</source>
-		</trans-unit>
-		<trans-unit id="dmail_no">
-			<source>NO</source>
-		</trans-unit>
-		<trans-unit id="dmail_noCreateAccess">
-			<source>You cannot create direct mails using pages that are hidden or access-restricted.</source>
-		</trans-unit>
-		<trans-unit id="dmail_noEdit_isSent">
-			<source>Cannot edit - mail has been sent</source>
-		</trans-unit>
-		<trans-unit id="dmail_noEdit_noPerms">
-			<source>Cannot edit - you don't have permissions to edit Direct Mails.</source>
-		</trans-unit>
-		<trans-unit id="dmail_noRegular">
-			<source>This type of page cannot be used to create direct mails. Please select a regular page.</source>
-		</trans-unit>
-		<trans-unit id="dmail_no_html_boundaries">
-			<source>The HTML content does not contain any direct mail boundaries.</source>
-		</trans-unit>
-		<trans-unit id="dmail_no_html_content">
-			<source>The HTML content could not be fetched.</source>
-		</trans-unit>
-		<trans-unit id="dmail_no_plain_boundaries">
-			<source>The plain text content does not contain any direct mail boundaries.</source>
-		</trans-unit>
-		<trans-unit id="dmail_no_plain_content">
-			<source>The plain text content could not be fetched.</source>
-		</trans-unit>
-		<trans-unit id="dmail_no_valid_url">
-			<source>Enter at least one valid URL!</source>
-		</trans-unit>
-		<trans-unit id="dmail_number_records">
-			<source>Number of records:</source>
-		</trans-unit>
-		<trans-unit id="dmail_plaintext_url">
-			<source>URL of plain text content:</source>
-		</trans-unit>
-		<trans-unit id="dmail_query">
-			<source>Query</source>
-		</trans-unit>
-		<trans-unit id="dmail_send">
-			<source>Send</source>
-		</trans-unit>
-		<trans-unit id="dmail_subject">
-			<source>Subject:</source>
-		</trans-unit>
-		<trans-unit id="dmail_updateQuery">
-			<source>Update query</source>
-		</trans-unit>
-		<trans-unit id="dmail_view">
-			<source>Information on direct mail record:</source>
-		</trans-unit>
-		<trans-unit id="dmail_warning">
-			<source>Check the following warning.</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_external_page">
-			<source>External Pages</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_internal_page">
-			<source>Internal Pages</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_list_dmail">
-			<source>Direct Mail</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_list_header">
-			<source>Select a newsletter to continue sending:</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_new_newsletter">
-			<source>New Newsletter</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_quickmail">
-			<source>Quickmail</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_quickmail_header">
-			<source>New Quickmail</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz1_select_nl_source">
-			<source>Select newsletter source:</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz2_detail">
-			<source>Detailed Information</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz2_fetch_success">
-			<source>Page is successfully fetched.</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz3_cats">
-			<source>Categories</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz4_testmail">
-			<source>Test Mail</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz5_sendmass">
-			<source>Mass Send</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz_back">
-			<source>back</source>
-		</trans-unit>
-		<trans-unit id="dmail_wiz_next">
-			<source>next</source>
-		</trans-unit>
-		<trans-unit id="dmail_write_subject">
-			<source>[write subject]</source>
-		</trans-unit>
-		<trans-unit id="dmail_yes">
-			<source>YES</source>
-		</trans-unit>
-		<trans-unit id="dmailer_ending">
-			<source>Ending, parsetime:</source>
-		</trans-unit>
-		<trans-unit id="dmailer_invoked_at">
-			<source>Invoked at</source>
-		</trans-unit>
-		<trans-unit id="dmailer_job_begin">
-			<source>Job begin</source>
-		</trans-unit>
-		<trans-unit id="dmailer_job_end">
-			<source>Job end</source>
-		</trans-unit>
-		<trans-unit id="dmailer_mid">
-			<source>Job No:</source>
-		</trans-unit>
-		<trans-unit id="dmailer_nothing_to_do">
-			<source>Nothing to do.</source>
-		</trans-unit>
-		<trans-unit id="dmailer_processed">
-			<source>processed...</source>
-		</trans-unit>
-		<trans-unit id="dmailer_sending">
-			<source>Sending</source>
-		</trans-unit>
-		<trans-unit id="dmailer_sending_to_table">
-			<source>mails using records from table</source>
-		</trans-unit>
-		<trans-unit id="dmailer_sys_dmail_record">
-			<source>sys_dmail record</source>
-		</trans-unit>
-		<trans-unit id="header_conf">
-			<source>Configuration</source>
-		</trans-unit>
-		<trans-unit id="header_directmail">
-			<source>Direct Mail</source>
-		</trans-unit>
-		<trans-unit id="header_mailer">
-			<source>Mailer Engine</source>
-		</trans-unit>
-		<trans-unit id="header_recip">
-			<source>Recipient Lists</source>
-		</trans-unit>
-		<trans-unit id="header_stat">
-			<source>Statistics</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_download">
-			<source>Download CSV file</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_header">
-			<source>Recipient List</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import">
-			<source>Import CSV into 'ADDRESS' table</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_back">
-			<source>Back</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_csv_dublette-description">
-			<source>Filter email dublettes from csv data. If a dublette is found, only the first entry is imported.</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_csv_validemail-description">
-			<source>Only update/import valid emails from csv data.</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_current_file">
-			<source>Current file:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_done">
-			<source>Import is finished.</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_encapsulation">
-			<source>Field encapsulation character (data fields are encapsed with...):</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_first_fieldnames">
-			<source>First row of import file has fieldnames:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_header_conf">
-			<source>Import settings</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_header_upload">
-			<source>Upload CSV</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_import">
-			<source>Import</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_all_html">
-			<source>All recipients receive HTML newsletter</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_categories">
-			<source>Categories</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_cats">
-			<source>Assign the following categories to all recipients:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_cats_add">
-			<source>Add categories</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_charset">
-			<source>Settings</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_charset_choose">
-			<source>Please select the character set of the import file:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_conf">
-			<source>Field mapping</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_conf_add">
-			<source>Additional options</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_description">
-			<source>Description</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_error">
-			<source>Mapping error</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_error_detail">
-			<source>Please fix following error(s):</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_error_email">
-			<source>&quot;Email&quot; field has to be mapped.</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_error_noMap">
-			<source>No mapping is found. You have to map at least &quot;email&quot; field.</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_mapTo">
-			<source>Maps to ...</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_mapping">
-			<source>Mapping</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_number">
-			<source>#</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_mapping_value">
-			<source>Value</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_next">
-			<source>Next</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_or">
-			<source>OR</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_overwrite">
-			<source>Overwrite existing file: </source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_paste_csv">
-			<source>Paste the CSV data:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_ready_import">
-			<source>Ready to import</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_ready_import_label" xml:space="preserve">
-			<source><![CDATA[All necessary information for the import have been entered.
-By clicking on the "Import" button below, all data will be written in tt_address.]]></source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_record_unique">
-			<source>Specify the field which determines the uniqueness of imported users:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_remove_existing">
-			<source>Remove all Addresses in the storage folder before importing:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_report_double">
-			<source>Double records found in the CSV Data:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_report_invalid_email">
-			<source>Do not insert/update invalid emails found in csv data:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_report_new">
-			<source>Insert the following records:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_report_update">
-			<source>Update the following records:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator">
-			<source>Field delimiter (data fields are separated by...):</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator_colon">
-			<source>colon [:]</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator_comma">
-			<source>comma [,]</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator_semicolon">
-			<source>semicolon [;]</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_separator_tab">
-			<source>horizontal tab [TAB]</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_storage">
-			<source>Please select the storage folder for the imported users:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_update">
-			<source>update</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_update_unique">
-			<source>Update existing user, instead renaming the new user:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_import_upload_file">
-			<source>Choose a file from your local computer:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_list_all">
-			<source>List all recipients</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_plain_list">
-			<source>Plain List</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_recip_from">
-			<source>Recipients from recipient list:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_recip_number">
-			<source>Number of recipients:</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_table_address">
-			<source>Address Table</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_table_custom">
-			<source>Custom Table</source>
-		</trans-unit>
-		<trans-unit id="mailgroup_table_fe_users">
-			<source>Website User Table</source>
-		</trans-unit>
-		<trans-unit id="nl_cat">
-			<source>Assign categories to content elements</source>
-		</trans-unit>
-		<trans-unit id="nl_cat_msg1">
-			<source>There are no content elements on the page.</source>
-		</trans-unit>
-		<trans-unit id="nl_create">
-			<source>Create a newsletter</source>
-		</trans-unit>
-		<trans-unit id="nl_create_msg1">
-			<source>Click here to create a new page that you can later send as a direct mail.</source>
-		</trans-unit>
-		<trans-unit id="nl_editPage">
-			<source>Edit page</source>
-		</trans-unit>
-		<trans-unit id="nl_l_ALL">
-			<source>ALL</source>
-		</trans-unit>
-		<trans-unit id="nl_l_ONLY">
-			<source>ONLY</source>
-		</trans-unit>
-		<trans-unit id="nl_l_attach">
-			<source>Attach.</source>
-		</trans-unit>
-		<trans-unit id="nl_l_column">
-			<source>Column</source>
-		</trans-unit>
-		<trans-unit id="nl_l_lastM">
-			<source>Last mod.</source>
-		</trans-unit>
-		<trans-unit id="nl_l_sent">
-			<source>Sent?</source>
-		</trans-unit>
-		<trans-unit id="nl_l_size">
-			<source>Size</source>
-		</trans-unit>
-		<trans-unit id="nl_l_subject">
-			<source>Subject</source>
-		</trans-unit>
-		<trans-unit id="nl_l_tDraft">
-			<source>Draft</source>
-		</trans-unit>
-		<trans-unit id="nl_l_tPage">
-			<source>PAGE</source>
-		</trans-unit>
-		<trans-unit id="nl_l_tUrl">
-			<source>EXT URL</source>
-		</trans-unit>
-		<trans-unit id="nl_l_type">
-			<source>Type</source>
-		</trans-unit>
-		<trans-unit id="nl_l_update">
-			<source>Update category settings</source>
-		</trans-unit>
-		<trans-unit id="nl_l_warning">
-			<source>There are already %s Direct Mails based on this newsletter. Are you sure you want to create another one?</source>
-		</trans-unit>
-		<trans-unit id="nl_select">
-			<source>Select a newsletter</source>
-		</trans-unit>
-		<trans-unit id="nl_select_msg1">
-			<source>There are no pages in the mail module.</source>
-		</trans-unit>
-		<trans-unit id="nl_viewPage_HTML">
-			<source>View page in HTML format</source>
-		</trans-unit>
-		<trans-unit id="nl_viewPage_TXT">
-			<source>View page in Text format</source>
-		</trans-unit>
-		<trans-unit id="quickmail_break_lines">
-			<source>Break lines to 76 char:</source>
-		</trans-unit>
-		<trans-unit id="quickmail_message">
-			<source>Message:</source>
-		</trans-unit>
-		<trans-unit id="quickmail_sender_email">
-			<source>Sender Email:</source>
-		</trans-unit>
-		<trans-unit id="quickmail_sender_name">
-			<source>Sender Name:</source>
-		</trans-unit>
-		<trans-unit id="recip_create_mailgroup">
-			<source>New recipient list</source>
-		</trans-unit>
-		<trans-unit id="recip_create_mailgroup_msg">
-			<source>Create a new recipient list?</source>
-		</trans-unit>
-		<trans-unit id="recip_group_amount">
-			<source>Amount:</source>
-		</trans-unit>
-		<trans-unit id="recip_import_mailgroup_msg">
-			<source>Click here to import CSV</source>
-		</trans-unit>
-		<trans-unit id="recip_select_mailgroup">
-			<source>Select a recipient list</source>
-		</trans-unit>
-		<trans-unit id="schedule_draft">
-			<source>Save these settings as draft (for recurring sendings)</source>
-		</trans-unit>
-		<trans-unit id="schedule_mailgroup">
-			<source>Recipient list:</source>
-		</trans-unit>
-		<trans-unit id="schedule_select_mailgroup">
-			<source>Send mail - recipient list</source>
-		</trans-unit>
-		<trans-unit id="schedule_send_all">
-			<source>Send to all subscribers in recipient list</source>
-		</trans-unit>
-		<trans-unit id="schedule_testmail">
-			<source>Send this as test newsletter</source>
-		</trans-unit>
-		<trans-unit id="schedule_time">
-			<source>Distribution time (hh:mm dd-mm-yyyy):</source>
-		</trans-unit>
-		<trans-unit id="select_folder">
-			<source>Please select Direct Mail folder.</source>
-		</trans-unit>
-		<trans-unit id="send_draft_saved">
-			<source>Draft saved</source>
-		</trans-unit>
-		<trans-unit id="send_draft_scheduler">
-			<source>Your directmail was sent as draft and can now be used from the scheduler.</source>
-		</trans-unit>
-		<trans-unit id="send_recipients">
-			<source>Recipients:</source>
-		</trans-unit>
-		<trans-unit id="send_sending">
-			<source>Sending mail</source>
-		</trans-unit>
-		<trans-unit id="send_was_scheduled">
-			<source>Mail scheduled for distribution</source>
-		</trans-unit>
-		<trans-unit id="send_was_scheduled_for">
-			<source>The mail was scheduled for distribution at</source>
-		</trans-unit>
-		<trans-unit id="send_was_sent">
-			<source>The mail was sent.</source>
-		</trans-unit>
-		<trans-unit id="send_was_sent_to_name">
-			<source>The mail was sent to &lt;strong&gt;%s&lt;/strong&gt;.</source>
-		</trans-unit>
-		<trans-unit id="send_was_sent_to_number">
-			<source>The mail was sent to &lt;strong&gt;%s&lt;/strong&gt; recipients.</source>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned">
-			<source>CSV of returned recipients</source>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_bad_header">
-			<source>CSV of returned recipients with error in header</source>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_bad_host">
-			<source>CSV of returned recipients with bad host</source>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_mailbox_full">
-			<source>CSV of returned recipients with mailbox full</source>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_reason_unknown">
-			<source>CSV of returned recipients for unknown reason</source>
-		</trans-unit>
-		<trans-unit id="stats_CSV_returned_unknown_recipient">
-			<source>CSV of returned recipients with unknown recipient</source>
-		</trans-unit>
-		<trans-unit id="stats_HTML">
-			<source>HTML:</source>
-		</trans-unit>
-		<trans-unit id="stats_HTML_link_nr">
-			<source>HTML Link #</source>
-		</trans-unit>
-		<trans-unit id="stats_HTML_mails_viewed">
-			<source>HTML mails viewed:</source>
-		</trans-unit>
-		<trans-unit id="stats_bad_host">
-			<source>Bad host:</source>
-		</trans-unit>
-		<trans-unit id="stats_count">
-			<source>Count:</source>
-		</trans-unit>
-		<trans-unit id="stats_direct_mail">
-			<source>Statistics for direct mail:</source>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned">
-			<source>Disable returned recipients</source>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_bad_header">
-			<source>Disable returned recipients with error in header</source>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_bad_host">
-			<source>Disable returned recipients with bad host</source>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_mailbox_full">
-			<source>Disable returned recipients with mailbox full</source>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_reason_unknown">
-			<source>Disable returned recipients for unknown reason</source>
-		</trans-unit>
-		<trans-unit id="stats_disable_returned_unknown_recipient">
-			<source>Disable returned recipients with unknown recipient</source>
-		</trans-unit>
-		<trans-unit id="stats_emails">
-			<source>List of recipients from tt_address table:</source>
-		</trans-unit>
-		<trans-unit id="stats_emails_disabled">
-			<source>adresses disabled</source>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_bad_header_list">
-			<source>Email adresses of returned mails with error in header:</source>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_bad_host_list">
-			<source>Email adresses of returned mails with bad host:</source>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_list">
-			<source>Email adresses of returned mails:</source>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_mailbox_full_list">
-			<source>Email adresses of returned mails with mailbox full:</source>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_reason_unknown_list">
-			<source>Email adresses of returned mails for unknown reason:</source>
-		</trans-unit>
-		<trans-unit id="stats_emails_returned_unknown_recipient_list">
-			<source>Email adresses of returned mails with unknown recipient:</source>
-		</trans-unit>
-		<trans-unit id="stats_error_in_header">
-			<source>Error in Header:</source>
-		</trans-unit>
-		<trans-unit id="stats_general_information">
-			<source>General information:</source>
-		</trans-unit>
-		<trans-unit id="stats_img_link">
-			<source>Imagelink:</source>
-		</trans-unit>
-		<trans-unit id="stats_links_clicked_per_respondent">
-			<source>Total responses/Unique responses:</source>
-		</trans-unit>
-		<trans-unit id="stats_list_returned">
-			<source>List returned recipients</source>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_bad_header">
-			<source>List returned recipients with error in header</source>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_bad_host">
-			<source>List returned recipients with bad host</source>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_mailbox_full">
-			<source>List returned recipients with mailbox full</source>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_reason_unknown">
-			<source>List returned recipients for unknown reason</source>
-		</trans-unit>
-		<trans-unit id="stats_list_returned_unknown_recipient">
-			<source>List returned recipients with unknown recipient</source>
-		</trans-unit>
-		<trans-unit id="stats_mailbox_full">
-			<source>Mailbox full:</source>
-		</trans-unit>
-		<trans-unit id="stats_mails_returned">
-			<source>Mails returned:</source>
-		</trans-unit>
-		<trans-unit id="stats_mails_sent">
-			<source>Mails sent:</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_choose">
-			<source>Choose a newsletter</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_delivery_begun">
-			<source>Delivery begun</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_delivery_ended">
-			<source>Delivery ended</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_header">
-			<source>Newsletter Statistics</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_queuing">
-			<source>queuing</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_scheduled">
-			<source>Scheduled</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_sending">
-			<source>sending</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_sent">
-			<source>sent</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_status">
-			<source>Status</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_subject">
-			<source>Subject</source>
-		</trans-unit>
-		<trans-unit id="stats_overview_total_sent">
-			<source># sent</source>
-		</trans-unit>
-		<trans-unit id="stats_plainlist">
-			<source>List of recipients:</source>
-		</trans-unit>
-		<trans-unit id="stats_plaintext">
-			<source>Plaintext:</source>
-		</trans-unit>
-		<trans-unit id="stats_plaintext_link_nr">
-			<source>Plaintext Link #</source>
-		</trans-unit>
-		<trans-unit id="stats_reason_unkown">
-			<source>Reason unknown:</source>
-		</trans-unit>
-		<trans-unit id="stats_recalculate_cached_data">
-			<source>Re-calculate Cached Data:</source>
-		</trans-unit>
-		<trans-unit id="stats_recalculate_stats">
-			<source>Re-calculate cached statistics data</source>
-		</trans-unit>
-		<trans-unit id="stats_recipient_unknown">
-			<source>Recipient unknown:</source>
-		</trans-unit>
-		<trans-unit id="stats_response">
-			<source>Responses:</source>
-		</trans-unit>
-		<trans-unit id="stats_response_link">
-			<source>Link Responses:</source>
-		</trans-unit>
-		<trans-unit id="stats_total">
-			<source>Total:</source>
-		</trans-unit>
-		<trans-unit id="stats_total_mails_returned">
-			<source>Total mails returned:</source>
-		</trans-unit>
-		<trans-unit id="stats_total_responses">
-			<source>Total responses (links clicked):</source>
-		</trans-unit>
-		<trans-unit id="stats_unique_responses">
-			<source>Unique responses (links clicked):</source>
-		</trans-unit>
-		<trans-unit id="stats_website_users">
-			<source>List of recipients from fe_users:</source>
-		</trans-unit>
-		<trans-unit id="stats_website_users_disabled">
-			<source>website users disabled</source>
-		</trans-unit>
-		<trans-unit id="subscriber_info">
-			<source>Subscriber Info</source>
-		</trans-unit>
-		<trans-unit id="subscriber_profile">
-			<source>Subscriber Profile</source>
-		</trans-unit>
-		<trans-unit id="subscriber_profile_htmlemail">
-			<source>Receive HTML based mails</source>
-		</trans-unit>
-		<trans-unit id="subscriber_profile_instructions">
-			<source>Set categories of interest for the subscriber.</source>
-		</trans-unit>
-		<trans-unit id="subscriber_profile_update">
-			<source>Update profile settings</source>
-		</trans-unit>
-		<trans-unit id="testmail_individual">
-			<source>Testmail - Individual</source>
-		</trans-unit>
-		<trans-unit id="testmail_individual_msg">
-			<source>Select a recipient of the testmail. The mail will be generated based on the profile of the recipient you select.</source>
-		</trans-unit>
-		<trans-unit id="testmail_mailgroup">
-			<source>Testmail - Recipient list</source>
-		</trans-unit>
-		<trans-unit id="testmail_mailgroup_msg">
-			<source>Select a recipient list for the testmail. The mails will be generated based on the profiles of the recipients in that list.</source>
-		</trans-unit>
-		<trans-unit id="testmail_simple">
-			<source>Testmail - Simple</source>
-		</trans-unit>
-		<trans-unit id="testmail_simple_msg">
-			<source>A simple testmail includes all mail elements regardless of category. But any USER_fields are not substituted with data. Enter an email-address for the testmail:</source>
-		</trans-unit>
-		<trans-unit id="update_convert_do_it_now">
-			<source>Do it now</source>
-		</trans-unit>
-		<trans-unit id="update_convert_now">
-			<source>The direct_mail data in the sys_dmail table need to be update. Please backup the sys_dmail table before clicking the following button. Convert the data?</source>
-		</trans-unit>
-		<trans-unit id="update_convert_result">
-			<source>%d records are converted</source>
-		</trans-unit>
-		<trans-unit id="update_option">
-			<source>Updater</source>
-		</trans-unit>
-		<trans-unit id="update_optionHeader">
-			<source>Important!</source>
-		</trans-unit>
-		<trans-unit id="update_optionLink">
-			<source>[Click here to open the updater]</source>
-		</trans-unit>
-		<trans-unit id="update_optionMsg">
-			<source>For the old data working with direct_mail version 3.0, data must be converted.</source>
-		</trans-unit>
-		<trans-unit id="update_warningHeader">
-			<source>Warning! Please read!</source>
-		</trans-unit>
-		<trans-unit id="update_warningMsg" xml:space="preserve">
-			<source><![CDATA[The updater manipulates your database.
-				So backup your database (at least the sys_dmail table) or do a t3d export of your site (direct_mail sysfolder)
-				<strong>BEFORE</strong> <br>
-				you click on the "Do it now" buttons.]]></source>
-		</trans-unit>
-		<trans-unit id="view_delivery_begin_end">
-			<source>Delivery begun/ended:</source>
-		</trans-unit>
-		<trans-unit id="view_dmail">
-			<source>Direct Mail:</source>
-		</trans-unit>
-		<trans-unit id="view_flowed">
-			<source>Flowed text:</source>
-		</trans-unit>
-		<trans-unit id="view_from">
-			<source>Sender:</source>
-		</trans-unit>
-		<trans-unit id="view_mail">
-			<source>Email format/attachments:</source>
-		</trans-unit>
-		<trans-unit id="view_media">
-			<source>Include media:</source>
-		</trans-unit>
-		<trans-unit id="view_recipient_total_sent">
-			<source>Recipient total/sent:</source>
-		</trans-unit>
-		<trans-unit id="view_replyto">
-			<source>Reply:</source>
-		</trans-unit>
-		<trans-unit id="yes">
-			<source>Yes</source>
-		</trans-unit>
+			<trans-unit id="configure_HTMLParams_description">
+				<source>Enter the additional URL parameters used to fetch the HTML content from a TYPO3 page.</source>
+			</trans-unit>
+			<trans-unit id="configure_HTMLParams_details">
+				<source>The specified parameters will be added to the URL used to fetch the HTML content of the direct mail from a TYPO3 page. If in doubt, leave it blank.</source>
+			</trans-unit>
+			<trans-unit id="configure_default_content">
+				<source>Set default values for mail content format:</source>
+			</trans-unit>
+			<trans-unit id="configure_default_fetching">
+				<source>Set default values for mail content fetching options:</source>
+			</trans-unit>
+			<trans-unit id="configure_default_headers">
+				<source>Set default values for Direct Mails headers:</source>
+			</trans-unit>
+			<trans-unit id="configure_direct_mail_module">
+				<source>Configure direct mail module</source>
+			</trans-unit>
+			<trans-unit id="configure_directmail_charset">
+				<source>Default character set for direct mails built from external pages</source>
+			</trans-unit>
+			<trans-unit id="configure_directmail_charset_description">
+				<source>Specify the character set used in direct mails when they are built from external pages and character set cannot be auto-detected.</source>
+			</trans-unit>
+			<trans-unit id="configure_directmail_encoding">
+				<source>Default encoding of direct mails</source>
+			</trans-unit>
+			<trans-unit id="configure_directmail_encoding_description">
+				<source>Select the default content transfer encoding of direct mails.</source>
+			</trans-unit>
+			<trans-unit id="configure_html_only">
+				<source>HTML only</source>
+			</trans-unit>
+			<trans-unit id="configure_http_password">
+				<source>HTTP Password</source>
+			</trans-unit>
+			<trans-unit id="configure_http_password_description">
+				<source>If mail content is protected by HTTP authentication, enter the password here.</source>
+			</trans-unit>
+			<trans-unit id="configure_http_username">
+				<source>HTTP Username</source>
+			</trans-unit>
+			<trans-unit id="configure_http_username_description">
+				<source>If mail content is protected by HTTP authentication, enter the username here.</source>
+			</trans-unit>
+			<trans-unit id="configure_http_username_details" xml:space="preserve">
+				<source><![CDATA[The username and password is used to fetch mail content. They are NOT sent in the mail!
+	If you do not specify a username and password and the newsletter pages happen to be protected, an error will occur and no mail content will be fetched.]]></source>
+			</trans-unit>
+			<trans-unit id="configure_jumpurl_tracking_privacy">
+				<source>Privacy jumpurl</source>
+			</trans-unit>
+			<trans-unit id="configure_jumpurl_tracking_privacy_description">
+				<source>Set this option, to anonymize click statistics </source>
+			</trans-unit>
+			<trans-unit id="configure_options_additional">
+				<source>Set additional module options:</source>
+			</trans-unit>
+			<trans-unit id="configure_options_encoding">
+				<source>Set options for content transfer encoding and character set:</source>
+			</trans-unit>
+			<trans-unit id="configure_options_links">
+				<source>Set options for links in mail content:</source>
+			</trans-unit>
+			<trans-unit id="configure_options_links_jumpurl">
+				<source>Enable jump URL's:</source>
+			</trans-unit>
+			<trans-unit id="configure_options_links_jumpurl_description">
+				<source>Check this option to enable jump URL's and the collection of click statistics.</source>
+			</trans-unit>
+			<trans-unit id="configure_options_links_rdct">
+				<source>This configuration determines how QuickMails are handled and further sets the default value for Direct Mails.</source>
+			</trans-unit>
+			<trans-unit id="configure_options_mailto_jumpurl">
+				<source>Enable jump URL's for mailto links:</source>
+			</trans-unit>
+			<trans-unit id="configure_options_mailto_jumpurl_description">
+				<source>Check this option to enable jump URL's for mailto links.</source>
+			</trans-unit>
+			<trans-unit id="configure_plainParams_description">
+				<source>Enter the additional URL parameters used to fetch the plain text content from a TYPO3 page.</source>
+			</trans-unit>
+			<trans-unit id="configure_plainParams_details">
+				<source>The specified parameters will be added to the URL used to fetch the plain text content of the direct mail from a TYPO3 page. If in doubt, set it either to '&amp;type=99' or, when using TemplaVoila, to '&amp;print=1'.</source>
+			</trans-unit>
+			<trans-unit id="configure_plain_and_html">
+				<source>Plain text and HTML</source>
+			</trans-unit>
+			<trans-unit id="configure_plain_only">
+				<source>Plain text only</source>
+			</trans-unit>
+			<trans-unit id="configure_priority_high">
+				<source>High</source>
+			</trans-unit>
+			<trans-unit id="configure_priority_low">
+				<source>Low</source>
+			</trans-unit>
+			<trans-unit id="configure_priority_normal">
+				<source>Normal</source>
+			</trans-unit>
+			<trans-unit id="configure_quickmail_charset">
+				<source>Character set for quick mails</source>
+			</trans-unit>
+			<trans-unit id="configure_quickmail_charset_description">
+				<source>Specify the character set to use when sending quick mails.</source>
+			</trans-unit>
+			<trans-unit id="configure_quickmail_encoding">
+				<source>Encoding for quick mails</source>
+			</trans-unit>
+			<trans-unit id="configure_quickmail_encoding_description">
+				<source>Select the content transfer encoding to use when sending quick mails.</source>
+			</trans-unit>
+			<trans-unit id="configure_simulate_usergroup">
+				<source>Frontend User Group</source>
+			</trans-unit>
+			<trans-unit id="configure_simulate_usergroup_description">
+				<source>If mail content is protected by Frontend user authentication, enter the user group here.</source>
+			</trans-unit>
+			<trans-unit id="configure_simulate_usergroup_details" xml:space="preserve">
+				<source><![CDATA[The usergroup with the uid specified is used to to fetch the mail content.
+	If you do not specify a usergroup uid and the page has frontend user restrictions, an error will occur and no mail content will be fetched.]]></source>
+			</trans-unit>
+			<trans-unit id="configure_test_dmail_group_uids">
+				<source>List of UID numbers of test recipient lists:</source>
+			</trans-unit>
+			<trans-unit id="configure_test_dmail_group_uids_description">
+				<source>Alternatively to sending test-mails to individuals, you can choose to send to a whole list. This is the list of recipient lists UID numbers available for this action.</source>
+			</trans-unit>
+			<trans-unit id="configure_test_tt_address_uids">
+				<source>List of UID numbers of test recipients (tt_address):</source>
+			</trans-unit>
+			<trans-unit id="configure_test_tt_address_uids_description">
+				<source>Before sending mails, you should test the mail content by sending test mails to one or more test recipients. The available recipients for testing are determined by this list of UID numbers. So first, find out the UID numbers (tt_address) of the recipients you wish to use for testing, then enter them here in a comma-separated list.</source>
+			</trans-unit>
+			<trans-unit id="configure_testmail">
+				<source>Subject for the testmail.</source>
+			</trans-unit>
+			<trans-unit id="configure_testmail_description">
+				<source>This will be prepended to the test newsletter subject</source>
+			</trans-unit>
+			<trans-unit id="configure_update_configuration">
+				<source>Update configuration</source>
+			</trans-unit>
+			<trans-unit id="configure_user_table">
+				<source>Custom-defined table:</source>
+			</trans-unit>
+			<trans-unit id="configure_user_table_description">
+				<source>Enter the name of a custom-defined table, with compatible columns defined, which may also be used for direct mails distribution.</source>
+			</trans-unit>
+			<trans-unit id="dmail_HTML_url">
+				<source>URL of HTML content:</source>
+			</trans-unit>
+			<trans-unit id="dmail_cancel">
+				<source>Cancel</source>
+			</trans-unit>
+			<trans-unit id="dmail_createMail">
+				<source>Create mail</source>
+			</trans-unit>
+			<trans-unit id="dmail_dovsk_crFromNL">
+				<source>Create a new Direct Mail from a page</source>
+			</trans-unit>
+			<trans-unit id="dmail_dovsk_crFromUrl">
+				<source>Create a new Direct Mail from external URL</source>
+			</trans-unit>
+			<trans-unit id="dmail_edit">
+				<source>Edit</source>
+			</trans-unit>
+			<trans-unit id="dmail_error">
+				<source>An error was encountered.</source>
+			</trans-unit>
+			<trans-unit id="dmail_folders">
+				<source>Available Direct Mail folders</source>
+			</trans-unit>
+			<trans-unit id="dmail_frames_not allowed">
+				<source>Pages with HTML frames may not be fetched.</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_cron_caution">
+				<source>Caution</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_cron_caution_msg">
+				<source>Please check the cronjob or cronjob is not set.</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_cron_lastrun">
+				<source>Last run: </source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_cron_ok">
+				<source>OK</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_cron_ok_msg">
+				<source>Cronjob is running.</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_cron_status">
+				<source>Cron job status</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_cron_warning">
+				<source>Warning</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_cron_warning_msg">
+				<source>Please check the cronjob.</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_current_time">
+				<source>Current time:</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_delete">
+				<source>delete</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_delivery_begun">
+				<source>Delivery begun</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_delivery_ended">
+				<source>Delivery ended</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_invoke_now">
+				<source>Invoke Mailer Engine</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_invoked">
+				<source>Mailer Engine Invoked!</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_log">
+				<source>Log:</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_manual_explain">
+				<source>If TYPO3 is not configured to automatically invoke the Mailer Engine, you can invoke it by clicking here:</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_manual_invoke">
+				<source>Manually Invoke Engine</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_number_sent">
+				<source># sent</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_scheduled">
+				<source>Scheduled</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_status">
+				<source>Mail Engine Status</source>
+			</trans-unit>
+			<trans-unit id="dmail_mailerengine_subject">
+				<source>Subject</source>
+			</trans-unit>
+			<trans-unit id="dmail_makeQuery">
+				<source>Make query</source>
+			</trans-unit>
+			<trans-unit id="dmail_menuItems_testmail">
+				<source>Send a testmail</source>
+			</trans-unit>
+			<trans-unit id="dmail_menu_conf">
+				<source>Module configuration</source>
+			</trans-unit>
+			<trans-unit id="dmail_menu_convert_categories">
+				<source>Categories Conversion</source>
+			</trans-unit>
+			<trans-unit id="dmail_menu_quickMail">
+				<source>QuickMail</source>
+			</trans-unit>
+			<trans-unit id="dmail_newsletters">
+				<source>Direct Mail Extension</source>
+			</trans-unit>
+			<trans-unit id="dmail_no">
+				<source>NO</source>
+			</trans-unit>
+			<trans-unit id="dmail_noCreateAccess">
+				<source>You cannot create direct mails using pages that are hidden or access-restricted.</source>
+			</trans-unit>
+			<trans-unit id="dmail_noEdit_isSent">
+				<source>Cannot edit - mail has been sent</source>
+			</trans-unit>
+			<trans-unit id="dmail_noEdit_noPerms">
+				<source>Cannot edit - you don't have permissions to edit Direct Mails.</source>
+			</trans-unit>
+			<trans-unit id="dmail_noRegular">
+				<source>This type of page cannot be used to create direct mails. Please select a regular page.</source>
+			</trans-unit>
+			<trans-unit id="dmail_no_html_boundaries">
+				<source>The HTML content does not contain any direct mail boundaries.</source>
+			</trans-unit>
+			<trans-unit id="dmail_no_html_content">
+				<source>The HTML content could not be fetched.</source>
+			</trans-unit>
+			<trans-unit id="dmail_no_plain_boundaries">
+				<source>The plain text content does not contain any direct mail boundaries.</source>
+			</trans-unit>
+			<trans-unit id="dmail_no_plain_content">
+				<source>The plain text content could not be fetched.</source>
+			</trans-unit>
+			<trans-unit id="dmail_no_valid_url">
+				<source>Enter at least one valid URL!</source>
+			</trans-unit>
+			<trans-unit id="dmail_number_records">
+				<source>Number of records:</source>
+			</trans-unit>
+			<trans-unit id="dmail_plaintext_url">
+				<source>URL of plain text content:</source>
+			</trans-unit>
+			<trans-unit id="dmail_query">
+				<source>Query</source>
+			</trans-unit>
+			<trans-unit id="dmail_send">
+				<source>Send</source>
+			</trans-unit>
+			<trans-unit id="dmail_subject">
+				<source>Subject:</source>
+			</trans-unit>
+			<trans-unit id="dmail_updateQuery">
+				<source>Update query</source>
+			</trans-unit>
+			<trans-unit id="dmail_view">
+				<source>Information on direct mail record:</source>
+			</trans-unit>
+			<trans-unit id="dmail_warning">
+				<source>Check the following warning.</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz1_external_page">
+				<source>External Pages</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz1_internal_page">
+				<source>Internal Pages</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz1_list_dmail">
+				<source>Direct Mail</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz1_list_header">
+				<source>Select a newsletter to continue sending:</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz1_new_newsletter">
+				<source>New Newsletter</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz1_quickmail">
+				<source>Quickmail</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz1_quickmail_header">
+				<source>New Quickmail</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz1_select_nl_source">
+				<source>Select newsletter source:</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz2_detail">
+				<source>Detailed Information</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz2_fetch_success">
+				<source>Page is successfully fetched.</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz3_cats">
+				<source>Categories</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz4_testmail">
+				<source>Test Mail</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz5_sendmass">
+				<source>Mass Send</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz_back">
+				<source>back</source>
+			</trans-unit>
+			<trans-unit id="dmail_wiz_next">
+				<source>next</source>
+			</trans-unit>
+			<trans-unit id="dmail_write_subject">
+				<source>[write subject]</source>
+			</trans-unit>
+			<trans-unit id="dmail_yes">
+				<source>YES</source>
+			</trans-unit>
+			<trans-unit id="dmailer_ending">
+				<source>Ending, parsetime:</source>
+			</trans-unit>
+			<trans-unit id="dmailer_invoked_at">
+				<source>Invoked at</source>
+			</trans-unit>
+			<trans-unit id="dmailer_job_begin">
+				<source>Job begin</source>
+			</trans-unit>
+			<trans-unit id="dmailer_job_end">
+				<source>Job end</source>
+			</trans-unit>
+			<trans-unit id="dmailer_mid">
+				<source>Job No:</source>
+			</trans-unit>
+			<trans-unit id="dmailer_nothing_to_do">
+				<source>Nothing to do.</source>
+			</trans-unit>
+			<trans-unit id="dmailer_processed">
+				<source>processed...</source>
+			</trans-unit>
+			<trans-unit id="dmailer_sending">
+				<source>Sending</source>
+			</trans-unit>
+			<trans-unit id="dmailer_sending_to_table">
+				<source>mails using records from table</source>
+			</trans-unit>
+			<trans-unit id="dmailer_sys_dmail_record">
+				<source>sys_dmail record</source>
+			</trans-unit>
+			<trans-unit id="header_conf">
+				<source>Configuration</source>
+			</trans-unit>
+			<trans-unit id="header_directmail">
+				<source>Direct Mail</source>
+			</trans-unit>
+			<trans-unit id="header_mailer">
+				<source>Mailer Engine</source>
+			</trans-unit>
+			<trans-unit id="header_recip">
+				<source>Recipient Lists</source>
+			</trans-unit>
+			<trans-unit id="header_stat">
+				<source>Statistics</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_download">
+				<source>Download CSV file</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_header">
+				<source>Recipient List</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import">
+				<source>Import CSV into 'ADDRESS' table</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_back">
+				<source>Back</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_csv_dublette-description">
+				<source>Filter email dublettes from csv data. If a dublette is found, only the first entry is imported.</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_csv_validemail-description">
+				<source>Only update/import valid emails from csv data.</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_current_file">
+				<source>Current file:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_done">
+				<source>Import is finished.</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_encapsulation">
+				<source>Field encapsulation character (data fields are encapsed with...):</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_first_fieldnames">
+				<source>First row of import file has fieldnames:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_header_conf">
+				<source>Import settings</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_header_upload">
+				<source>Upload CSV</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_import">
+				<source>Import</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_all_html">
+				<source>All recipients receive HTML newsletter</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_categories">
+				<source>Categories</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_cats">
+				<source>Assign the following categories to all recipients:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_cats_add">
+				<source>Add categories</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_charset">
+				<source>Settings</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_charset_choose">
+				<source>Please select the character set of the import file:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_conf">
+				<source>Field mapping</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_conf_add">
+				<source>Additional options</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_description">
+				<source>Description</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_error">
+				<source>Mapping error</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_error_detail">
+				<source>Please fix following error(s):</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_error_email">
+				<source>&quot;Email&quot; field has to be mapped.</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_error_noMap">
+				<source>No mapping is found. You have to map at least &quot;email&quot; field.</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_mapTo">
+				<source>Maps to ...</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_mapping">
+				<source>Mapping</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_number">
+				<source>#</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_mapping_value">
+				<source>Value</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_next">
+				<source>Next</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_or">
+				<source>OR</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_overwrite">
+				<source>Overwrite existing file: </source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_paste_csv">
+				<source>Paste the CSV data:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_ready_import">
+				<source>Ready to import</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_ready_import_label" xml:space="preserve">
+				<source><![CDATA[All necessary information for the import have been entered.
+	By clicking on the "Import" button below, all data will be written in tt_address.]]></source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_record_unique">
+				<source>Specify the field which determines the uniqueness of imported users:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_remove_existing">
+				<source>Remove all Addresses in the storage folder before importing:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_report_double">
+				<source>Double records found in the CSV Data:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_report_invalid_email">
+				<source>Do not insert/update invalid emails found in csv data:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_report_new">
+				<source>Insert the following records:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_report_update">
+				<source>Update the following records:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_separator">
+				<source>Field delimiter (data fields are separated by...):</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_separator_colon">
+				<source>colon [:]</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_separator_comma">
+				<source>comma [,]</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_separator_semicolon">
+				<source>semicolon [;]</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_separator_tab">
+				<source>horizontal tab [TAB]</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_storage">
+				<source>Please select the storage folder for the imported users:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_update">
+				<source>update</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_update_unique">
+				<source>Update existing user, instead renaming the new user:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_import_upload_file">
+				<source>Choose a file from your local computer:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_list_all">
+				<source>List all recipients</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_plain_list">
+				<source>Plain List</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_recip_from">
+				<source>Recipients from recipient list:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_recip_number">
+				<source>Number of recipients:</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_table_address">
+				<source>Address Table</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_table_custom">
+				<source>Custom Table</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_table_fe_users">
+				<source>Website User Table</source>
+			</trans-unit>
+			<trans-unit id="mailgroup_table_disallowed_placeholder">
+				<source>Missing permission to display data</source>
+			</trans-unit>
+			<trans-unit id="nl_cat">
+				<source>Assign categories to content elements</source>
+			</trans-unit>
+			<trans-unit id="nl_cat_msg1">
+				<source>There are no content elements on the page.</source>
+			</trans-unit>
+			<trans-unit id="nl_create">
+				<source>Create a newsletter</source>
+			</trans-unit>
+			<trans-unit id="nl_create_msg1">
+				<source>Click here to create a new page that you can later send as a direct mail.</source>
+			</trans-unit>
+			<trans-unit id="nl_editPage">
+				<source>Edit page</source>
+			</trans-unit>
+			<trans-unit id="nl_l_ALL">
+				<source>ALL</source>
+			</trans-unit>
+			<trans-unit id="nl_l_ONLY">
+				<source>ONLY</source>
+			</trans-unit>
+			<trans-unit id="nl_l_attach">
+				<source>Attach.</source>
+			</trans-unit>
+			<trans-unit id="nl_l_column">
+				<source>Column</source>
+			</trans-unit>
+			<trans-unit id="nl_l_lastM">
+				<source>Last mod.</source>
+			</trans-unit>
+			<trans-unit id="nl_l_sent">
+				<source>Sent?</source>
+			</trans-unit>
+			<trans-unit id="nl_l_size">
+				<source>Size</source>
+			</trans-unit>
+			<trans-unit id="nl_l_subject">
+				<source>Subject</source>
+			</trans-unit>
+			<trans-unit id="nl_l_tDraft">
+				<source>Draft</source>
+			</trans-unit>
+			<trans-unit id="nl_l_tPage">
+				<source>PAGE</source>
+			</trans-unit>
+			<trans-unit id="nl_l_tUrl">
+				<source>EXT URL</source>
+			</trans-unit>
+			<trans-unit id="nl_l_type">
+				<source>Type</source>
+			</trans-unit>
+			<trans-unit id="nl_l_update">
+				<source>Update category settings</source>
+			</trans-unit>
+			<trans-unit id="nl_l_warning">
+				<source>There are already %s Direct Mails based on this newsletter. Are you sure you want to create another one?</source>
+			</trans-unit>
+			<trans-unit id="nl_select">
+				<source>Select a newsletter</source>
+			</trans-unit>
+			<trans-unit id="nl_select_msg1">
+				<source>There are no pages in the mail module.</source>
+			</trans-unit>
+			<trans-unit id="nl_viewPage_HTML">
+				<source>View page in HTML format</source>
+			</trans-unit>
+			<trans-unit id="nl_viewPage_TXT">
+				<source>View page in Text format</source>
+			</trans-unit>
+			<trans-unit id="quickmail_break_lines">
+				<source>Break lines to 76 char:</source>
+			</trans-unit>
+			<trans-unit id="quickmail_message">
+				<source>Message:</source>
+			</trans-unit>
+			<trans-unit id="quickmail_sender_email">
+				<source>Sender Email:</source>
+			</trans-unit>
+			<trans-unit id="quickmail_sender_name">
+				<source>Sender Name:</source>
+			</trans-unit>
+			<trans-unit id="recip_create_mailgroup">
+				<source>New recipient list</source>
+			</trans-unit>
+			<trans-unit id="recip_create_mailgroup_msg">
+				<source>Create a new recipient list?</source>
+			</trans-unit>
+			<trans-unit id="recip_group_amount">
+				<source>Amount:</source>
+			</trans-unit>
+			<trans-unit id="recip_import_mailgroup_msg">
+				<source>Click here to import CSV</source>
+			</trans-unit>
+			<trans-unit id="recip_select_mailgroup">
+				<source>Select a recipient list</source>
+			</trans-unit>
+			<trans-unit id="schedule_draft">
+				<source>Save these settings as draft (for recurring sendings)</source>
+			</trans-unit>
+			<trans-unit id="schedule_mailgroup">
+				<source>Recipient list:</source>
+			</trans-unit>
+			<trans-unit id="schedule_select_mailgroup">
+				<source>Send mail - recipient list</source>
+			</trans-unit>
+			<trans-unit id="schedule_send_all">
+				<source>Send to all subscribers in recipient list</source>
+			</trans-unit>
+			<trans-unit id="schedule_testmail">
+				<source>Send this as test newsletter</source>
+			</trans-unit>
+			<trans-unit id="schedule_time">
+				<source>Distribution time (hh:mm dd-mm-yyyy):</source>
+			</trans-unit>
+			<trans-unit id="select_folder">
+				<source>Please select Direct Mail folder.</source>
+			</trans-unit>
+			<trans-unit id="send_draft_saved">
+				<source>Draft saved</source>
+			</trans-unit>
+			<trans-unit id="send_draft_scheduler">
+				<source>Your directmail was sent as draft and can now be used from the scheduler.</source>
+			</trans-unit>
+			<trans-unit id="send_recipients">
+				<source>Recipients:</source>
+			</trans-unit>
+			<trans-unit id="send_sending">
+				<source>Sending mail</source>
+			</trans-unit>
+			<trans-unit id="send_was_scheduled">
+				<source>Mail scheduled for distribution</source>
+			</trans-unit>
+			<trans-unit id="send_was_scheduled_for">
+				<source>The mail was scheduled for distribution at</source>
+			</trans-unit>
+			<trans-unit id="send_was_sent">
+				<source>The mail was sent.</source>
+			</trans-unit>
+			<trans-unit id="send_was_sent_to_name">
+				<source>The mail was sent to &lt;strong&gt;%s&lt;/strong&gt;.</source>
+			</trans-unit>
+			<trans-unit id="send_was_sent_to_number">
+				<source>The mail was sent to &lt;strong&gt;%s&lt;/strong&gt; recipients.</source>
+			</trans-unit>
+			<trans-unit id="stats_CSV_returned">
+				<source>CSV of returned recipients</source>
+			</trans-unit>
+			<trans-unit id="stats_CSV_returned_bad_header">
+				<source>CSV of returned recipients with error in header</source>
+			</trans-unit>
+			<trans-unit id="stats_CSV_returned_bad_host">
+				<source>CSV of returned recipients with bad host</source>
+			</trans-unit>
+			<trans-unit id="stats_CSV_returned_mailbox_full">
+				<source>CSV of returned recipients with mailbox full</source>
+			</trans-unit>
+			<trans-unit id="stats_CSV_returned_reason_unknown">
+				<source>CSV of returned recipients for unknown reason</source>
+			</trans-unit>
+			<trans-unit id="stats_CSV_returned_unknown_recipient">
+				<source>CSV of returned recipients with unknown recipient</source>
+			</trans-unit>
+			<trans-unit id="stats_HTML">
+				<source>HTML:</source>
+			</trans-unit>
+			<trans-unit id="stats_HTML_link_nr">
+				<source>HTML Link #</source>
+			</trans-unit>
+			<trans-unit id="stats_HTML_mails_viewed">
+				<source>HTML mails viewed:</source>
+			</trans-unit>
+			<trans-unit id="stats_bad_host">
+				<source>Bad host:</source>
+			</trans-unit>
+			<trans-unit id="stats_count">
+				<source>Count:</source>
+			</trans-unit>
+			<trans-unit id="stats_direct_mail">
+				<source>Statistics for direct mail:</source>
+			</trans-unit>
+			<trans-unit id="stats_disable_returned">
+				<source>Disable returned recipients</source>
+			</trans-unit>
+			<trans-unit id="stats_disable_returned_bad_header">
+				<source>Disable returned recipients with error in header</source>
+			</trans-unit>
+			<trans-unit id="stats_disable_returned_bad_host">
+				<source>Disable returned recipients with bad host</source>
+			</trans-unit>
+			<trans-unit id="stats_disable_returned_mailbox_full">
+				<source>Disable returned recipients with mailbox full</source>
+			</trans-unit>
+			<trans-unit id="stats_disable_returned_reason_unknown">
+				<source>Disable returned recipients for unknown reason</source>
+			</trans-unit>
+			<trans-unit id="stats_disable_returned_unknown_recipient">
+				<source>Disable returned recipients with unknown recipient</source>
+			</trans-unit>
+			<trans-unit id="stats_emails">
+				<source>List of recipients from tt_address table:</source>
+			</trans-unit>
+			<trans-unit id="stats_emails_disabled">
+				<source>adresses disabled</source>
+			</trans-unit>
+			<trans-unit id="stats_emails_returned_bad_header_list">
+				<source>Email adresses of returned mails with error in header:</source>
+			</trans-unit>
+			<trans-unit id="stats_emails_returned_bad_host_list">
+				<source>Email adresses of returned mails with bad host:</source>
+			</trans-unit>
+			<trans-unit id="stats_emails_returned_list">
+				<source>Email adresses of returned mails:</source>
+			</trans-unit>
+			<trans-unit id="stats_emails_returned_mailbox_full_list">
+				<source>Email adresses of returned mails with mailbox full:</source>
+			</trans-unit>
+			<trans-unit id="stats_emails_returned_reason_unknown_list">
+				<source>Email adresses of returned mails for unknown reason:</source>
+			</trans-unit>
+			<trans-unit id="stats_emails_returned_unknown_recipient_list">
+				<source>Email adresses of returned mails with unknown recipient:</source>
+			</trans-unit>
+			<trans-unit id="stats_error_in_header">
+				<source>Error in Header:</source>
+			</trans-unit>
+			<trans-unit id="stats_general_information">
+				<source>General information:</source>
+			</trans-unit>
+			<trans-unit id="stats_img_link">
+				<source>Imagelink:</source>
+			</trans-unit>
+			<trans-unit id="stats_links_clicked_per_respondent">
+				<source>Total responses/Unique responses:</source>
+			</trans-unit>
+			<trans-unit id="stats_list_returned">
+				<source>List returned recipients</source>
+			</trans-unit>
+			<trans-unit id="stats_list_returned_bad_header">
+				<source>List returned recipients with error in header</source>
+			</trans-unit>
+			<trans-unit id="stats_list_returned_bad_host">
+				<source>List returned recipients with bad host</source>
+			</trans-unit>
+			<trans-unit id="stats_list_returned_mailbox_full">
+				<source>List returned recipients with mailbox full</source>
+			</trans-unit>
+			<trans-unit id="stats_list_returned_reason_unknown">
+				<source>List returned recipients for unknown reason</source>
+			</trans-unit>
+			<trans-unit id="stats_list_returned_unknown_recipient">
+				<source>List returned recipients with unknown recipient</source>
+			</trans-unit>
+			<trans-unit id="stats_mailbox_full">
+				<source>Mailbox full:</source>
+			</trans-unit>
+			<trans-unit id="stats_mails_returned">
+				<source>Mails returned:</source>
+			</trans-unit>
+			<trans-unit id="stats_mails_sent">
+				<source>Mails sent:</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_choose">
+				<source>Choose a newsletter</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_delivery_begun">
+				<source>Delivery begun</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_delivery_ended">
+				<source>Delivery ended</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_header">
+				<source>Newsletter Statistics</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_queuing">
+				<source>queuing</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_scheduled">
+				<source>Scheduled</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_sending">
+				<source>sending</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_sent">
+				<source>sent</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_status">
+				<source>Status</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_subject">
+				<source>Subject</source>
+			</trans-unit>
+			<trans-unit id="stats_overview_total_sent">
+				<source># sent</source>
+			</trans-unit>
+			<trans-unit id="stats_plainlist">
+				<source>List of recipients:</source>
+			</trans-unit>
+			<trans-unit id="stats_plaintext">
+				<source>Plaintext:</source>
+			</trans-unit>
+			<trans-unit id="stats_plaintext_link_nr">
+				<source>Plaintext Link #</source>
+			</trans-unit>
+			<trans-unit id="stats_reason_unkown">
+				<source>Reason unknown:</source>
+			</trans-unit>
+			<trans-unit id="stats_recalculate_cached_data">
+				<source>Re-calculate Cached Data:</source>
+			</trans-unit>
+			<trans-unit id="stats_recalculate_stats">
+				<source>Re-calculate cached statistics data</source>
+			</trans-unit>
+			<trans-unit id="stats_recipient_unknown">
+				<source>Recipient unknown:</source>
+			</trans-unit>
+			<trans-unit id="stats_response">
+				<source>Responses:</source>
+			</trans-unit>
+			<trans-unit id="stats_response_link">
+				<source>Link Responses:</source>
+			</trans-unit>
+			<trans-unit id="stats_total">
+				<source>Total:</source>
+			</trans-unit>
+			<trans-unit id="stats_total_mails_returned">
+				<source>Total mails returned:</source>
+			</trans-unit>
+			<trans-unit id="stats_total_responses">
+				<source>Total responses (links clicked):</source>
+			</trans-unit>
+			<trans-unit id="stats_unique_responses">
+				<source>Unique responses (links clicked):</source>
+			</trans-unit>
+			<trans-unit id="stats_website_users">
+				<source>List of recipients from fe_users:</source>
+			</trans-unit>
+			<trans-unit id="stats_website_users_disabled">
+				<source>website users disabled</source>
+			</trans-unit>
+			<trans-unit id="subscriber_info">
+				<source>Subscriber Info</source>
+			</trans-unit>
+			<trans-unit id="subscriber_profile">
+				<source>Subscriber Profile</source>
+			</trans-unit>
+			<trans-unit id="subscriber_profile_htmlemail">
+				<source>Receive HTML based mails</source>
+			</trans-unit>
+			<trans-unit id="subscriber_profile_instructions">
+				<source>Set categories of interest for the subscriber.</source>
+			</trans-unit>
+			<trans-unit id="subscriber_profile_update">
+				<source>Update profile settings</source>
+			</trans-unit>
+			<trans-unit id="testmail_individual">
+				<source>Testmail - Individual</source>
+			</trans-unit>
+			<trans-unit id="testmail_individual_msg">
+				<source>Select a recipient of the testmail. The mail will be generated based on the profile of the recipient you select.</source>
+			</trans-unit>
+			<trans-unit id="testmail_mailgroup">
+				<source>Testmail - Recipient list</source>
+			</trans-unit>
+			<trans-unit id="testmail_mailgroup_msg">
+				<source>Select a recipient list for the testmail. The mails will be generated based on the profiles of the recipients in that list.</source>
+			</trans-unit>
+			<trans-unit id="testmail_simple">
+				<source>Testmail - Simple</source>
+			</trans-unit>
+			<trans-unit id="testmail_simple_msg">
+				<source>A simple testmail includes all mail elements regardless of category. But any USER_fields are not substituted with data. Enter an email-address for the testmail:</source>
+			</trans-unit>
+			<trans-unit id="update_convert_do_it_now">
+				<source>Do it now</source>
+			</trans-unit>
+			<trans-unit id="update_convert_now">
+				<source>The direct_mail data in the sys_dmail table need to be update. Please backup the sys_dmail table before clicking the following button. Convert the data?</source>
+			</trans-unit>
+			<trans-unit id="update_convert_result">
+				<source>%d records are converted</source>
+			</trans-unit>
+			<trans-unit id="update_option">
+				<source>Updater</source>
+			</trans-unit>
+			<trans-unit id="update_optionHeader">
+				<source>Important!</source>
+			</trans-unit>
+			<trans-unit id="update_optionLink">
+				<source>[Click here to open the updater]</source>
+			</trans-unit>
+			<trans-unit id="update_optionMsg">
+				<source>For the old data working with direct_mail version 3.0, data must be converted.</source>
+			</trans-unit>
+			<trans-unit id="update_warningHeader">
+				<source>Warning! Please read!</source>
+			</trans-unit>
+			<trans-unit id="update_warningMsg" xml:space="preserve">
+				<source><![CDATA[The updater manipulates your database.
+					So backup your database (at least the sys_dmail table) or do a t3d export of your site (direct_mail sysfolder)
+					<strong>BEFORE</strong> <br>
+					you click on the "Do it now" buttons.]]></source>
+			</trans-unit>
+			<trans-unit id="view_delivery_begin_end">
+				<source>Delivery begun/ended:</source>
+			</trans-unit>
+			<trans-unit id="view_dmail">
+				<source>Direct Mail:</source>
+			</trans-unit>
+			<trans-unit id="view_flowed">
+				<source>Flowed text:</source>
+			</trans-unit>
+			<trans-unit id="view_from">
+				<source>Sender:</source>
+			</trans-unit>
+			<trans-unit id="view_mail">
+				<source>Email format/attachments:</source>
+			</trans-unit>
+			<trans-unit id="view_media">
+				<source>Include media:</source>
+			</trans-unit>
+			<trans-unit id="view_recipient_total_sent">
+				<source>Recipient total/sent:</source>
+			</trans-unit>
+			<trans-unit id="view_replyto">
+				<source>Reply:</source>
+			</trans-unit>
+			<trans-unit id="yes">
+				<source>Yes</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.server">
+				<source>Server URL/IP</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.csh.server">
+				<source>URL or IP of the mail server</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.port">
+				<source>Port number</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.csh.port">
+				<source>Port number of the mail server</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.user">
+				<source>Username</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.csh.user">
+				<source>Username to authenticate</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.password">
+				<source>Password</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.csh.password">
+				<source>Password of the user</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.service">
+				<source>Type of mailserver</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.csh.service">
+				<source>IMAP or POP3</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.maxProcessed">
+				<source>Number of bounce mail to be processed</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.csh.maxProcessed">
+				<source>Maximum number of bounce mail to be processed on one scheduler cycle</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.dataVerification">
+				<source><![CDATA[Connection using the given data is failed. Error message: ]]></source>
+			</trans-unit>
+			<trans-unit id="error.no_recipient_groups_found">
+				<source>No recipient groups found</source>
+			</trans-unit>
+			<trans-unit id="scheduler.bounceMail.phpImapError">
+				<source>Please install PHP IMAP extension</source>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>
\ No newline at end of file
diff --git a/Resources/Private/Php/Fetch/.coveralls.yml b/Resources/Private/Php/Fetch/.coveralls.yml
new file mode 100644
index 000000000..cbd906c6a
--- /dev/null
+++ b/Resources/Private/Php/Fetch/.coveralls.yml
@@ -0,0 +1,3 @@
+src_dir: src
+coverage_clover: build/logs/clover.xml
+json_path: build/logs/coveralls-upload.json
\ No newline at end of file
diff --git a/Resources/Private/Php/Fetch/.gitignore b/Resources/Private/Php/Fetch/.gitignore
new file mode 100644
index 000000000..75ec3873b
--- /dev/null
+++ b/Resources/Private/Php/Fetch/.gitignore
@@ -0,0 +1,9 @@
+.vagrant
+/.idea
+/.settings
+/.buildpath
+/.project
+/composer.lock
+/vendor
+/report
+/build
\ No newline at end of file
diff --git a/Resources/Private/Php/Fetch/.travis.yml b/Resources/Private/Php/Fetch/.travis.yml
new file mode 100644
index 000000000..96a7b6941
--- /dev/null
+++ b/Resources/Private/Php/Fetch/.travis.yml
@@ -0,0 +1,24 @@
+language: php
+
+php:
+    - 5.3
+    - 5.4
+    - 5.5
+    - 5.6
+    - hhvm
+    - hhvm-nightly
+
+before_script:
+    - composer self-update && composer install --dev
+    - vendor/tedivm/dovecottesting/SetupEnvironment.sh
+
+script: ./tests/runTests.sh
+
+after_script:
+    - php vendor/bin/coveralls -v
+
+matrix:
+    fast_finish: true
+    allow_failures:
+      - php: hhvm
+      - php: hhvm-nightly
\ No newline at end of file
diff --git a/Resources/Private/Php/Fetch/CONTRIBUTING.md b/Resources/Private/Php/Fetch/CONTRIBUTING.md
new file mode 100644
index 000000000..8fe815a9d
--- /dev/null
+++ b/Resources/Private/Php/Fetch/CONTRIBUTING.md
@@ -0,0 +1,54 @@
+# Contributions Welcome!
+
+Pull Requests and Community Contributions are the bread and butter of open source software. Every contribution- from bug
+reports to feature requests, typos to full new features- are greatly appreciated.
+
+
+## Important Guidelines
+
+* One Item Per Pull Request or Issue. This makes it much easier to review code and merge it back in, and prevents issues
+  with one request from blocking another.
+
+* Code Coverage is extremely important, and pull requests are much more likely to be accepted if testing is also improved.
+  New code should be properly tested, and all tests must pass.
+
+* Read the LICENSE document and make sure you understand it, because your code is going to be released under it.
+
+* Be prepared to make revisions. Don't be discouraged if you're asked to make changes, as that is just another step
+  towards refining the code and getting it merged back in.
+
+* Remember to add the relevant documentation, particular the docblock comments.
+
+
+## Code Styling
+
+This project follows the PSR standards set forth by the [PHP Framework Interop Group](http://www.php-fig.org/).
+
+* [PSR-0: Class and file naming conventions](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md)
+* [PSR-1: Basic coding standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md)
+* [PSR-2: Coding style guide](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
+
+All code most follow these standards to be accepted. The easiest way to accomplish this is to run php-cs-fixer once the
+new changes are finished. The php-cs-fixer package is installed as a development dependency of this project.
+
+    composer install --dev
+    vendor/bin/php-cs-fixer fix ./ --level="all" -vv
+
+
+## Running the test suite
+
+First install dependencies using Composer. It's important to include the dev packages:
+
+    composer install --dev
+
+The "runTests.sh" script runs the full test suite- phpunit, php-cs-fixer, as well as any environmental setup:
+
+    tests/runTests.sh
+
+To call phpunit directly:
+
+    vendor/bin/phpunit
+
+To call php-cs-fixer directly:
+
+    vendor/bin/php-cs-fixer fix ./ --level="all" -vv --dry-run
diff --git a/Resources/Private/Php/Fetch/LICENSE b/Resources/Private/Php/Fetch/LICENSE
new file mode 100644
index 000000000..68caa37c6
--- /dev/null
+++ b/Resources/Private/Php/Fetch/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2009, Robert Hafner
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Stash Project nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL Robert Hafner BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/Resources/Private/Php/Fetch/README.md b/Resources/Private/Php/Fetch/README.md
new file mode 100644
index 000000000..b157a49c9
--- /dev/null
+++ b/Resources/Private/Php/Fetch/README.md
@@ -0,0 +1,67 @@
+# Fetch [![Build Status](https://travis-ci.org/tedious/Fetch.svg?branch=master)](https://travis-ci.org/tedious/Fetch)
+
+[![License](http://img.shields.io/packagist/l/tedivm/fetch.svg)](https://github.com/tedious/fetch/blob/master/LICENSE)
+[![Latest Stable Version](http://img.shields.io/github/release/tedious/fetch.svg)](https://packagist.org/packages/tedivm/fetch)
+[![Coverage Status](http://img.shields.io/coveralls/tedious/Fetch.svg)](https://coveralls.io/r/tedious/Fetch?branch=master)
+[![Total Downloads](http://img.shields.io/packagist/dt/tedivm/fetch.svg)](https://packagist.org/packages/tedivm/fetch)
+
+Fetch is a library for reading email and attachments, primarily using the POP 
+and IMAP protocols.
+
+
+## Installing
+ > N.b. A note on Ubuntu 14.04 (probably other Debian-based / Apt managed systems), the install of php5-imap does not enable the extension for CLI (possibly others as well), which can cause composer to report fetch requires ext-imap
+ ```
+sudo ln -s /etc/php5/mods-available/imap.ini /etc/php5/cli/conf.d/30-imap.ini
+ ```
+
+### Composer
+
+Installing Fetch can be done through a variety of methods, although Composer is
+recommended.
+
+Until Fetch reaches a stable API with version 1.0 it is recommended that you
+review changes before even Minor updates, although bug fixes will always be
+backwards compatible.
+
+```
+"require": {
+  "tedivm/fetch": "0.6.*"
+}
+```
+
+### Pear
+
+Fetch is also available through Pear.
+
+```
+$ pear channel-discover pear.tedivm.com
+$ pear install tedivm/Fetch
+```
+
+### Github
+
+Releases of Fetch are available on [Github](https://github.com/tedious/Fetch/releases).
+
+
+## Sample Usage
+
+This is just a simple code to show how to access messages by using Fetch. It uses Fetch
+own autoload, but it can (and should be, if applicable) replaced with the one generated
+by composer.
+
+
+    $server = new \Fetch\Server('imap.example.com', 993);
+    $server->setAuthentication('dummy', 'dummy');
+
+
+    $messages = $server->getMessages();
+    /** @var $message \Fetch\Message */
+    foreach ($messages as $message) {
+        echo "Subject: {$message->getSubject()}\nBody: {$message->getMessageBody()}\n";
+    }
+
+
+## License
+
+Fetch is licensed under the BSD License. See the LICENSE file for details.
diff --git a/Resources/Private/Php/Fetch/autoload.php b/Resources/Private/Php/Fetch/autoload.php
new file mode 100644
index 000000000..97c6b0029
--- /dev/null
+++ b/Resources/Private/Php/Fetch/autoload.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Fetch package.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+spl_autoload_register(function ($class) {
+    $base = '/src/';
+
+    if (strpos($class, 'Fetch\Test') === 0) {
+        $base = '/tests/';
+    }
+
+    $file = __DIR__.$base.strtr($class, '\\', '/').'.php';
+    if (file_exists($file)) {
+        require $file;
+
+        return true;
+    }
+});
diff --git a/Resources/Private/Php/Fetch/composer.json b/Resources/Private/Php/Fetch/composer.json
new file mode 100644
index 000000000..43ca4a16f
--- /dev/null
+++ b/Resources/Private/Php/Fetch/composer.json
@@ -0,0 +1,28 @@
+{
+  "name": "tedivm/fetch",
+  "description": "A PHP IMAP Library",
+  "keywords": ["email","imap","pop3"],
+  "homepage": "http://github.com/tedious/Fetch",
+  "type": "library",
+  "license": "BSD-3-Clause",
+  "authors": [
+    {
+      "name": "Robert Hafner",
+      "email": "tedivm@tedivm.com"
+    }
+  ],
+  "require": {
+    "php": ">=5.3.0",
+    "ext-imap": "*"
+  },
+  "require-dev": {
+    "tedivm/dovecottesting": "1.2.3",
+    "phpunit/phpunit": "4.2.*",
+    "fabpot/php-cs-fixer": "0.5.*",
+    "satooshi/php-coveralls": "dev-master"
+
+    },
+  "autoload": {
+    "psr-0": {"Fetch": "src/"}
+  }
+}
diff --git a/Resources/Private/Php/Fetch/phpunit.xml.dist b/Resources/Private/Php/Fetch/phpunit.xml.dist
new file mode 100644
index 000000000..26aa32392
--- /dev/null
+++ b/Resources/Private/Php/Fetch/phpunit.xml.dist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="tests/bootstrap.php"
+>
+    <testsuites>
+        <testsuite name="Fetch Test Suite">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/Fetch/</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-text" target="php://stdout" showUncoveredFiles="false"/>
+    </logging>
+</phpunit>
diff --git a/Resources/Private/Php/Fetch/src/Fetch/Attachment.php b/Resources/Private/Php/Fetch/src/Fetch/Attachment.php
new file mode 100644
index 000000000..431153f86
--- /dev/null
+++ b/Resources/Private/Php/Fetch/src/Fetch/Attachment.php
@@ -0,0 +1,234 @@
+<?php
+
+/*
+ * This file is part of the Fetch package.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fetch;
+
+/**
+ * This library is a wrapper around the Imap library functions included in php. This class wraps around an attachment
+ * in a message, allowing developers to easily save or display attachments.
+ *
+ * @package Fetch
+ * @author  Robert Hafner <tedivm@tedivm.com>
+ */
+class Attachment
+{
+
+    /**
+     * This is the structure object for the piece of the message body that the attachment is located it.
+     *
+     * @var \stdClass
+     */
+    protected $structure;
+
+    /**
+     * This is the unique identifier for the message this attachment belongs to.
+     *
+     * @var int
+     */
+    protected $messageId;
+
+    /**
+     * This is the ImapResource.
+     *
+     * @var resource
+     */
+    protected $imapStream;
+
+    /**
+     * This is the id pointing to the section of the message body that contains the attachment.
+     *
+     * @var int
+     */
+    protected $partId;
+
+    /**
+     * This is the attachments filename.
+     *
+     * @var string
+     */
+    protected $filename;
+
+    /**
+     * This is the size of the attachment.
+     *
+     * @var int
+     */
+    protected $size;
+
+    /**
+     * This stores the data of the attachment so it doesn't have to be retrieved from the server multiple times. It is
+     * only populated if the getData() function is called and should not be directly used.
+     *
+     * @internal
+     * @var array
+     */
+    protected $data;
+
+    /**
+     * This function takes in an ImapMessage, the structure object for the particular piece of the message body that the
+     * attachment is located at, and the identifier for that body part. As a general rule you should not be creating
+     * instances of this yourself, but rather should get them from an ImapMessage class.
+     *
+     * @param Message   $message
+     * @param \stdClass $structure
+     * @param string    $partIdentifier
+     */
+    public function __construct(Message $message, $structure, $partIdentifier = null)
+    {
+        $this->messageId  = $message->getUid();
+        $this->imapStream = $message->getImapBox()->getImapStream();
+        $this->structure  = $structure;
+
+        if (isset($partIdentifier))
+            $this->partId = $partIdentifier;
+
+        $parameters = Message::getParametersFromStructure($structure);
+
+        if (isset($parameters['filename'])) {
+            $this->filename = imap_utf8($parameters['filename']);
+        } elseif (isset($parameters['name'])) {
+            $this->filename = imap_utf8($parameters['name']);
+        }
+
+        $this->size = $structure->bytes;
+
+        $this->mimeType = Message::typeIdToString($structure->type);
+
+        if (isset($structure->subtype))
+            $this->mimeType .= '/' . strtolower($structure->subtype);
+
+        $this->encoding = $structure->encoding;
+    }
+
+    /**
+     * This function returns the data of the attachment. Combined with getMimeType() it can be used to directly output
+     * data to a browser.
+     *
+     * @return string
+     */
+    public function getData()
+    {
+        if (!isset($this->data)) {
+            $messageBody = isset($this->partId) ?
+                imap_fetchbody($this->imapStream, $this->messageId, $this->partId, FT_UID)
+                : imap_body($this->imapStream, $this->messageId, FT_UID);
+
+            $messageBody = Message::decode($messageBody, $this->encoding);
+            $this->data  = $messageBody;
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * This returns the filename of the attachment, or false if one isn't given.
+     *
+     * @return string
+     */
+    public function getFileName()
+    {
+        return (isset($this->filename)) ? $this->filename : false;
+    }
+
+    /**
+     * This function returns the mimetype of the attachment.
+     *
+     * @return string
+     */
+    public function getMimeType()
+    {
+        return $this->mimeType;
+    }
+
+    /**
+     * This returns the size of the attachment.
+     *
+     * @return int
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
+
+    /**
+     * This function returns the object that contains the structure of this attachment.
+     *
+     * @return \stdClass
+     */
+    public function getStructure()
+    {
+        return $this->structure;
+    }
+
+    /**
+     * This function saves the attachment to the passed directory, keeping the original name of the file.
+     *
+     * @param  string $path
+     * @return bool
+     */
+    public function saveToDirectory($path)
+    {
+        $path = rtrim($path, '/') . '/';
+
+        if (is_dir($path))
+            return $this->saveAs($path . $this->getFileName());
+
+        return false;
+    }
+
+    /**
+     * This function saves the attachment to the exact specified location.
+     *
+     * @param  string $path
+     * @return bool
+     */
+    public function saveAs($path)
+    {
+        $dirname = dirname($path);
+        if (file_exists($path)) {
+            if (!is_writable($path)) {
+                return false;
+            }
+        } elseif (!is_dir($dirname) || !is_writable($dirname)) {
+            return false;
+        }
+
+        if (($filePointer = fopen($path, 'w')) == false) {
+            return false;
+        }
+
+        switch ($this->encoding) {
+            case 3: //base64
+                $streamFilter = stream_filter_append($filePointer, 'convert.base64-decode', STREAM_FILTER_WRITE);
+                break;
+
+            case 4: //quoted-printable
+                $streamFilter = stream_filter_append($filePointer, 'convert.quoted-printable-decode', STREAM_FILTER_WRITE);
+                break;
+
+            default:
+                $streamFilter = null;
+        }
+
+        // Fix an issue causing server to throw an error
+        // See: https://github.com/tedious/Fetch/issues/74 for more details
+        $fetch  = imap_fetchbody($this->imapStream, $this->messageId, $this->partId ?: 1, FT_UID);
+        $result = imap_savebody($this->imapStream, $filePointer, $this->messageId, $this->partId ?: 1, FT_UID);
+
+        if ($streamFilter) {
+            stream_filter_remove($streamFilter);
+        }
+
+        fclose($filePointer);
+
+        return $result;
+    }
+}
diff --git a/Resources/Private/Php/Fetch/src/Fetch/Message.php b/Resources/Private/Php/Fetch/src/Fetch/Message.php
new file mode 100755
index 000000000..870c78488
--- /dev/null
+++ b/Resources/Private/Php/Fetch/src/Fetch/Message.php
@@ -0,0 +1,797 @@
+<?php
+
+/*
+ * This file is part of the Fetch package.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fetch;
+
+/**
+ * This library is a wrapper around the Imap library functions included in php. This class represents a single email
+ * message as retrieved from the Imap.
+ *
+ * @package Fetch
+ * @author  Robert Hafner <tedivm@tedivm.com>
+ */
+class Message
+{
+    /**
+     * This is the connection/mailbox class that the email came from.
+     *
+     * @var Server
+     */
+    protected $imapConnection;
+
+    /**
+     * This is the unique identifier for the message. This corresponds to the imap "uid", which we use instead of the
+     * sequence number.
+     *
+     * @var int
+     */
+    protected $uid;
+
+    /**
+     * This is a reference to the Imap stream generated by 'imap_open'.
+     *
+     * @var resource
+     */
+    protected $imapStream;
+
+    /**
+     * This as an string which contains raw header information for the message.
+     *
+     * @var string
+     */
+    protected $rawHeaders;
+
+    /**
+     * This as an object which contains header information for the message.
+     *
+     * @var \stdClass
+     */
+    protected $headers;
+
+    /**
+     * This is an object which contains various status messages and other information about the message.
+     *
+     * @var \stdClass
+     */
+    protected $messageOverview;
+
+    /**
+     * This is an object which contains information about the structure of the message body.
+     *
+     * @var \stdClass
+     */
+    protected $structure;
+
+    /**
+     * This is an array with the index being imap flags and the value being a boolean specifying whether that flag is
+     * set or not.
+     *
+     * @var array
+     */
+    protected $status = array();
+
+    /**
+     * This is an array of the various imap flags that can be set.
+     *
+     * @var string
+     */
+    protected static $flagTypes = array(self::FLAG_RECENT, self::FLAG_FLAGGED, self::FLAG_ANSWERED, self::FLAG_DELETED, self::FLAG_SEEN, self::FLAG_DRAFT);
+
+    /**
+     * This holds the plantext email message.
+     *
+     * @var string
+     */
+    protected $plaintextMessage;
+
+    /**
+     * This holds the html version of the email.
+     *
+     * @var string
+     */
+    protected $htmlMessage;
+
+    /**
+     * This is the date the email was sent.
+     *
+     * @var int
+     */
+    protected $date;
+
+    /**
+     * This is the subject of the email.
+     *
+     * @var string
+     */
+    protected $subject;
+
+    /**
+     * This is the size of the email.
+     *
+     * @var int
+     */
+    protected $size;
+
+    /**
+     * This is an array containing information about the address the email came from.
+     *
+     * @var string
+     */
+    protected $from;
+
+    /**
+     * This is an array containing information about the address the email was sent from.
+     *
+     * @var string
+     */
+    protected $sender;
+
+    /**
+     * This is an array of arrays that contains information about the addresses the email was sent to.
+     *
+     * @var array
+     */
+    protected $to;
+
+    /**
+     * This is an array of arrays that contains information about the addresses the email was cc'd to.
+     *
+     * @var array
+     */
+    protected $cc;
+
+    /**
+     * This is an array of arrays that contains information about the addresses the email was bcc'd to.
+     *
+     * @var array
+     */
+    protected $bcc;
+
+    /**
+     * This is an array of arrays that contain information about the addresses that should receive replies to the email.
+     *
+     * @var array
+     */
+    protected $replyTo;
+
+    /**
+     * This is an array of ImapAttachments retrieved from the message.
+     *
+     * @var Attachment[]
+     */
+    protected $attachments = array();
+
+    /**
+     * Contains the mailbox that the message resides in.
+     *
+     * @var string
+     */
+    protected $mailbox;
+
+    /**
+     * This value defines the encoding we want the email message to use.
+     *
+     * @var string
+     */
+    public static $charset = 'UTF-8';
+
+    /**
+     * This value defines the flag set for encoding if the mb_convert_encoding
+     * function can't be found, and in this case iconv encoding will be used.
+     *
+     * @var string
+     */
+    public static $charsetFlag = '//TRANSLIT';
+
+    /**
+     * These constants can be used to easily access available flags
+     */
+    const FLAG_RECENT = 'recent';
+    const FLAG_FLAGGED = 'flagged';
+    const FLAG_ANSWERED = 'answered';
+    const FLAG_DELETED = 'deleted';
+    const FLAG_SEEN = 'seen';
+    const FLAG_DRAFT = 'draft';
+
+    /**
+     * This constructor takes in the uid for the message and the Imap class representing the mailbox the
+     * message should be opened from. This constructor should generally not be called directly, but rather retrieved
+     * through the apprioriate Imap functions.
+     *
+     * @param int    $messageUniqueId
+     * @param Server $mailbox
+     */
+    public function __construct($messageUniqueId, Server $connection)
+    {
+        $this->imapConnection = $connection;
+        $this->mailbox        = $connection->getMailBox();
+        $this->uid            = $messageUniqueId;
+        $this->imapStream     = $this->imapConnection->getImapStream();
+        if($this->loadMessage() !== true)
+            throw new \RuntimeException('Message with ID ' . $messageUniqueId . ' not found.');
+    }
+
+    /**
+     * This function is called when the message class is loaded. It loads general information about the message from the
+     * imap server.
+     *
+     */
+    protected function loadMessage()
+    {
+
+        /* First load the message overview information */
+
+        if(!is_object($messageOverview = $this->getOverview()))
+
+            return false;
+
+        $this->subject = isset($messageOverview->subject) ? imap_utf8($messageOverview->subject) : null;
+        $this->date    = strtotime($messageOverview->date);
+        $this->size    = $messageOverview->size;
+
+        foreach (self::$flagTypes as $flag)
+            $this->status[$flag] = ($messageOverview->$flag == 1);
+
+        /* Next load in all of the header information */
+
+        $headers = $this->getHeaders();
+
+        if (isset($headers->to))
+            $this->to = $this->processAddressObject($headers->to);
+
+        if (isset($headers->cc))
+            $this->cc = $this->processAddressObject($headers->cc);
+
+        if (isset($headers->bcc))
+            $this->bcc = $this->processAddressObject($headers->bcc);
+
+        if (isset($headers->sender))
+            $this->sender = $this->processAddressObject($headers->sender);
+
+        $this->from    = isset($headers->from) ? $this->processAddressObject($headers->from) : array('');
+        $this->replyTo = isset($headers->reply_to) ? $this->processAddressObject($headers->reply_to) : $this->from;
+
+        /* Finally load the structure itself */
+
+        $structure = $this->getStructure();
+
+        if (!isset($structure->parts)) {
+            // not multipart
+            $this->processStructure($structure);
+        } else {
+            // multipart
+            foreach ($structure->parts as $id => $part)
+                $this->processStructure($part, $id + 1);
+        }
+
+        return true;
+    }
+
+    /**
+     * This function returns an object containing information about the message. This output is similar to that over the
+     * imap_fetch_overview function, only instead of an array of message overviews only a single result is returned. The
+     * results are only retrieved from the server once unless passed true as a parameter.
+     *
+     * @param  bool      $forceReload
+     * @return \stdClass
+     */
+    public function getOverview($forceReload = false)
+    {
+        if ($forceReload || !isset($this->messageOverview)) {
+            // returns an array, and since we just want one message we can grab the only result
+            $results               = imap_fetch_overview($this->imapStream, $this->uid, FT_UID);
+            if ( sizeof($results) == 0 ) {
+                throw new \RuntimeException('Error fetching overview');
+            }
+            $this->messageOverview = array_shift($results);
+            if ( ! isset($this->messageOverview->date)) {
+                $this->messageOverview->date = null;
+            }
+        }
+
+        return $this->messageOverview;
+    }
+
+    /**
+     * This function returns an object containing the raw headers of the message.
+     *
+     * @param  bool   $forceReload
+     * @return string
+     */
+    public function getRawHeaders($forceReload = false)
+    {
+        if ($forceReload || !isset($this->rawHeaders)) {
+            // raw headers (since imap_headerinfo doesn't use the unique id)
+            $this->rawHeaders = imap_fetchheader($this->imapStream, $this->uid, FT_UID);
+        }
+
+        return $this->rawHeaders;
+    }
+
+    /**
+     * This function returns an object containing the headers of the message. This is done by taking the raw headers
+     * and running them through the imap_rfc822_parse_headers function. The results are only retrieved from the server
+     * once unless passed true as a parameter.
+     *
+     * @param  bool      $forceReload
+     * @return \stdClass
+     */
+    public function getHeaders($forceReload = false)
+    {
+        if ($forceReload || !isset($this->headers)) {
+            // raw headers (since imap_headerinfo doesn't use the unique id)
+            $rawHeaders = $this->getRawHeaders();
+
+            // convert raw header string into a usable object
+            $headerObject = imap_rfc822_parse_headers($rawHeaders);
+
+            // to keep this object as close as possible to the original header object we add the udate property
+            if (isset($headerObject->date)) {
+                $headerObject->udate = strtotime($headerObject->date);
+            } else {
+                $headerObject->date = null;
+                $headerObject->udate = null;
+            }
+
+            $this->headers = $headerObject;
+        }
+
+        return $this->headers;
+    }
+
+    /**
+     * This function returns an object containing the structure of the message body. This is the same object thats
+     * returned by imap_fetchstructure. The results are only retrieved from the server once unless passed true as a
+     * parameter.
+     *
+     * @param  bool      $forceReload
+     * @return \stdClass
+     */
+    public function getStructure($forceReload = false)
+    {
+        if ($forceReload || !isset($this->structure)) {
+            $this->structure = imap_fetchstructure($this->imapStream, $this->uid, FT_UID);
+        }
+
+        return $this->structure;
+    }
+
+    /**
+     * This function returns the message body of the email. By default it returns the plaintext version. If a plaintext
+     * version is requested but not present, the html version is stripped of tags and returned. If the opposite occurs,
+     * the plaintext version is given some html formatting and returned. If neither are present the return value will be
+     * false.
+     *
+     * @param  bool        $html Pass true to receive an html response.
+     * @return string|bool Returns false if no body is present.
+     */
+    public function getMessageBody($html = false)
+    {
+        if ($html) {
+            if (!isset($this->htmlMessage) && isset($this->plaintextMessage)) {
+                $output = nl2br($this->plaintextMessage);
+
+                return $output;
+
+            } elseif (isset($this->htmlMessage)) {
+                return $this->htmlMessage;
+            }
+        } else {
+            if (!isset($this->plaintextMessage) && isset($this->htmlMessage)) {
+                $output = preg_replace('/\s*\<br\s*\/?\>/i', PHP_EOL, trim($this->htmlMessage) );
+                $output = strip_tags($output);
+
+                return $output;
+            } elseif (isset($this->plaintextMessage)) {
+                return $this->plaintextMessage;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * This function returns the plain text body of the email or false if not present.
+     * @return string|bool Returns false if not present
+     */
+    public function getPlainTextBody()
+    {
+        return isset($this->plaintextMessage) ? $this->plaintextMessage : false;
+    }
+
+    /**
+     * This function returns the HTML body of the email or false if not present.
+     * @return string|bool Returns false if not present
+     */
+    public function getHtmlBody()
+    {
+        return isset($this->htmlMessage) ? $this->htmlMessage : false;
+    }
+
+    /**
+     * This function returns either an array of email addresses and names or, optionally, a string that can be used in
+     * mail headers.
+     *
+     * @param  string            $type     Should be 'to', 'cc', 'bcc', 'from', 'sender', or 'reply-to'.
+     * @param  bool              $asString
+     * @return array|string|bool
+     */
+    public function getAddresses($type, $asString = false)
+    {
+        $type = ( $type == 'reply-to' ) ? 'replyTo' : $type;
+        $addressTypes = array('to', 'cc', 'bcc', 'from', 'sender', 'replyTo');
+
+        if (!in_array($type, $addressTypes) || !isset($this->$type) || count($this->$type) < 1)
+            return false;
+
+        if (!$asString) {
+            if ($type == 'from')
+                return $this->from[0];
+            elseif ($type == 'sender')
+                return $this->sender[0];
+
+            return $this->$type;
+        } else {
+            $outputString = '';
+            foreach ($this->$type as $address) {
+                if (isset($set))
+                    $outputString .= ', ';
+                if (!isset($set))
+                    $set = true;
+
+                $outputString .= isset($address['name']) ?
+                    $address['name'] . ' <' . $address['address'] . '>'
+                    : $address['address'];
+            }
+
+            return $outputString;
+        }
+    }
+
+    /**
+     * This function returns the date, as a timestamp, of when the email was sent.
+     *
+     * @return int
+     */
+    public function getDate()
+    {
+        return isset($this->date) ? $this->date : false;
+    }
+
+    /**
+     * This returns the subject of the message.
+     *
+     * @return string
+     */
+    public function getSubject()
+    {
+        return isset($this->subject) ? $this->subject : null;
+    }
+
+    /**
+     * This function marks a message for deletion. It is important to note that the message will not be deleted form the
+     * mailbox until the Imap->expunge it run.
+     *
+     * @return bool
+     */
+    public function delete()
+    {
+        return imap_delete($this->imapStream, $this->uid, FT_UID);
+    }
+
+    /**
+     * This function returns Imap this message came from.
+     *
+     * @return Server
+     */
+    public function getImapBox()
+    {
+        return $this->imapConnection;
+    }
+
+    /**
+     * This function takes in a structure and identifier and processes that part of the message. If that portion of the
+     * message has its own subparts, those are recursively processed using this function.
+     *
+     * @param \stdClass $structure
+     * @param string    $partIdentifier
+     */
+    protected function processStructure($structure, $partIdentifier = null)
+    {
+        $parameters = self::getParametersFromStructure($structure);
+
+        if ((isset($parameters['name']) || isset($parameters['filename']))
+            || (isset($structure->subtype) && strtolower($structure->subtype) == 'rfc822')
+        ) {
+            $attachment          = new Attachment($this, $structure, $partIdentifier);
+            $this->attachments[] = $attachment;
+        } elseif ($structure->type == 0 || $structure->type == 1) {
+            $messageBody = isset($partIdentifier) ?
+                imap_fetchbody($this->imapStream, $this->uid, $partIdentifier, FT_UID | FT_PEEK)
+                : imap_body($this->imapStream, $this->uid, FT_UID | FT_PEEK);
+
+            $messageBody = self::decode($messageBody, $structure->encoding);
+
+            if (!empty($parameters['charset']) && $parameters['charset'] !== self::$charset) {
+                $mb_converted = false;
+                if (function_exists('mb_convert_encoding')) {
+                    if (!in_array($parameters['charset'], mb_list_encodings())) {
+                        if ($structure->encoding === 0) {
+                            $parameters['charset'] = 'US-ASCII';
+                        } else {
+                            $parameters['charset'] = 'UTF-8';
+                        }
+                    }
+
+                    $messageBody = @mb_convert_encoding($messageBody, self::$charset, $parameters['charset']);
+                    $mb_converted = true;
+                }
+                if (!$mb_converted) {
+                    $messageBodyConv = @iconv($parameters['charset'], self::$charset . self::$charsetFlag, $messageBody);
+
+                    if ($messageBodyConv !== false) {
+                        $messageBody = $messageBodyConv;
+                    }
+                }
+            }
+
+            if (strtolower($structure->subtype) === 'plain' || ($structure->type == 1 && strtolower($structure->subtype) !== 'alternative')) {
+                if (isset($this->plaintextMessage)) {
+                    $this->plaintextMessage .= PHP_EOL . PHP_EOL;
+                } else {
+                    $this->plaintextMessage = '';
+                }
+
+                $this->plaintextMessage .= trim($messageBody);
+            } elseif (strtolower($structure->subtype) === 'html') {
+                if (isset($this->htmlMessage)) {
+                    $this->htmlMessage .= '<br><br>';
+                } else {
+                    $this->htmlMessage = '';
+                }
+
+                $this->htmlMessage .= $messageBody;
+            }
+        }
+
+        if (isset($structure->parts)) { // multipart: iterate through each part
+
+            foreach ($structure->parts as $partIndex => $part) {
+                $partId = $partIndex + 1;
+
+                if (isset($partIdentifier))
+                    $partId = $partIdentifier . '.' . $partId;
+
+                $this->processStructure($part, $partId);
+            }
+        }
+    }
+
+    /**
+     * This function takes in the message data and encoding type and returns the decoded data.
+     *
+     * @param  string     $data
+     * @param  int|string $encoding
+     * @return string
+     */
+    public static function decode($data, $encoding)
+    {
+        if (!is_numeric($encoding)) {
+            $encoding = strtolower($encoding);
+        }
+
+        switch (true) {
+            case $encoding === 'quoted-printable':
+            case $encoding === 4:
+                return quoted_printable_decode($data);
+
+            case $encoding === 'base64':
+            case $encoding === 3:
+                return base64_decode($data);
+
+            default:
+                return $data;
+        }
+    }
+
+    /**
+     * This function returns the body type that an imap integer maps to.
+     *
+     * @param  int    $id
+     * @return string
+     */
+    public static function typeIdToString($id)
+    {
+        switch ($id) {
+            case 0:
+                return 'text';
+
+            case 1:
+                return 'multipart';
+
+            case 2:
+                return 'message';
+
+            case 3:
+                return 'application';
+
+            case 4:
+                return 'audio';
+
+            case 5:
+                return 'image';
+
+            case 6:
+                return 'video';
+
+            default:
+            case 7:
+                return 'other';
+        }
+    }
+
+    /**
+     * Takes in a section structure and returns its parameters as an associative array.
+     *
+     * @param  \stdClass $structure
+     * @return array
+     */
+    public static function getParametersFromStructure($structure)
+    {
+        $parameters = array();
+        if (isset($structure->parameters))
+            foreach ($structure->parameters as $parameter)
+                $parameters[strtolower($parameter->attribute)] = $parameter->value;
+
+        if (isset($structure->dparameters))
+            foreach ($structure->dparameters as $parameter)
+                $parameters[strtolower($parameter->attribute)] = $parameter->value;
+
+        return $parameters;
+    }
+
+    /**
+     * This function takes in an array of the address objects generated by the message headers and turns them into an
+     * associative array.
+     *
+     * @param  array $addresses
+     * @return array
+     */
+    protected function processAddressObject($addresses)
+    {
+        $outputAddresses = array();
+        if (is_array($addresses))
+            foreach ($addresses as $address) {
+                if (property_exists($address, 'mailbox') && $address->mailbox != 'undisclosed-recipients') {
+                    $currentAddress = array();
+                    $currentAddress['address'] = $address->mailbox . '@' . $address->host;
+                    if (isset($address->personal)) {
+                        $currentAddress['name'] = $address->personal;
+                    }
+                    $outputAddresses[] = $currentAddress;
+                }
+            }
+
+        return $outputAddresses;
+    }
+
+    /**
+     * This function returns the unique id that identifies the message on the server.
+     *
+     * @return int
+     */
+    public function getUid()
+    {
+        return $this->uid;
+    }
+
+    /**
+     * This function returns the attachments a message contains. If a filename is passed then just that ImapAttachment
+     * is returned, unless
+     *
+     * @param  null|string             $filename
+     * @return array|bool|Attachment[]
+     */
+    public function getAttachments($filename = null)
+    {
+        if (!isset($this->attachments) || count($this->attachments) < 1)
+            return false;
+
+        if (!isset($filename))
+            return $this->attachments;
+
+        $results = array();
+        foreach ($this->attachments as $attachment) {
+            if ($attachment->getFileName() == $filename)
+                $results[] = $attachment;
+        }
+
+        switch (count($results)) {
+            case 0:
+                return false;
+
+            case 1:
+                return array_shift($results);
+
+            default:
+                return $results;
+                break;
+        }
+    }
+
+    /**
+     * This function checks to see if an imap flag is set on the email message.
+     *
+     * @param  string $flag Recent, Flagged, Answered, Deleted, Seen, Draft
+     * @return bool
+     */
+    public function checkFlag($flag = self::FLAG_FLAGGED)
+    {
+        return (isset($this->status[$flag]) && $this->status[$flag] === true);
+    }
+
+    /**
+     * This function is used to enable or disable one or more flags on the imap message.
+     *
+     * @param  string|array              $flag   Flagged, Answered, Deleted, Seen, Draft
+     * @param  bool                      $enable
+     * @throws \InvalidArgumentException
+     * @return bool
+     */
+    public function setFlag($flag, $enable = true)
+    {
+        $flags = (is_array($flag)) ? $flag : array($flag);
+
+        foreach ($flags as $i => $flag) {
+            $flag = ltrim(strtolower($flag), '\\');
+            if (!in_array($flag, self::$flagTypes) || $flag == self::FLAG_RECENT)
+                throw new \InvalidArgumentException('Unable to set invalid flag "' . $flag . '"');
+
+            if ($enable) {
+                $this->status[$flag] = true;
+            } else {
+                unset($this->status[$flag]);
+            }
+
+            $flags[$i] = $flag;
+        }
+
+        $imapifiedFlag = '\\'.implode(' \\', array_map('ucfirst', $flags));
+
+        if ($enable === true) {
+            return imap_setflag_full($this->imapStream, $this->uid, $imapifiedFlag, ST_UID);
+        } else {
+            return imap_clearflag_full($this->imapStream, $this->uid, $imapifiedFlag, ST_UID);
+        }
+    }
+
+    /**
+     * This function is used to move a mail to the given mailbox.
+     *
+     * @param $mailbox
+     *
+     * @return bool
+     */
+    public function moveToMailBox($mailbox)
+    {
+        $currentBox = $this->imapConnection->getMailBox();
+        $this->imapConnection->setMailBox($this->mailbox);
+
+        $returnValue = imap_mail_copy($this->imapStream, $this->uid, $mailbox, CP_UID | CP_MOVE);
+        imap_expunge($this->imapStream);
+
+        $this->mailbox = $mailbox;
+
+        $this->imapConnection->setMailBox($currentBox);
+
+        return $returnValue;
+    }
+}
diff --git a/Resources/Private/Php/Fetch/src/Fetch/Server.php b/Resources/Private/Php/Fetch/src/Fetch/Server.php
new file mode 100644
index 000000000..32e57c1b3
--- /dev/null
+++ b/Resources/Private/Php/Fetch/src/Fetch/Server.php
@@ -0,0 +1,515 @@
+<?php
+
+/*
+ * This file is part of the Fetch package.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fetch;
+
+/**
+ * This library is a wrapper around the Imap library functions included in php. This class in particular manages a
+ * connection to the server (imap, pop, etc) and allows for the easy retrieval of stored messages.
+ *
+ * @package Fetch
+ * @author  Robert Hafner <tedivm@tedivm.com>
+ */
+class Server
+{
+    /**
+     * When SSL isn't compiled into PHP we need to make some adjustments to prevent soul crushing annoyances.
+     *
+     * @var bool
+     */
+    public static $sslEnable = true;
+
+    /**
+     * These are the flags that depend on ssl support being compiled into imap.
+     *
+     * @var array
+     */
+    public static $sslFlags = array('ssl', 'validate-cert', 'novalidate-cert', 'tls', 'notls');
+
+    /**
+     * This is used to prevent the class from putting up conflicting tags. Both directions- key to value, value to key-
+     * are checked, so if "novalidate-cert" is passed then "validate-cert" is removed, and vice-versa.
+     *
+     * @var array
+     */
+    public static $exclusiveFlags = array('validate-cert' => 'novalidate-cert', 'tls' => 'notls');
+
+    /**
+     * This is the domain or server path the class is connecting to.
+     *
+     * @var string
+     */
+    protected $serverPath;
+
+    /**
+     * This is the name of the current mailbox the connection is using.
+     *
+     * @var string
+     */
+    protected $mailbox = '';
+
+    /**
+     * This is the username used to connect to the server.
+     *
+     * @var string
+     */
+    protected $username;
+
+    /**
+     * This is the password used to connect to the server.
+     *
+     * @var string
+     */
+    protected $password;
+
+    /**
+     * This is an array of flags that modify how the class connects to the server. Examples include "ssl" to enforce a
+     * secure connection or "novalidate-cert" to allow for self-signed certificates.
+     *
+     * @link http://us.php.net/manual/en/function.imap-open.php
+     * @var array
+     */
+    protected $flags = array();
+
+    /**
+     * This is the port used to connect to the server
+     *
+     * @var int
+     */
+    protected $port;
+
+    /**
+     * This is the set of options, represented by a bitmask, to be passed to the server during connection.
+     *
+     * @var int
+     */
+    protected $options = 0;
+
+    /**
+     * This is the set of connection parameters
+     *
+     * @var array
+     */
+    protected $params = array();
+
+    /**
+     * This is the resource connection to the server. It is required by a number of imap based functions to specify how
+     * to connect.
+     *
+     * @var resource
+     */
+    protected $imapStream;
+
+    /**
+     * This is the name of the service currently being used. Imap is the default, although pop3 and nntp are also
+     * options
+     *
+     * @var string
+     */
+    protected $service = 'imap';
+
+    /**
+     * This constructor takes the location and service thats trying to be connected to as its arguments.
+     *
+     * @param string      $serverPath
+     * @param null|int    $port
+     * @param null|string $service
+     */
+    public function __construct($serverPath, $port = 143, $service = 'imap')
+    {
+        $this->serverPath = $serverPath;
+
+        $this->port = $port;
+
+        switch ($port) {
+            case 143:
+                $this->setFlag('novalidate-cert');
+                break;
+
+            case 993:
+                $this->setFlag('ssl');
+                break;
+        }
+
+        $this->service = $service;
+    }
+
+    /**
+     * This function sets the username and password used to connect to the server.
+     *
+     * @param string $username
+     * @param string $password
+     * @param bool   $tryFasterAuth tries to auth faster by disabling GSSAPI & NTLM auth methods (set to false if you use either of these auth methods)
+     */
+    public function setAuthentication($username, $password, $tryFasterAuth=true)
+    {
+        $this->username = $username;
+        $this->password = $password;
+        if ($tryFasterAuth) {
+            $this->setParam('DISABLE_AUTHENTICATOR', array('GSSAPI','NTLM'));
+        }
+    }
+
+    /**
+     * This function sets the mailbox to connect to.
+     *
+     * @param  string $mailbox
+     * @return bool
+     */
+    public function setMailBox($mailbox = '')
+    {
+        if (!$this->hasMailBox($mailbox)) {
+            return false;
+        }
+
+        $this->mailbox = $mailbox;
+        if (isset($this->imapStream)) {
+            $this->setImapStream();
+        }
+
+        return true;
+    }
+
+    public function getMailBox()
+    {
+        return $this->mailbox;
+    }
+
+    /**
+     * This function sets or removes flag specifying connection behavior. In many cases the flag is just a one word
+     * deal, so the value attribute is not required. However, if the value parameter is passed false it will clear that
+     * flag.
+     *
+     * @param string           $flag
+     * @param null|string|bool $value
+     */
+    public function setFlag($flag, $value = null)
+    {
+        if (!self::$sslEnable && in_array($flag, self::$sslFlags))
+            return;
+
+        if (isset(self::$exclusiveFlags[$flag])) {
+            $kill = self::$exclusiveFlags[$flag];
+        } elseif ($index = array_search($flag, self::$exclusiveFlags)) {
+            $kill = $index;
+        }
+
+        if (isset($kill) && false !== $index = array_search($kill, $this->flags))
+            unset($this->flags[$index]);
+
+        $index = array_search($flag, $this->flags);
+        if (isset($value) && $value !== true) {
+            if ($value == false && $index !== false) {
+                unset($this->flags[$index]);
+            } elseif ($value != false) {
+                $match = preg_grep('/' . $flag . '/', $this->flags);
+                if (reset($match)) {
+                    $this->flags[key($match)] = $flag . '=' . $value;
+                } else {
+                    $this->flags[] = $flag . '=' . $value;
+                }
+            }
+        } elseif ($index === false) {
+            $this->flags[] = $flag;
+        }
+    }
+
+    /**
+     * This funtion is used to set various options for connecting to the server.
+     *
+     * @param  int        $bitmask
+     * @throws \Exception
+     */
+    public function setOptions($bitmask = 0)
+    {
+        if (!is_numeric($bitmask))
+            throw new \RuntimeException('Function requires numeric argument.');
+
+        $this->options = $bitmask;
+    }
+
+    /**
+     * This function is used to set connection parameters
+     *
+     * @param string $key
+     * @param string $value
+     */
+    public function setParam($key, $value)
+    {
+        $this->params[$key] = $value;
+    }
+
+    /**
+     * This function gets the current saved imap resource and returns it.
+     *
+     * @return resource
+     */
+    public function getImapStream()
+    {
+        if (empty($this->imapStream))
+            $this->setImapStream();
+
+        return $this->imapStream;
+    }
+
+    /**
+     * This function takes in all of the connection date (server, port, service, flags, mailbox) and creates the string
+     * thats passed to the imap_open function.
+     *
+     * @return string
+     */
+    public function getServerString()
+    {
+        $mailboxPath = $this->getServerSpecification();
+
+        if (isset($this->mailbox))
+            $mailboxPath .= $this->mailbox;
+
+        return $mailboxPath;
+    }
+
+    /**
+     * Returns the server specification, without adding any mailbox.
+     *
+     * @return string
+     */
+    protected function getServerSpecification()
+    {
+        $mailboxPath = '{' . $this->serverPath;
+
+        if (isset($this->port))
+            $mailboxPath .= ':' . $this->port;
+
+        if ($this->service != 'imap')
+            $mailboxPath .= '/' . $this->service;
+
+        foreach ($this->flags as $flag) {
+            $mailboxPath .= '/' . $flag;
+        }
+
+        $mailboxPath .= '}';
+
+        return $mailboxPath;
+    }
+
+    /**
+     * This function creates or reopens an imapStream when called.
+     *
+     */
+    protected function setImapStream()
+    {
+        if (!empty($this->imapStream)) {
+            if (!imap_reopen($this->imapStream, $this->getServerString(), $this->options, 1))
+                throw new \RuntimeException(imap_last_error());
+        } else {
+            $imapStream = @imap_open($this->getServerString(), $this->username, $this->password, $this->options, 1, $this->params);
+
+            if ($imapStream === false)
+                throw new \RuntimeException(imap_last_error());
+
+            $this->imapStream = $imapStream;
+        }
+    }
+
+    /**
+     * This returns the number of messages that the current mailbox contains.
+     *
+     * @param  string $mailbox
+     * @return int
+     */
+    public function numMessages($mailbox='')
+    {
+        $cnt = 0;
+        if ($mailbox==='') {
+            $cnt = imap_num_msg($this->getImapStream());
+        } elseif ($this->hasMailbox($mailbox) && $mailbox !== '') {
+            $oldMailbox = $this->getMailBox();
+            $this->setMailbox($mailbox);
+            $cnt = $this->numMessages();
+            $this->setMailbox($oldMailbox);
+        }
+
+        return ((int) $cnt);
+    }
+
+    /**
+     * This function returns an array of ImapMessage object for emails that fit the criteria passed. The criteria string
+     * should be formatted according to the imap search standard, which can be found on the php "imap_search" page or in
+     * section 6.4.4 of RFC 2060
+     *
+     * @link http://us.php.net/imap_search
+     * @link http://www.faqs.org/rfcs/rfc2060
+     * @param  string   $criteria
+     * @param  null|int $limit
+     * @return array    An array of ImapMessage objects
+     */
+    public function search($criteria = 'ALL', $limit = null)
+    {
+        if ($results = imap_search($this->getImapStream(), $criteria, SE_UID)) {
+            if (isset($limit) && count($results) > $limit)
+                $results = array_slice($results, 0, $limit);
+
+            $messages = array();
+
+            foreach ($results as $messageId)
+                $messages[] = new Message($messageId, $this);
+
+            return $messages;
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * This function returns the recently received emails as an array of ImapMessage objects.
+     *
+     * @param  null|int $limit
+     * @return array    An array of ImapMessage objects for emails that were recently received by the server.
+     */
+    public function getRecentMessages($limit = null)
+    {
+        return $this->search('Recent', $limit);
+    }
+
+    /**
+     * Returns the emails in the current mailbox as an array of ImapMessage objects.
+     *
+     * @param  null|int  $limit
+     * @return Message[]
+     */
+    public function getMessages($limit = null)
+    {
+        $numMessages = $this->numMessages();
+
+        if (isset($limit) && is_numeric($limit) && $limit < $numMessages)
+            $numMessages = $limit;
+
+        if ($numMessages < 1)
+            return array();
+
+        $stream   = $this->getImapStream();
+        $messages = array();
+        for ($i = 1; $i <= $numMessages; $i++) {
+            $uid        = imap_uid($stream, $i);
+            $messages[] = new Message($uid, $this);
+        }
+
+        return $messages;
+    }
+
+    /**
+     * Returns the emails in the current mailbox as an array of ImapMessage objects
+     * ordered by some ordering
+     *
+     * @see    http://php.net/manual/en/function.imap-sort.php
+     * @param  int       $orderBy
+     * @param  bool      $reverse
+     * @param  int       $limit
+     * @return Message[]
+     */
+    public function getOrderedMessages($orderBy, $reverse, $limit)
+    {
+        $msgIds = imap_sort($this->getImapStream(), $orderBy, $reverse ? 1 : 0, SE_UID);
+
+        return array_map(array($this, 'getMessageByUid'), array_slice($msgIds, 0, $limit));
+    }
+
+    /**
+     * Returns the requested email or false if it is not found.
+     *
+     * @param  int          $uid
+     * @return Message|bool
+     */
+    public function getMessageByUid($uid)
+    {
+        try {
+            $message = new \Fetch\Message($uid, $this);
+
+            return $message;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * This function removes all of the messages flagged for deletion from the mailbox.
+     *
+     * @return bool
+     */
+    public function expunge()
+    {
+        return imap_expunge($this->getImapStream());
+    }
+
+    /**
+     * Checks if the given mailbox exists.
+     *
+     * @param $mailbox
+     *
+     * @return bool
+     */
+    public function hasMailBox($mailbox)
+    {
+        return (boolean) $this->getMailBoxDetails($mailbox);
+    }
+
+    /**
+    * Return information about the mailbox or mailboxes
+    *
+    * @param $mailbox
+    *
+    * @return array
+    */
+    public function getMailBoxDetails($mailbox)
+    {
+        return imap_getmailboxes(
+            $this->getImapStream(),
+            $this->getServerString(),
+            $this->getServerSpecification() . $mailbox
+        );
+    }
+
+    /**
+     * Creates the given mailbox.
+     *
+     * @param $mailbox
+     *
+     * @return bool
+     */
+    public function createMailBox($mailbox)
+    {
+        return imap_createmailbox($this->getImapStream(), $this->getServerSpecification() . $mailbox);
+    }
+
+    /**
+     * List available mailboxes
+     *
+     * @param string $pattern
+     *
+     * @return array
+     */
+    public function listMailBoxes($pattern = '*')
+    {
+        return imap_list($this->getImapStream(), $this->getServerSpecification(), $pattern);
+    }
+
+    /**
+     * Deletes the given mailbox.
+     *
+     * @param $mailbox
+     *
+     * @return bool
+     */
+     public function deleteMailBox($mailbox)
+     {
+         return imap_deletemailbox($this->getImapStream(), $this->getServerSpecification() . $mailbox);
+     }
+}
diff --git a/Resources/Private/Php/Fetch/tests/Fetch/Test/AttachmentTest.php b/Resources/Private/Php/Fetch/tests/Fetch/Test/AttachmentTest.php
new file mode 100644
index 000000000..ffec66b9f
--- /dev/null
+++ b/Resources/Private/Php/Fetch/tests/Fetch/Test/AttachmentTest.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * This file is part of the Fetch library.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fetch\Test;
+
+/**
+ * @package Fetch
+ * @author  Robert Hafner <tedivm@tedivm.com>
+ */
+class AttachmentTest extends \PHPUnit_Framework_TestCase
+{
+
+    public static function getAttachments($MessageId)
+    {
+        $server = ServerTest::getServer();
+        $message = new \Fetch\Message($MessageId, $server);
+        $attachments = $message->getAttachments();
+        $returnAttachments = array();
+        foreach($attachments as $attachment)
+            $returnAttachments[$attachment->getFileName()] = $attachment;
+
+        return $returnAttachments;
+    }
+
+    public function testGetData()
+    {
+        $attachments = static::getAttachments('6');
+
+        $attachment_RCA = $attachments['RCA_Indian_Head_test_pattern.JPG.zip'];
+        $md5_RCA = '3e9b6f02551590a7bcfff5d50b5b7b20';
+        $this->assertEquals($md5_RCA, md5($attachment_RCA->getData()));
+
+        $attachment_TestCard = $attachments['Test_card.png.zip'];
+        $md5_TestCard = '94c40bd83fbfa03b29bf1811f9aaccea';
+        $this->assertEquals($md5_TestCard, md5($attachment_TestCard->getData()));
+    }
+
+    public function testGetMimeType()
+    {
+        $attachments = static::getAttachments('6');
+
+        $attachment_RCA = $attachments['RCA_Indian_Head_test_pattern.JPG.zip'];
+        $mimetype_RCA = 'application/zip';
+        $this->assertEquals($mimetype_RCA, $attachment_RCA->getMimeType());
+
+        $attachment_TestCard = $attachments['Test_card.png.zip'];
+        $mimetype_TestCard = 'application/zip';
+        $this->assertEquals($mimetype_TestCard, $attachment_TestCard->getMimeType());
+    }
+
+    public function testGetSize()
+    {
+        $attachments = static::getAttachments('6');
+
+        $attachment_RCA = $attachments['RCA_Indian_Head_test_pattern.JPG.zip'];
+        $size_RCA = 378338;
+        $this->assertEquals($size_RCA, $attachment_RCA->getSize());
+
+        $attachment_TestCard = $attachments['Test_card.png.zip'];
+        $size_TestCard = 32510;
+        $this->assertEquals($size_TestCard, $attachment_TestCard->getSize());
+    }
+
+    public function testGetStructure()
+    {
+        $attachments = static::getAttachments('6');
+
+        $attachment_RCA = $attachments['RCA_Indian_Head_test_pattern.JPG.zip'];
+        $structure_RCA = $attachment_RCA->getStructure();
+
+        $this->assertObjectHasAttribute('type', $structure_RCA);
+        $this->assertEquals(3, $structure_RCA->type);
+
+        $this->assertObjectHasAttribute('subtype', $structure_RCA);
+        $this->assertEquals('ZIP', $structure_RCA->subtype);
+
+        $this->assertObjectHasAttribute('bytes', $structure_RCA);
+        $this->assertEquals(378338, $structure_RCA->bytes);
+    }
+
+    public function testSaveToDirectory()
+    {
+        $attachments = static::getAttachments('6');
+
+        $attachment_RCA = $attachments['RCA_Indian_Head_test_pattern.JPG.zip'];
+
+        $tmpdir = rtrim(sys_get_temp_dir(), '/') . '/';
+        $filepath = $tmpdir . 'RCA_Indian_Head_test_pattern.JPG.zip';
+
+        $this->assertTrue($attachment_RCA->saveToDirectory($tmpdir));
+
+        $this->assertFileExists($filepath);
+        $this->assertEquals(md5(file_get_contents($filepath)), md5($attachment_RCA->getData()));
+
+        $attachments = static::getAttachments('6');
+        $attachment_RCA = $attachments['RCA_Indian_Head_test_pattern.JPG.zip'];
+        $this->assertFalse($attachment_RCA->saveToDirectory('/'), 'Returns false when attempting to save without filesystem permission.');
+
+        $attachments = static::getAttachments('6');
+        $attachment_RCA = $attachments['RCA_Indian_Head_test_pattern.JPG.zip'];
+        $this->assertFalse($attachment_RCA->saveToDirectory($filepath), 'Returns false when attempting to save over a file.');
+    }
+
+    public static function tearDownAfterClass()
+    {
+        $tmpdir = rtrim(sys_get_temp_dir(), '/') . '/';
+        $filepath = $tmpdir . 'RCA_Indian_Head_test_pattern.JPG.zip';
+        unlink($filepath);
+    }
+}
diff --git a/Resources/Private/Php/Fetch/tests/Fetch/Test/MessageTest.php b/Resources/Private/Php/Fetch/tests/Fetch/Test/MessageTest.php
new file mode 100644
index 000000000..0cb9a7637
--- /dev/null
+++ b/Resources/Private/Php/Fetch/tests/Fetch/Test/MessageTest.php
@@ -0,0 +1,286 @@
+<?php
+
+/*
+ * This file is part of the Fetch library.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fetch\Test;
+use Fetch\Message;
+
+/**
+ * @package Fetch
+ * @author  Robert Hafner <tedivm@tedivm.com>
+ */
+class MessageTest extends \PHPUnit_Framework_TestCase
+{
+    public static function getMessage($id)
+    {
+        $server = ServerTest::getServer();
+
+        return new \Fetch\Message($id, $server);
+    }
+
+    public function testConstructMessage()
+    {
+        $message = static::getMessage(3);
+        $this->assertInstanceOf('\Fetch\Message', $message);
+    }
+
+    public function testGetOverview()
+    {
+        $message = static::getMessage(3);
+        $overview = $message->getOverview();
+        $this->assertEquals('Welcome', $overview->subject, 'Subject available from overview');
+        $this->assertEquals('tedivm@tedivm.com', $overview->from, 'From available from overview');
+        $this->assertEquals('testuser@tedivm.com', $overview->to, 'To available from overview');
+        $this->assertEquals(1465, $overview->size, 'Size available from overview');
+        $this->assertEquals(0, $overview->flagged, 'Flagged available from overview');
+        $this->assertEquals(1, $overview->seen, 'Seen available from overview');
+    }
+
+    public function testGetHeaders()
+    {
+        $message = static::getMessage(3);
+        $headers = $message->getHeaders();
+        $this->assertEquals('Sun,  1 Dec 2013 21:14:03 -0800 (PST)', $headers->date, 'Headers contain the right date.');
+        $this->assertEquals('testuser@tedivm.com', $headers->toaddress, 'Headers contain toaddress.');
+        $this->assertEquals('tedivm@tedivm.com', $headers->fromaddress, 'Headers contain fromaddress');
+    }
+
+    public function testGetStructure()
+    {
+
+    }
+
+    public function testGetMessageBody()
+    {
+        // easiest way to deal with php encoding issues is simply not to.
+        $plaintextTest = 'f9377a89c9c935463a2b35c92dd61042';
+        $convertedHtmlTest = '11498bcf191900d634ff8772a64ca523';
+        $pureHtmlTest = '6a366ddecf080199284146d991d52169';
+
+        $message = static::getMessage(3);
+        $messageNonHTML = $message->getMessageBody();
+        $this->assertEquals($plaintextTest, md5($messageNonHTML), 'Message returns as plaintext.');
+
+        $messageHTML = $message->getMessageBody(true);
+        $this->assertEquals($convertedHtmlTest, md5($messageHTML), 'Message converts from plaintext to HTML when requested.');
+
+        $message = static::getMessage(4);
+        $messageHTML = $message->getMessageBody(true);
+        $this->assertEquals($pureHtmlTest, md5($messageHTML), 'Message returns as HTML.');
+
+    }
+
+    public function testGetPlainTextBody()
+    {
+        // easiest way to deal with php encoding issues is simply not to.
+        $plaintextTest1 = 'f9377a89c9c935463a2b35c92dd61042';
+        $plaintextTest2 = '0b8fc9b534a1789f1071f996f238a07a';
+        $plaintextTest3 = 'd41d8cd98f00b204e9800998ecf8427e';
+
+        $message = static::getMessage(3);
+        $messagePlainText = $message->getPlainTextBody();
+        $this->assertEquals($plaintextTest1, md5($messagePlainText), 'Message returns as plaintext.');
+
+        $message = static::getMessage(4);
+        $messagePlainText = $message->getPlainTextBody();
+        $this->assertEquals($plaintextTest2, md5($messagePlainText), 'Message returns as plaintext.');
+
+        $message = static::getMessage(6);
+        $messagePlainText = $message->getPlainTextBody();
+        $this->assertEquals($plaintextTest3, md5($messagePlainText), 'Message does not return as plaintext.');
+
+    }
+
+    public function testGetHtmlBody()
+    {
+        // easiest way to deal with php encoding issues is simply not to.
+        $HtmlTest1 = 'd41d8cd98f00b204e9800998ecf8427e';
+        $HtmlTest2 = '6a366ddecf080199284146d991d52169';
+
+        $message = static::getMessage(3);
+        $messageHtml = $message->getHtmlBody();
+        $this->assertEquals($HtmlTest1, md5($messageHtml), 'Message does not return as HTML.');
+
+        $message = static::getMessage(4);
+        $messageHtml = $message->getHtmlBody();
+        $this->assertEquals($HtmlTest2, md5($messageHtml), 'Message returns as HTML.');
+
+    }
+
+    public function testGetAddresses()
+    {
+        $message = static::getMessage(3);
+
+        $addresses = $message->getAddresses('to');
+        $this->assertEquals('testuser@tedivm.com', $addresses[0]['address'], 'Retrieving to user from address array.');
+
+        $addressString = $message->getAddresses('to', true);
+        $this->assertEquals('testuser@tedivm.com', $addressString, 'Returning To address as string.');
+
+        $addresses = $message->getAddresses('from');
+        $this->assertEquals('tedivm@tedivm.com', $addresses['address'], 'Returning From address as an address array.');
+
+        $addressString = $message->getAddresses('from', true);
+        $this->assertEquals('tedivm@tedivm.com', $addressString, 'Returning From address as string.');
+    }
+
+    public function testGetDate()
+    {
+        $message = static::getMessage(3);
+        $this->assertEquals(1385961243, $message->getDate(), 'Returns date as timestamp.');
+    }
+
+    public function testGetSubject()
+    {
+        $message = static::getMessage(3);
+        $this->assertEquals('Welcome', $message->getSubject(), 'Returns Subject.');
+    }
+
+    public function testDelete()
+    {
+
+    }
+
+    public function testGetImapBox()
+    {
+        $server = ServerTest::getServer();
+        $message = new \Fetch\Message('3', $server);
+        $this->assertEquals($server, $message->getImapBox(), 'getImapBox returns Server used to create Message.');
+    }
+
+    public function testGetUid()
+    {
+        $message = static::getMessage('3');
+        $this->assertEquals(3, $message->getUid(), 'Message returns UID');
+    }
+
+    public function testGetAttachments()
+    {
+        $messageWithoutAttachments = static::getMessage('3');
+        $this->assertFalse($messageWithoutAttachments->getAttachments(), 'getAttachments returns false when no attachments present.');
+
+        $messageWithAttachments = static::getMessage('6');
+        $attachments = $messageWithAttachments->getAttachments();
+        $this->assertCount(2, $attachments);
+        foreach($attachments as $attachment)
+            $this->assertInstanceOf('\Fetch\Attachment', $attachment, 'getAttachments returns Fetch\Attachment objects.');
+
+        $attachment = $messageWithAttachments->getAttachments('Test_card.png.zip');
+        $this->assertInstanceOf('\Fetch\Attachment', $attachment, 'getAttachment returns specified Fetch\Attachment object.');
+    }
+
+    public function testCheckFlag()
+    {
+        $message = static::getMessage('3');
+        $this->assertFalse($message->checkFlag('flagged'));
+        $this->assertTrue($message->checkFlag('seen'));
+    }
+
+    public function testSetFlag()
+    {
+        $message = static::getMessage('3');
+        $this->assertFalse($message->checkFlag('answered'), 'Message is not answered.');
+
+        $this->assertTrue($message->setFlag('answered'), 'setFlag returned true.');
+        $this->assertTrue($message->checkFlag('answered'), 'Message was successfully answered.');
+
+        $this->assertTrue($message->setFlag('answered', false), 'setFlag returned true.');
+        $this->assertFalse($message->checkFlag('answered'), 'Message was successfully unanswered.');
+
+        $message = static::getMessage('2');
+        $this->assertFalse($message->checkFlag('flagged'), 'Message is not flagged.');
+
+        $this->assertTrue($message->setFlag('flagged'), 'setFlag returned true.');
+        $this->assertTrue($message->checkFlag('flagged'), 'Message was successfully flagged.');
+
+        $message = static::getMessage('2');
+        $this->assertTrue($message->setFlag('flagged', false), 'setFlag returned true.');
+        $this->assertFalse($message->checkFlag('flagged'), 'Message was successfully unflagged.');
+    }
+
+    public function testMoveToMailbox()
+    {
+        $server = ServerTest::getServer();
+
+        // Testing by moving message from "Test Folder" to "Sent"
+
+        // Count Test Folder
+        $testFolderNumStart = $server->numMessages('Test Folder');
+        $server->setMailbox('Test Folder');
+        $this->assertEquals($testFolderNumStart, $server->numMessages(), 'Server presents consistent information between numMessages when mailbox set and directly queried for number of messages');
+
+        // Get message from Test Folder
+        $message = current($server->getMessages(1));
+        $this->assertInstanceOf('\Fetch\Message', $message, 'Server returned Message.');
+
+        // Switch to Sent folder, count messages
+        $sentFolderNumStart = $server->numMessages('Sent');
+        $server->setMailbox('Sent');
+        $this->assertEquals($sentFolderNumStart, $server->numMessages(), 'Server presents consistent information between numMessages when mailbox set and directly queried for number of messages');
+
+        // Switch to "Flagged" folder in order to test that function properly returns to it
+        $this->assertTrue($server->setMailBox('Flagged Email'));
+        // Move the message!
+        $this->assertTrue($message->moveToMailBox('Sent'));
+        // Make sure we're still in the same folder
+        $this->assertEquals('Flagged Email', $server->getMailBox(), 'Returned Server back to right mailbox.');
+        $this->assertAttributeEquals('Sent', 'mailbox', $message, 'Message mailbox changed to new location.');
+        // Make sure Test Folder lost a message
+        $this->assertTrue($server->setMailBox('Test Folder'));
+        $this->assertEquals($testFolderNumStart - 1, $server->numMessages(), 'Message moved out of Test Folder.');
+        // Make sure Sent folder gains one
+        $this->assertTrue($server->setMailBox('Sent'));
+        $this->assertEquals($sentFolderNumStart + 1, $server->numMessages(), 'Message moved into Sent Folder.');
+    }
+
+    public function testDecode()
+    {
+        $quotedPrintableDecoded = "Now's the time for all folk to come to the aid of their country.";
+        $quotedPrintable = <<<'ENCODE'
+Now's the time =
+for all folk to come=
+ to the aid of their country.
+ENCODE;
+        $this->assertEquals($quotedPrintableDecoded, Message::decode($quotedPrintable, 'quoted-printable'), 'Decodes quoted printable');
+        $this->assertEquals($quotedPrintableDecoded, Message::decode($quotedPrintable, 4), 'Decodes quoted printable');
+
+        $testString = 'This is a test string';
+        $base64 = base64_encode($testString);
+        $this->assertEquals($testString, Message::decode($base64, 'base64'), 'Decodes quoted base64');
+        $this->assertEquals($testString, Message::decode($base64, 3), 'Decodes quoted base64');
+
+        $notEncoded = '> w - www.somesite.com.au<http://example.com/track/click.php?u=30204369&id=af4110cab28e464cb0702723bc84b3f3>';
+        $this->assertEquals($notEncoded, Message::decode($notEncoded, 0), 'Nothing to decode');
+    }
+
+    public function testTypeIdToString()
+    {
+        $types = array();
+        $types[0] = 'text';
+        $types[1] = 'multipart';
+        $types[2] = 'message';
+        $types[3] = 'application';
+        $types[4] = 'audio';
+        $types[5] = 'image';
+        $types[6] = 'video';
+        $types[7] = 'other';
+        $types[8] = 'other';
+        $types[32] = 'other';
+
+        foreach($types as $id => $type)
+            $this->assertEquals($type, Message::typeIdToString($id));
+    }
+
+    public function testGetParametersFromStructure()
+    {
+
+    }
+
+}
diff --git a/Resources/Private/Php/Fetch/tests/Fetch/Test/ServerTest.php b/Resources/Private/Php/Fetch/tests/Fetch/Test/ServerTest.php
new file mode 100644
index 000000000..a90ee7f67
--- /dev/null
+++ b/Resources/Private/Php/Fetch/tests/Fetch/Test/ServerTest.php
@@ -0,0 +1,234 @@
+<?php
+
+/*
+ * This file is part of the Fetch library.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Fetch\Test;
+
+use Fetch\Server;
+
+/**
+ * @package Fetch
+ * @author  Robert Hafner <tedivm@tedivm.com>
+ */
+class ServerTest extends \PHPUnit_Framework_TestCase
+{
+    public static $num_messages_inbox = 12;
+
+    /**
+     * @dataProvider flagsDataProvider
+     * @param string  $expected server string with %host% placeholder
+     * @param integer $port     to use (needed to test behavior on port 143 and 993 from constructor)
+     * @param array   $flags    to set/unset ($flag => $value)
+     */
+    public function testFlags($expected, $port, $flags)
+    {
+        $server = new Server(TESTING_SERVER_HOST, $port);
+
+        foreach ($flags as $flag => $value) {
+            $server->setFlag($flag, $value);
+        }
+
+        $this->assertEquals(str_replace('%host%', TESTING_SERVER_HOST, $expected), $server->getServerString());
+    }
+
+    public function testFlagOverwrite()
+    {
+        $server = static::getServer();
+
+        $server->setFlag('TestFlag', 'true');
+        $this->assertAttributeContains('TestFlag=true', 'flags', $server);
+
+        $server->setFlag('TestFlag', 'false');
+        $this->assertAttributeContains('TestFlag=false', 'flags', $server);
+    }
+
+    public function flagsDataProvider()
+    {
+        return array(
+                array('{%host%:143/novalidate-cert}', 143, array()),
+                array('{%host%:143/validate-cert}', 143, array('validate-cert' => true)),
+                array('{%host%:143}', 143, array('novalidate-cert' => false)),
+                array('{%host%:993/ssl}', 993, array()),
+                array('{%host%:993}', 993, array('ssl' => false)),
+                array('{%host%:100/tls}', 100, array('tls' => true)),
+                array('{%host%:100/tls}', 100, array('tls' => true, 'tls' => true)),
+                array('{%host%:100/notls}', 100, array('tls' => true, 'notls' => true)),
+                array('{%host%:100}', 100, array('ssl' => true, 'ssl' => false)),
+                array('{%host%:100/user=foo}', 100, array('user' => 'foo')),
+                array('{%host%:100/user=foo}', 100, array('user' => 'foo', 'user' => 'foo')),
+                array('{%host%:100/user=bar}', 100, array('user' => 'foo', 'user' => 'bar')),
+                array('{%host%:100}', 100, array('user' => 'foo', 'user' => false)),
+        );
+    }
+
+    /**
+     * @dataProvider connectionDataProvider
+     * @param integer $port    to use (needed to test behavior on port 143 and 993 from constructor)
+     * @param array   $flags   to set/unset ($flag => $value)
+     * @param string  $message Assertion message
+     */
+    public function testConnection($port, $flags, $message)
+    {
+        $server = new Server(TESTING_SERVER_HOST, $port);
+        $server->setAuthentication(TEST_USER, TEST_PASSWORD);
+
+        foreach ($flags as $flag => $value) {
+            $server->setFlag($flag, $value);
+        }
+
+        $imapSteam = $server->getImapStream();
+        $this->assertInternalType('resource', $imapSteam, $message);
+    }
+
+    public function connectionDataProvider()
+    {
+        return array(
+            array(143, array(), 'Connects with default settings.'),
+            array(993, array('novalidate-cert' => true), 'Connects over SSL (self signed).'),
+        );
+    }
+
+    public function testNumMessages()
+    {
+        $server = static::getServer();
+        $numMessages = $server->numMessages();
+        $this->assertEquals(self::$num_messages_inbox, $numMessages);
+        $this->assertEquals(0, $server->numMessages( 'DOESNOTEXIST'.time() ) );
+    }
+
+    public function testGetMessages()
+    {
+        $server = static::getServer();
+        $messages = $server->getMessages(5);
+
+        $this->assertCount(5, $messages, 'Five messages returned');
+        foreach ($messages as $message) {
+            $this->assertInstanceOf('\Fetch\Message', $message, 'Returned values are Messages');
+        }
+    }
+
+    public function testGetMessagesOrderedByDateAsc()
+    {
+        $server = static::getServer();
+        $messages = $server->getOrderedMessages(SORTDATE, false, 2);
+
+        $this->assertCount(2, $messages, 'Two messages returned');
+        $this->assertGreaterThan($messages[0]->getDate(), $messages[1]->getDate(), 'Messages in ascending order');
+    }
+
+    public function testGetMessagesOrderedByDateDesc()
+    {
+        $server = static::getServer();
+        $messages = $server->getOrderedMessages(SORTDATE, true, 2);
+
+        $this->assertCount(2, $messages, 'Two messages returned');
+        $this->assertLessThan($messages[0]->getDate(), $messages[1]->getDate(), 'Messages in descending order');
+    }
+
+    public function testGetMailBox()
+    {
+        $server = static::getServer();
+        $this->assertEquals('', $server->getMailBox());
+        $this->assertTrue($server->setMailBox('Sent'));
+        $this->assertEquals('Sent', $server->getMailBox());
+    }
+
+    public function testSetMailBox()
+    {
+        $server = static::getServer();
+
+        $this->assertTrue($server->setMailBox('Sent'));
+        $this->assertEquals('Sent', $server->getMailBox());
+
+        $this->assertTrue($server->setMailBox('Flagged Email'));
+        $this->assertEquals('Flagged Email', $server->getMailBox());
+
+        $this->assertFalse($server->setMailBox('Cheese'));
+
+        $this->assertTrue($server->setMailBox(''));
+        $this->assertEquals('', $server->getMailBox());
+    }
+
+    public function testHasMailBox()
+    {
+        $server = static::getServer();
+
+        $this->assertTrue($server->hasMailBox('Sent'), 'Has mailbox "Sent"');
+        $this->assertTrue($server->hasMailBox('Flagged Email'), 'Has mailbox "Flagged Email"');
+        $this->assertFalse($server->hasMailBox('Cheese'), 'Does not have mailbox "Cheese"');
+    }
+
+    public function testListMailBoxes()
+    {
+        $server = static::getServer();
+        $spec = sprintf('{%s:143/novalidate-cert}', TESTING_SERVER_HOST);
+
+        $list = $server->listMailboxes('*');
+        $this->assertContains($spec.'Sent', $list, 'Has mailbox "Sent"');
+        $this->assertNotContains($spec.'Cheese', $list, 'Does not have mailbox "Cheese"');
+    }
+
+    public function testCreateMailbox()
+    {
+        $server = static::getServer();
+
+        $this->assertFalse($server->hasMailBox('Cheese'), 'Does not have mailbox "Cheese"');
+        $this->assertTrue($server->createMailBox('Cheese'), 'createMailbox returns true.');
+        $this->assertTrue($server->hasMailBox('Cheese'), 'Mailbox "Cheese" was created');
+    }
+
+    public function testDeleteMailbox()
+    {
+        $server = static::getServer();
+        $this->assertTrue($server->hasMailBox('Cheese'), 'Does have mailbox "Cheese"');
+        $this->assertTrue($server->deleteMailBox('Cheese'), 'deleteMailBox returns true.');
+        $this->assertFalse($server->hasMailBox('Cheese'), 'Mailbox "Cheese" was deleted');
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     */
+    public function testSetOptionsException()
+    {
+        $server = static::getServer();
+        $server->setOptions('purple');
+    }
+
+    public function testSetOptions()
+    {
+        $server = static::getServer();
+        $server->setOptions(5);
+        $this->assertAttributeEquals(5, 'options', $server);
+    }
+
+    public function testExpunge()
+    {
+        $server = static::getServer();
+        $message = $server->getMessageByUid(12);
+
+        $this->assertInstanceOf('\Fetch\Message', $message, 'Message exists');
+
+        $message->delete();
+
+        $this->assertInstanceOf('\Fetch\Message', $server->getMessageByUid(12), 'Message still present after being deleted but before being expunged.');
+
+        $server->expunge();
+
+        $this->assertFalse($server->getMessageByUid(12), 'Message successfully expunged');
+    }
+
+    public static function getServer()
+    {
+        $server = new Server(TESTING_SERVER_HOST, 143);
+        $server->setAuthentication(TEST_USER, TEST_PASSWORD);
+
+        return $server;
+    }
+}
diff --git a/Resources/Private/Php/Fetch/tests/bootstrap.php b/Resources/Private/Php/Fetch/tests/bootstrap.php
new file mode 100644
index 000000000..c656c67fc
--- /dev/null
+++ b/Resources/Private/Php/Fetch/tests/bootstrap.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Fetch library.
+ *
+ * (c) Robert Hafner <tedivm@tedivm.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+error_reporting(-1);
+
+define('TESTING', true);
+define('TEST_USER', 'testuser');
+define('TEST_PASSWORD', 'applesauce');
+
+date_default_timezone_set('UTC');
+
+if (getenv('TRAVIS')) {
+    define('TESTING_ENVIRONMENT', 'TRAVIS');
+    define('TESTING_SERVER_HOST', '127.0.0.1');
+} else {
+    define('TESTING_ENVIRONMENT', 'VAGRANT');
+    define('TESTING_SERVER_HOST', '172.31.1.2');
+}
+
+$filename = __DIR__ .'/../vendor/autoload.php';
+
+if (!file_exists($filename)) {
+    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" . PHP_EOL;
+    echo " You need to execute `composer install` before running the tests. " . PHP_EOL;
+    echo "         Vendors are required for complete test execution.        " . PHP_EOL;
+    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" . PHP_EOL . PHP_EOL;
+    $filename = __DIR__ .'/../autoload.php';
+    require_once $filename;
+} else {
+    $loader = require $filename;
+    $loader->add('Fetch\\Test', __DIR__);
+}
diff --git a/Resources/Private/Php/Fetch/tests/runTests.sh b/Resources/Private/Php/Fetch/tests/runTests.sh
new file mode 100755
index 000000000..0547fd730
--- /dev/null
+++ b/Resources/Private/Php/Fetch/tests/runTests.sh
@@ -0,0 +1,17 @@
+#/usr/bin/env/sh
+set -e
+
+if [ ! -n "$TRAVIS" ]; then
+   ./vendor/tedivm/dovecottesting/SetupEnvironment.sh
+   sleep 5
+fi
+
+echo 'Running unit tests.'
+./vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml
+
+echo ''
+echo ''
+echo ''
+echo 'Testing for Coding Styling Compliance.'
+echo 'All code should follow PSR standards.'
+./vendor/bin/php-cs-fixer fix ./ --level="all" -vv --dry-run
\ No newline at end of file
diff --git a/res/gfx/attach.gif b/Resources/Public/Icons/attach.gif
similarity index 100%
rename from res/gfx/attach.gif
rename to Resources/Public/Icons/attach.gif
diff --git a/res/gfx/dmail.gif b/Resources/Public/Icons/dmail.gif
similarity index 100%
rename from res/gfx/dmail.gif
rename to Resources/Public/Icons/dmail.gif
diff --git a/res/gfx/dmail_list.gif b/Resources/Public/Icons/dmail_list.gif
similarity index 100%
rename from res/gfx/dmail_list.gif
rename to Resources/Public/Icons/dmail_list.gif
diff --git a/res/gfx/dmailerping.gif b/Resources/Public/Icons/dmailerping.gif
similarity index 100%
rename from res/gfx/dmailerping.gif
rename to Resources/Public/Icons/dmailerping.gif
diff --git a/res/gfx/ext_icon_dmail_folder.gif b/Resources/Public/Icons/ext_icon_dmail_folder.gif
similarity index 100%
rename from res/gfx/ext_icon_dmail_folder.gif
rename to Resources/Public/Icons/ext_icon_dmail_folder.gif
diff --git a/res/gfx/icon_tx_directmail_category.gif b/Resources/Public/Icons/icon_tx_directmail_category.gif
similarity index 100%
rename from res/gfx/icon_tx_directmail_category.gif
rename to Resources/Public/Icons/icon_tx_directmail_category.gif
diff --git a/res/gfx/mail.gif b/Resources/Public/Icons/mail.gif
similarity index 100%
rename from res/gfx/mail.gif
rename to Resources/Public/Icons/mail.gif
diff --git a/res/gfx/mailgroup.gif b/Resources/Public/Icons/mailgroup.gif
similarity index 100%
rename from res/gfx/mailgroup.gif
rename to Resources/Public/Icons/mailgroup.gif
diff --git a/res/gfx/modules_dmail.gif b/Resources/Public/Icons/modules_dmail.gif
similarity index 100%
rename from res/gfx/modules_dmail.gif
rename to Resources/Public/Icons/modules_dmail.gif
diff --git a/res/gfx/modules_dmail__h.gif b/Resources/Public/Icons/modules_dmail__h.gif
similarity index 100%
rename from res/gfx/modules_dmail__h.gif
rename to Resources/Public/Icons/modules_dmail__h.gif
diff --git a/res/gfx/newmail.gif b/Resources/Public/Icons/newmail.gif
similarity index 100%
rename from res/gfx/newmail.gif
rename to Resources/Public/Icons/newmail.gif
diff --git a/res/gfx/preview_html.gif b/Resources/Public/Icons/preview_html.gif
similarity index 100%
rename from res/gfx/preview_html.gif
rename to Resources/Public/Icons/preview_html.gif
diff --git a/res/gfx/preview_txt.gif b/Resources/Public/Icons/preview_txt.gif
similarity index 100%
rename from res/gfx/preview_txt.gif
rename to Resources/Public/Icons/preview_txt.gif
diff --git a/Resources/Public/StyleSheets/modules.css b/Resources/Public/StyleSheets/modules.css
index fecb6ee20..f195da554 100644
--- a/Resources/Public/StyleSheets/modules.css
+++ b/Resources/Public/StyleSheets/modules.css
@@ -41,12 +41,12 @@ div.toggleTitle a img {
 
 .t3-wizard-steps {
 	margin: 0px 10px 0px 0px;
-	padding-left: 30px;
-	padding-right: 30px;
 	float: left;
 	clear: both;
 	line-height: 22px;
 	background-image: none;
+	background-color: #ddd;
+	padding: 5px;
 }
 .t3-wizard-steps span {
 	font-size: 22px;
diff --git a/Tests/Unit/Dmailer/DirectMailEngineTest.php b/Tests/Unit/Dmailer/DirectMailEngineTest.php
index d1a5a7ffc..49d2e23b6 100644
--- a/Tests/Unit/Dmailer/DirectMailEngineTest.php
+++ b/Tests/Unit/Dmailer/DirectMailEngineTest.php
@@ -1,33 +1,26 @@
 <?php
 namespace DirectMailTeam\DirectMail\Tests\Unit\Mailer;
 
-/***************************************************************
- *  Copyright notice
+/*
+ * This file is part of the TYPO3 CMS project.
  *
- *  (c) 2013 Bernhard Kraft <kraft@webconsulting.at>
- *  All rights reserved
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
  *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
  *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
+ * The TYPO3 project - inspiring people to share!
+ */
 
 /**
- * Testcase for class "dmailer"
+ * Testcase for class "DirectMailTeam\DirectMail\Dmailer"
  *
  * @author Bernhard Kraft <kraft@webconsulting.at>
+ *
+ * @package 	TYPO3
+ * @subpackage 	tx_directmail
  */
 class DirectMailEngineTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
@@ -81,7 +74,7 @@ public function extractHyperLinksDataProvider()
                 )
             ),
             'absolute url (fails currently, #54459)' => array('
-				This is a <a name=http://google.com href="http://google.com">simple</a> test',
+				This is a <a title="Browse to http://google.com for more information" href="http://google.com">simple</a> test',
                 'http://www.server.com/',
                 array(
                     array(
diff --git a/cli/cli_direct_mail.php b/cli/cli_direct_mail.php
index d674a8b17..b29fc9dd9 100644
--- a/cli/cli_direct_mail.php
+++ b/cli/cli_direct_mail.php
@@ -13,51 +13,51 @@ class direct_mail_cli extends CommandLineController
     /**
      * Constructor
      */
-        public function direct_mail_cli()
-        {
+    public function direct_mail_cli()
+    {
 
             // Running parent class constructor
-            parent::__construct();
-
-            // Setting help texts:
-            $this->cli_help['name'] = 'direct_mail';
-            $this->cli_help['synopsis'] = '###OPTIONS###';
-            $this->cli_help['description'] = 'Invoke direct_mail e-mail distribution engine';
-            $this->cli_help['examples'] = '/.../cli_dispatch.phpsh direct_mail [masssend]';
-            $this->cli_help['author'] = 'Ivan Kartolo, (c) 2008';
-            $this->cli_options[] = array('masssend', 'Invoke sending of mails!');
-        }
+        parent::__construct();
+
+        // Setting help texts:
+        $this->cli_help['name'] = 'direct_mail';
+        $this->cli_help['synopsis'] = '###OPTIONS###';
+        $this->cli_help['description'] = 'Invoke direct_mail e-mail distribution engine';
+        $this->cli_help['examples'] = '/.../cli_dispatch.phpsh direct_mail [masssend]';
+        $this->cli_help['author'] = 'Ivan Kartolo, (c) 2008';
+        $this->cli_options[] = array('masssend', 'Invoke sending of mails!');
+    }
 
-        /**
-         * CLI engine
-         *
-         * @return    void
-         */
-        public function cli_main()
-        {
+    /**
+     * CLI engine
+     *
+     * @return    void
+     */
+    public function cli_main()
+    {
 
             // get task (function)
-                $task = (string)$this->cli_args['_DEFAULT'][1];
+        $task = (string)$this->cli_args['_DEFAULT'][1];
 
-            if (!$task) {
-                $this->cli_validateArgs();
-                $this->cli_help();
-                exit;
-            }
+        if (!$task) {
+            $this->cli_validateArgs();
+            $this->cli_help();
+            exit;
+        }
 
-            if ($task == 'masssend') {
-                $this->massSend();
-            }
+        if ($task == 'masssend') {
+            $this->massSend();
+        }
 
-                /**
-                 * Or other tasks
-                 * Which task shoud be called can you define in the shell command
-                 * /www/typo3/cli_dispatch.phpsh cli_example otherTask
-                 */
-                if ($task == 'otherTask') {
-                    // ...
-                }
+        /**
+         * Or other tasks
+         * Which task shoud be called can you define in the shell command
+         * /www/typo3/cli_dispatch.phpsh cli_example otherTask
+         */
+        if ($task == 'otherTask') {
+            // ...
         }
+    }
 
     /**
      * Start sending the newsletter
diff --git a/composer.json b/composer.json
index bcd0abb86..35d44f905 100644
--- a/composer.json
+++ b/composer.json
@@ -22,16 +22,25 @@
     "issues": "https://forge.typo3.org/projects/extension-direct_mail"
   },
   "require": {
-    "typo3/cms-core": ">=7.6,<8.0",
-    "typo3-ter/jumpurl": ">=7.6"
+    "typo3/cms-core": ">=7.6,<9.0",
+    "friendsoftypo3/jumpurl": ">=7.6",
+    "friendsoftypo3/tt-address": ">=3.2.2"
   },
   "autoload": {
     "psr-4": {
-      "DirectMailTeam\\DirectMail\\": "Classes"
+      "DirectMailTeam\\DirectMail\\": "Classes",
+      "Fetch\\": "Resources/Private/Php/Fetch/src/Fetch"
     }
   },
   "replace": {
     "direct_mail": "self.version",
-    "typo3-ter/direct_mail": "self.version"
+    "typo3-ter/direct-mail": "self.version"
+  },
+  "extra": {
+    "typo3/class-alias-loader": {
+      "class-alias-maps": [
+        "Migrations/Code/ClassAliasMap.php"
+      ]
+    }
   }
 }
\ No newline at end of file
diff --git a/ext_emconf.php b/ext_emconf.php
index ddb34eab7..9491b240f 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -15,7 +15,7 @@
     'description' => 'Advanced Direct Mail/Newsletter mailer system with sophisticated options for personalization of emails including response statistics.',
     'category' => 'module',
     'shy' => 0,
-    'version' => '5.1.0-dev',
+    'version' => '5.2.3',
     'dependencies' => 'cms,tt_address',
     'conflicts' => 'sr_direct_mail_ext,it_dmail_fix,plugin_mgm,direct_mail_123',
     'priority' => '',
@@ -36,9 +36,9 @@
         'depends' => array(
             'cms' => '',
             'tt_address' => '',
-            'php' => '5.3.0',
-            'typo3' => '7.6.0-7.6.99',
-            'jumpurl' => '7.6.0-7.6.99',
+            'php' => '5.5.0',
+            'typo3' => '7.6.0-8.99.99',
+            'jumpurl' => '7.6.0-7.7.99',
         ),
         'conflicts' => array(
             'sr_direct_mail_ext' => '',
@@ -49,10 +49,13 @@
         'suggests' => array(
         ),
     ),
-    '_md5_values_when_last_written' => 'a:99:{s:9:"ChangeLog";s:4:"c147";s:20:"class.ext_update.php";s:4:"0ab1";s:31:"class.tx_directmail_gabriel.php";s:4:"6de4";s:33:"class.tx_directmail_scheduler.php";s:4:"1a0e";s:16:"ext_autoload.php";s:4:"2e3e";s:21:"ext_conf_template.txt";s:4:"7c49";s:12:"ext_icon.gif";s:4:"a143";s:17:"ext_localconf.php";s:4:"33b2";s:14:"ext_tables.php";s:4:"bc0a";s:14:"ext_tables.sql";s:4:"2388";s:17:"locallang_tca.xml";s:4:"6e8b";s:35:"Classes/Scheduler/MailFromDraft.php";s:4:"4f4c";s:52:"Classes/Scheduler/MailFromDraft_AdditionalFields.php";s:4:"eaa9";s:21:"Configuration/tca.php";s:4:"0000";s:42:"Interfaces/Scheduler/MailFromDraftHook.php";s:4:"938b";s:40:"Resources/Public/StyleSheets/modules.css";s:4:"bf1f";s:23:"cli/cli_direct_mail.php";s:4:"a2b3";s:14:"doc/manual.sxw";s:4:"811a";s:36:"locallang/locallang_csh_sysdmail.xml";s:4:"f4a1";s:39:"locallang/locallang_csh_sysdmailcat.xml";s:4:"a2b1";s:37:"locallang/locallang_csh_sysdmailg.xml";s:4:"0ecd";s:42:"locallang/locallang_csh_txdirectmailM2.xml";s:4:"2fa2";s:42:"locallang/locallang_csh_txdirectmailM3.xml";s:4:"3846";s:42:"locallang/locallang_csh_txdirectmailM4.xml";s:4:"761f";s:42:"locallang/locallang_csh_txdirectmailM5.xml";s:4:"e511";s:42:"locallang/locallang_csh_txdirectmailM6.xml";s:4:"3f6d";s:44:"locallang/locallang_csh_web_txdirectmail.xml";s:4:"1764";s:30:"locallang/locallang_mod2-6.xml";s:4:"d14a";s:14:"mod1/clear.gif";s:4:"cc11";s:13:"mod1/conf.php";s:4:"f25a";s:14:"mod1/index.php";s:4:"4f8b";s:22:"mod1/locallang_mod.xml";s:4:"9b3c";s:17:"mod1/mod_icon.gif";s:4:"a143";s:22:"mod1/mod_template.html";s:4:"65bd";s:34:"mod2/class.tx_directmail_dmail.php";s:4:"5beb";s:13:"mod2/conf.php";s:4:"f24c";s:14:"mod2/index.php";s:4:"6421";s:22:"mod2/locallang_mod.xml";s:4:"6088";s:17:"mod2/mod_icon.gif";s:4:"a143";s:22:"mod2/mod_template.html";s:4:"f729";s:43:"mod3/class.tx_directmail_recipient_list.php";s:4:"7ad3";s:14:"mod3/clear.gif";s:4:"cc11";s:13:"mod3/conf.php";s:4:"ba64";s:14:"mod3/index.php";s:4:"e742";s:22:"mod3/locallang_mod.xml";s:4:"c2ce";s:17:"mod3/mod_icon.gif";s:4:"a143";s:22:"mod3/mod_template.html";s:4:"2581";s:39:"mod4/class.tx_directmail_statistics.php";s:4:"95da";s:14:"mod4/clear.gif";s:4:"cc11";s:13:"mod4/conf.php";s:4:"2c51";s:14:"mod4/index.php";s:4:"e2b7";s:22:"mod4/locallang_mod.xml";s:4:"fc77";s:17:"mod4/mod_icon.gif";s:4:"a143";s:22:"mod4/mod_template.html";s:4:"2581";s:42:"mod5/class.tx_directmail_mailer_engine.php";s:4:"8129";s:14:"mod5/clear.gif";s:4:"cc11";s:13:"mod5/conf.php";s:4:"4ad5";s:14:"mod5/index.php";s:4:"2077";s:22:"mod5/locallang_mod.xml";s:4:"a0d7";s:17:"mod5/mod_icon.gif";s:4:"a143";s:22:"mod5/mod_template.html";s:4:"2581";s:42:"mod6/class.tx_directmail_configuration.php";s:4:"9037";s:14:"mod6/clear.gif";s:4:"cc11";s:13:"mod6/conf.php";s:4:"2862";s:14:"mod6/index.php";s:4:"c58e";s:22:"mod6/locallang_mod.xml";s:4:"87d6";s:17:"mod6/mod_icon.gif";s:4:"a143";s:31:"pi1/class.tx_directmail_pi1.php";s:4:"ef59";s:17:"pi1/locallang.php";s:4:"ff9e";s:17:"pi1/locallang.xml";s:4:"2d6b";s:36:"pi1/tx_directmail_pi1_plaintext.tmpl";s:4:"2027";s:18:"res/gfx/attach.gif";s:4:"5559";s:17:"res/gfx/dmail.gif";s:4:"4d4f";s:22:"res/gfx/dmail_list.gif";s:4:"8d58";s:23:"res/gfx/dmailerping.gif";s:4:"cc11";s:33:"res/gfx/ext_icon_dmail_folder.gif";s:4:"a143";s:39:"res/gfx/icon_tx_directmail_category.gif";s:4:"9398";s:16:"res/gfx/mail.gif";s:4:"4174";s:21:"res/gfx/mailgroup.gif";s:4:"1cc5";s:25:"res/gfx/modules_dmail.gif";s:4:"a143";s:28:"res/gfx/modules_dmail__h.gif";s:4:"040c";s:19:"res/gfx/newmail.gif";s:4:"ffa9";s:24:"res/gfx/preview_html.gif";s:4:"1e65";s:23:"res/gfx/preview_txt.gif";s:4:"4d9a";s:29:"res/scripts/class.dmailer.php";s:4:"4089";s:32:"res/scripts/class.mailselect.php";s:4:"43dd";s:30:"res/scripts/class.readmail.php";s:4:"c526";s:48:"res/scripts/class.tx_directmail_checkjumpurl.php";s:4:"6bf9";s:45:"res/scripts/class.tx_directmail_container.php";s:4:"b13c";s:44:"res/scripts/class.tx_directmail_importer.php";s:4:"6f7e";s:53:"res/scripts/class.tx_directmail_select_categories.php";s:4:"0c1f";s:42:"res/scripts/class.tx_directmail_static.php";s:4:"171f";s:47:"res/scripts/class.tx_directmail_tsparserext.php";s:4:"a5fe";s:52:"res/scripts/class.tx_directmail_ttnews_plaintext.php";s:4:"c28d";s:28:"res/scripts/returnmail.phpsh";s:4:"c0be";s:27:"static/boundaries/setup.txt";s:4:"9409";s:30:"static/plaintext/constants.txt";s:4:"59ce";s:26:"static/plaintext/setup.txt";s:4:"ee48";s:34:"static/tt_news_plaintext/setup.txt";s:4:"1a31";}',
+    '_md5_values_when_last_written' => 'a:99:{s:9:"ChangeLog";s:4:"c147";s:20:"class.ext_update.php";s:4:"0ab1";s:31:"class.tx_directmail_gabriel.php";s:4:"6de4";s:33:"class.tx_directmail_scheduler.php";s:4:"1a0e";s:16:"ext_autoload.php";s:4:"2e3e";s:21:"ext_conf_template.txt";s:4:"7c49";s:12:"ext_icon.gif";s:4:"a143";s:17:"ext_localconf.php";s:4:"33b2";s:14:"ext_tables.php";s:4:"bc0a";s:14:"ext_tables.sql";s:4:"2388";s:17:"locallang_tca.xml";s:4:"6e8b";s:35:"Classes/Scheduler/MailFromDraft.php";s:4:"4f4c";s:52:"Classes/Scheduler/MailFromDraft_AdditionalFields.php";s:4:"eaa9";s:21:"Configuration/tca.php";s:4:"0000";s:42:"Interfaces/Scheduler/MailFromDraftHook.php";s:4:"938b";s:40:"Resources/Public/StyleSheets/modules.css";s:4:"bf1f";s:23:"cli/cli_direct_mail.php";s:4:"a2b3";s:14:"doc/manual.sxw";s:4:"811a";s:36:"locallang/locallang_csh_sysdmail.xml";s:4:"f4a1";s:39:"locallang/locallang_csh_sysdmailcat.xml";s:4:"a2b1";s:37:"locallang/locallang_csh_sysdmailg.xml";s:4:"0ecd";s:42:"locallang/locallang_csh_txdirectmailM2.xml";s:4:"2fa2";s:42:"locallang/locallang_csh_txdirectmailM3.xml";s:4:"3846";s:42:"locallang/locallang_csh_txdirectmailM4.xml";s:4:"761f";s:42:"locallang/locallang_csh_txdirectmailM5.xml";s:4:"e511";s:42:"locallang/locallang_csh_txdirectmailM6.xml";s:4:"3f6d";s:44:"locallang/locallang_csh_web_txdirectmail.xml";s:4:"1764";s:30:"locallang/locallang_mod2-6.xml";s:4:"d14a";s:14:"mod1/clear.gif";s:4:"cc11";s:13:"mod1/conf.php";s:4:"f25a";s:14:"mod1/index.php";s:4:"4f8b";s:22:"mod1/locallang_mod.xml";s:4:"9b3c";s:17:"mod1/mod_icon.gif";s:4:"a143";s:22:"mod1/mod_template.html";s:4:"65bd";s:34:"mod2/class.tx_directmail_dmail.php";s:4:"5beb";s:13:"mod2/conf.php";s:4:"f24c";s:14:"mod2/index.php";s:4:"6421";s:22:"mod2/locallang_mod.xml";s:4:"6088";s:17:"mod2/mod_icon.gif";s:4:"a143";s:22:"mod2/mod_template.html";s:4:"f729";s:43:"mod3/class.tx_directmail_recipient_list.php";s:4:"7ad3";s:14:"mod3/clear.gif";s:4:"cc11";s:13:"mod3/conf.php";s:4:"ba64";s:14:"mod3/index.php";s:4:"e742";s:22:"mod3/locallang_mod.xml";s:4:"c2ce";s:17:"mod3/mod_icon.gif";s:4:"a143";s:22:"mod3/mod_template.html";s:4:"2581";s:39:"mod4/class.tx_directmail_statistics.php";s:4:"95da";s:14:"mod4/clear.gif";s:4:"cc11";s:13:"mod4/conf.php";s:4:"2c51";s:14:"mod4/index.php";s:4:"e2b7";s:22:"mod4/locallang_mod.xml";s:4:"fc77";s:17:"mod4/mod_icon.gif";s:4:"a143";s:22:"mod4/mod_template.html";s:4:"2581";s:42:"mod5/class.tx_directmail_mailer_engine.php";s:4:"8129";s:14:"mod5/clear.gif";s:4:"cc11";s:13:"mod5/conf.php";s:4:"4ad5";s:14:"mod5/index.php";s:4:"2077";s:22:"mod5/locallang_mod.xml";s:4:"a0d7";s:17:"mod5/mod_icon.gif";s:4:"a143";s:22:"mod5/mod_template.html";s:4:"2581";s:42:"mod6/class.tx_directmail_configuration.php";s:4:"9037";s:14:"mod6/clear.gif";s:4:"cc11";s:13:"mod6/conf.php";s:4:"2862";s:14:"mod6/index.php";s:4:"c58e";s:22:"mod6/locallang_mod.xml";s:4:"87d6";s:17:"mod6/mod_icon.gif";s:4:"a143";s:31:"pi1/class.tx_directmail_pi1.php";s:4:"ef59";s:17:"pi1/locallang.php";s:4:"ff9e";s:17:"pi1/locallang.xml";s:4:"2d6b";s:36:"pi1/tx_directmail_pi1_plaintext.tmpl";s:4:"2027";s:33:"Resources/Public/Icons/attach.gif";s:4:"5559";s:32:"Resources/Public/Icons/dmail.gif";s:4:"4d4f";s:37:"Resources/Public/Icons/dmail_list.gif";s:4:"8d58";s:38:"Resources/Public/Icons/dmailerping.gif";s:4:"cc11";s:48:"Resources/Public/Icons/ext_icon_dmail_folder.gif";s:4:"a143";s:54:"Resources/Public/Icons/icon_tx_directmail_category.gif";s:4:"9398";s:31:"Resources/Public/Icons/mail.gif";s:4:"4174";s:36:"Resources/Public/Icons/mailgroup.gif";s:4:"1cc5";s:40:"Resources/Public/Icons/modules_dmail.gif";s:4:"a143";s:43:"Resources/Public/Icons/modules_dmail__h.gif";s:4:"040c";s:34:"Resources/Public/Icons/newmail.gif";s:4:"ffa9";s:39:"Resources/Public/Icons/preview_html.gif";s:4:"1e65";s:38:"Resources/Public/Icons/preview_txt.gif";s:4:"4d9a";s:29:"res/scripts/class.dmailer.php";s:4:"4089";s:32:"res/scripts/class.mailselect.php";s:4:"43dd";s:30:"res/scripts/class.readmail.php";s:4:"c526";s:48:"res/scripts/class.tx_directmail_checkjumpurl.php";s:4:"6bf9";s:45:"res/scripts/class.tx_directmail_container.php";s:4:"b13c";s:44:"res/scripts/class.tx_directmail_importer.php";s:4:"6f7e";s:53:"res/scripts/class.tx_directmail_select_categories.php";s:4:"0c1f";s:42:"res/scripts/class.tx_directmail_static.php";s:4:"171f";s:47:"res/scripts/class.tx_directmail_tsparserext.php";s:4:"a5fe";s:52:"res/scripts/class.tx_directmail_ttnews_plaintext.php";s:4:"c28d";s:28:"res/scripts/returnmail.phpsh";s:4:"c0be";s:27:"static/boundaries/setup.txt";s:4:"9409";s:30:"static/plaintext/constants.txt";s:4:"59ce";s:26:"static/plaintext/setup.txt";s:4:"ee48";s:34:"static/tt_news_plaintext/setup.txt";s:4:"1a31";}',
     'suggests' => array(
     ),
     'autoload' => array(
-        'classmap' => array('Classes')
+        'psr-4' => array(
+            'DirectMailTeam\\DirectMail\\' => 'Classes/',
+            'Fetch\\' => 'Resources/Private/Php/Fetch/src/Fetch/'
+        )
     ),
 );
diff --git a/ext_localconf.php b/ext_localconf.php
index 6acc36581..a75222c8e 100644
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -10,18 +10,18 @@
 
 $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
 $icons = array(
-    'directmail-attachment' => array('source' => 'EXT:direct_mail/res/gfx/attach.gif'),
-    'directmail-dmail' => array('source' => 'EXT:direct_mail/res/gfx/dmail.gif'),
-    'directmail-dmail-list' => array('source' => 'EXT:direct_mail/res/gfx/dmail_list.gif'),
-    'directmail-folder' => array('source' => 'EXT:direct_mail/res/gfx/ext_icon_dmail_folder.gif'),
-    'directmail-category' => array('source' => 'EXT:direct_mail/res/gfx/icon_tx_directmail_category.gif'),
-    'directmail-mail' => array('source' => 'EXT:direct_mail/res/gfx/mail.gif'),
-    'directmail-mailgroup' => array('source' => 'EXT:direct_mail/res/gfx/mailgroup.gif'),
-    'directmail-page-modules-dmail' => array('source' => 'EXT:direct_mail/res/gfx/modules_dmail.gif'),
-    'directmail-page-modules-dmail-inactive' => array('source' => 'EXT:direct_mail/res/gfx/modules_dmail__h.gif'),
-    'directmail-dmail-new' => array('source' => 'EXT:direct_mail/res/gfx/newmail.gif'),
-    'directmail-dmail-preview-html' => array('source' => 'EXT:direct_mail/res/gfx/preview_html.gif'),
-    'directmail-dmail-preview-text' => array('source' => 'EXT:direct_mail/res/gfx/preview_txt.gif'),
+    'directmail-attachment' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/attach.gif'),
+    'directmail-dmail' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/dmail.gif'),
+    'directmail-dmail-list' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/dmail_list.gif'),
+    'directmail-folder' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/ext_icon_dmail_folder.gif'),
+    'directmail-category' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/icon_tx_directmail_category.gif'),
+    'directmail-mail' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/mail.gif'),
+    'directmail-mailgroup' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/mailgroup.gif'),
+    'directmail-page-modules-dmail' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/modules_dmail.gif'),
+    'directmail-page-modules-dmail-inactive' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/modules_dmail__h.gif'),
+    'directmail-dmail-new' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/newmail.gif'),
+    'directmail-dmail-preview-html' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/preview_html.gif'),
+    'directmail-dmail-preview-text' => array('source' => 'EXT:direct_mail/Resources/Public/Icons/preview_txt.gif'),
 );
 
 
@@ -105,6 +105,14 @@
     'additionalFields'    => 'DirectMailTeam\\DirectMail\\Scheduler\\MailFromDraftAdditionalFields'
 );
 
+// bounce mail per scheduler
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['DirectMailTeam\\DirectMail\\Scheduler\\AnalyzeBounceMail'] = array(
+    'extension' => $_EXTKEY,
+    'title' => 'Direct Mail: Analyze bounce mail',
+    'description' => 'This task will get bounce mail from the configured mailbox',
+    'additionalFields' => 'DirectMailTeam\\DirectMail\\Scheduler\\AnalyzeBounceMailAdditionalFields'
+);
+
 
 /**
  * Added CLI
diff --git a/ext_tables.php b/ext_tables.php
index 1701aa5f7..d7e0d90ee 100755
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -6,10 +6,6 @@
 
 $extPath = TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY);
 
-TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'Configuration/TypoScript/boundaries/', 'Direct Mail Content Boundaries');
-TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'Configuration/TypoScript/plaintext/', 'Direct Mail Plain text');
-TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'Configuration/TypoScript/tt_news_plaintext/', 'Direct Mail News Plain text');
-
     // Category field disabled by default in backend forms.
 TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
 	TCEFORM.tt_content.module_sys_dmail_category.disabled = 1
@@ -49,7 +45,11 @@
         $TBE_MODULES = $temp_TBE_MODULES;
     }
 
-    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('DirectMailNavFrame', '', '', '',
+    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+        'DirectMailNavFrame',
+        '',
+        '',
+        '',
         array(
             'routeTarget' => DirectMailTeam\DirectMail\Module\NavFrame::class . '::mainAction',
             'access' => 'group,user',
@@ -63,7 +63,11 @@
         )
     );
 
-    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('DirectMailNavFrame', 'DirectMail', 'bottom', '',
+    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+        'DirectMailNavFrame',
+        'DirectMail',
+        'bottom',
+        '',
         array(
             'routeTarget' => DirectMailTeam\DirectMail\Module\Dmail::class . '::mainAction',
             'access' => 'group,user',
@@ -80,7 +84,11 @@
         )
     );
 
-    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('DirectMailNavFrame', 'RecipientList', 'bottom', '',
+    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+        'DirectMailNavFrame',
+        'RecipientList',
+        'bottom',
+        '',
         array(
             'routeTarget' => DirectMailTeam\DirectMail\Module\RecipientList::class . '::mainAction',
             'access' => 'group,user',
@@ -97,7 +105,11 @@
         )
     );
 
-    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('DirectMailNavFrame', 'Statistics', 'bottom', '',
+    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+        'DirectMailNavFrame',
+        'Statistics',
+        'bottom',
+        '',
         array(
             'routeTarget' => DirectMailTeam\DirectMail\Module\Statistics::class . '::mainAction',
             'access' => 'group,user',
@@ -114,7 +126,11 @@
         )
     );
 
-    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('DirectMailNavFrame', 'MailerEngine', 'bottom', '',
+    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+        'DirectMailNavFrame',
+        'MailerEngine',
+        'bottom',
+        '',
         array(
             'routeTarget' => DirectMailTeam\DirectMail\Module\MailerEngine::class . '::mainAction',
             'access' => 'group,user',
@@ -132,7 +148,11 @@
     );
 
 
-    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('DirectMailNavFrame', 'Configuration', 'bottom', '',
+    TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+        'DirectMailNavFrame',
+        'Configuration',
+        'bottom',
+        '',
         array(
             'routeTarget' => DirectMailTeam\DirectMail\Module\Configuration::class . '::mainAction',
             'access' => 'group,user',
@@ -151,13 +171,10 @@
 }
 
 
-$GLOBALS['TBE_STYLES']['spritemanager']['singleIcons']['tcarecords-pages-contains-dmail'] = TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'res/gfx/ext_icon_dmail_folder.gif';
-if (is_array($GLOBALS['TCA']['pages']['ctrl']['typeicon_classes'])) {
-    $GLOBALS['TCA']['pages']['ctrl']['typeicon_classes']['contains-dmail'] = 'tcarecords-pages-contains-dmail';
-}
+$GLOBALS['TBE_STYLES']['spritemanager']['singleIcons']['tcarecords-pages-contains-dmail'] = TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/ext_icon_dmail_folder.gif';
 
 if (TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExtensionVersion('tt_address')) <= TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger('2.3.5')) {
-    include_once(TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."Configuration/TCA/Overrides/tt_address.php");
+    include_once(TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'Configuration/TCA/Overrides/tt_address.php');
 }
 
 /** @var \TYPO3\CMS\Core\Imaging\IconRegistry $iconRegistry */
@@ -168,17 +185,17 @@
 $iconRegistry->registerIcon(
     'direct_mail_newmail',
     \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-    ['source' => 'EXT:' . $_EXTKEY . '/res/gfx/newmail.gif']
+    ['source' => 'EXT:' . $_EXTKEY . '/Resources/Public/Icons/newmail.gif']
 );
 
 $iconRegistry->registerIcon(
     'direct_mail_preview_html',
     \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-    ['source' => 'EXT:' . $_EXTKEY . '/res/gfx/preview_html.gif']
+    ['source' => 'EXT:' . $_EXTKEY . '/Resources/Public/Icons/preview_html.gif']
 );
 
 $iconRegistry->registerIcon(
     'direct_mail_preview_plain',
     \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-    ['source' => 'EXT:' . $_EXTKEY . '/res/gfx/preview_txt.gif']
-);
\ No newline at end of file
+    ['source' => 'EXT:' . $_EXTKEY . '/Resources/Public/Icons/preview_txt.gif']
+);
diff --git a/ext_tables.sql b/ext_tables.sql
index 05f7180a7..884f82d51 100755
--- a/ext_tables.sql
+++ b/ext_tables.sql
@@ -56,7 +56,7 @@ CREATE TABLE sys_dmail (
   deleted tinyint(4) unsigned DEFAULT '0' NOT NULL,
   type tinyint(4) unsigned DEFAULT '0' NOT NULL,
   page int(11) unsigned DEFAULT '0' NOT NULL,
-  attachment tinyblob NOT NULL,
+  attachment tinyblob NULL,
   subject varchar(120) DEFAULT '' NOT NULL,
   from_email varchar(80) DEFAULT '' NOT NULL,
   from_name varchar(80) DEFAULT '' NOT NULL,
@@ -73,9 +73,9 @@ CREATE TABLE sys_dmail (
   plainParams varchar(80) DEFAULT '' NOT NULL,
   issent tinyint(4) unsigned DEFAULT '0' NOT NULL,
   renderedsize int(11) unsigned DEFAULT '0' NOT NULL,
-  mailContent mediumblob NOT NULL,
+  mailContent mediumblob NULL,
   scheduled int(10) unsigned DEFAULT '0' NOT NULL,
-  query_info mediumblob NOT NULL,
+  query_info mediumblob NULL,
   scheduled_begin int(10) unsigned DEFAULT '0' NOT NULL,
   scheduled_end int(10) unsigned DEFAULT '0' NOT NULL,
   return_path varchar(80) DEFAULT '' NOT NULL,
@@ -100,14 +100,14 @@ CREATE TABLE sys_dmail_group (
   type tinyint(4) unsigned DEFAULT '0' NOT NULL,
   title tinytext NOT NULL,
   description text NOT NULL,
-  query blob NOT NULL,
+  query blob NULL,
   static_list int(11) DEFAULT '0' NOT NULL,
-  list mediumblob NOT NULL,
+  list mediumblob NULL,
   csv tinyint(4) DEFAULT '0' NOT NULL,
-  pages tinyblob NOT NULL,
+  pages tinyblob NULL,
   whichtables tinyint(4) DEFAULT '0' NOT NULL,
   recursive tinyint(4) DEFAULT '0' NOT NULL,
-  mail_groups tinyblob NOT NULL,
+  mail_groups tinyblob NULL,
   select_categories int(11) DEFAULT '0' NOT NULL,
   sys_language_uid int(11) DEFAULT '0' NOT NULL,
   PRIMARY KEY (uid),
@@ -136,13 +136,13 @@ CREATE TABLE sys_dmail_maillog (
   email varchar(255) DEFAULT '' NOT NULL,
   rtbl char(1) DEFAULT '' NOT NULL,
   tstamp int(11) unsigned DEFAULT '0' NOT NULL,
-  url tinyblob NOT NULL,
+  url tinyblob NULL,
   size int(11) unsigned DEFAULT '0' NOT NULL,
   parsetime int(11) unsigned DEFAULT '0' NOT NULL,
   response_type tinyint(4) DEFAULT '0' NOT NULL,
   html_sent tinyint(4) DEFAULT '0' NOT NULL,
   url_id tinyint(4) DEFAULT '0' NOT NULL,
-  return_content mediumblob NOT NULL,
+  return_content mediumblob NULL,
   return_code smallint(6) DEFAULT '0' NOT NULL,
   PRIMARY KEY (uid),
   KEY rid (rid,rtbl,mid,response_type,uid),
diff --git a/res/scripts/returnmail.phpsh b/res/scripts/returnmail.phpsh
deleted file mode 100644
index 48d808139..000000000
--- a/res/scripts/returnmail.phpsh
+++ /dev/null
@@ -1,100 +0,0 @@
-#! /usr/bin/php -q
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 1999-2004 Kasper Skaarhoj (kasperYYYY@typo3.com)
-*  (c) 2004-2006 Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license
-*  from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/**
- * Cron tack for return mails analysis
- *
- * @author	Kasper Skaarhoj <kasperYYYY@typo3.com>
- * @author	Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
- *
- * $Id: returnmail.phpsh 9476 2008-07-18 07:58:42Z ivankartolo $
- *
- */
-
-define('TYPO3_MODE', 'BE');
-define('TYPO3_cliMode', TRUE);
-
-require __DIR__ . '/../../../../../typo3/sysext/core/Classes/Core/CliBootstrap.php';
-\TYPO3\CMS\Core\Core\CliBootstrap::checkEnvironmentOrDie();
-
-require __DIR__ . '/../../../../../typo3/sysext/core/Classes/Core/Bootstrap.php';
-\TYPO3\CMS\Core\Core\Bootstrap::getInstance()
-	->baseSetup('typo3conf/ext/direct_mail/res/scripts/')
-	->loadConfigurationAndInitialize()
-	->loadTypo3LoadedExtAndExtLocalconf(TRUE)
-	->applyAdditionalConfigurationSettings()
-	->initializeTypo3DbGlobal();
-
-// MAIL CONTENT
-$filename = 'php://stdin';
-
-$content = \TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($filename);
-if (trim($content))	{
-	$readMail = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('DirectMailTeam\\DirectMail\\Readmail');
-
-		// Split mail into head and content
-	$mailParts = $readMail->extractMailHeader($content);
-		// Find id
-	$midArr = $readMail->find_XTypo3MID($content);
-	if (!is_array($midArr))	{
-		$midArr = $readMail->find_MIDfromReturnPath($mailParts['to']);
-	}
-
-		// Extract text content
-	$c = trim($readMail->getMessage($mailParts));
-	$cp = $readMail->analyseReturnError($c);
-
-	$res = $TYPO3_DB->exec_SELECTquery(
-		'uid,email',
-		'sys_dmail_maillog',
-		'rid=' . intval($midArr['rid']) . ' AND rtbl="' .
-			$TYPO3_DB->quoteStr($midArr['rtbl'], 'sys_dmail_maillog') . '"' .
-			' AND mid=' . intval($midArr['mid']) . ' AND response_type=0'
-	);
-	if (!$TYPO3_DB->sql_num_rows($res)) {
-		$midArr = array();
-		$cp = $mailParts;
-	} else {
-		$row = $TYPO3_DB->sql_fetch_assoc($res);
-		$midArr['email'] = $row['email'];
-	}
-
-	$insertFields = array(
-		'tstamp' => time(),
-		'response_type' => -127,
-		'mid' => intval($midArr['mid']),
-		'rid' => intval($midArr['rid']),
-		'email' => $midArr['email'],
-		'rtbl' => $midArr['rtbl'],
-		'return_content' => serialize($cp),
-		'return_code' => intval($cp['reason'])
-	);
-	$TYPO3_DB->exec_INSERTquery('sys_dmail_maillog', $insertFields);
-}
-
-?>