diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 23b122d..5b958f5 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -13,37 +13,37 @@
 declare(strict_types=1);
 
 return ['Messages' => [
-    'All'           => 'All',
-    'AverageAmount' => 'Avg. Amount',
-    'BCC'           => 'BCC',
-    'CC'            => 'CC',
-    'Channels'      => 'Channels',
-    'Chat'          => 'Chat',
-    'Date'          => 'Date',
-    'Delete'        => 'Delete',
-    'Draft'         => 'Draft',
-    'Email'         => 'Email',
-    'From'          => 'From',
-    'Inbox'         => 'Inbox',
-    'Interval'      => 'Interval',
-    'Mailboxes'     => 'Mailboxes',
-    'Messages'      => 'Messages',
+    'All'               => 'All',
+    'AverageAmount'     => 'Avg. Amount',
+    'BCC'               => 'BCC',
+    'CC'                => 'CC',
+    'Channels'          => 'Channels',
+    'Chat'              => 'Chat',
+    'Date'              => 'Date',
+    'Delete'            => 'Delete',
+    'Draft'             => 'Draft',
+    'Email'             => 'Email',
+    'From'              => 'From',
+    'Inbox'             => 'Inbox',
+    'Interval'          => 'Interval',
+    'Mailboxes'         => 'Mailboxes',
+    'Messages'          => 'Messages',
     'Templates'         => 'Templates',
-    'Month'         => 'Month',
-    'New'           => 'New',
-    'Outbox'        => 'Outbox',
-    'Received'      => 'Received',
-    'Save'          => 'Save',
-    'Select'        => 'Select',
-    'Sent'          => 'Sent',
-    'Spam'          => 'Spam',
-    'Statistics'    => 'Statistics',
-    'Status'        => 'Status',
-    'Subject'       => 'Subject',
-    'Tag'           => 'Tag',
-    'To'            => 'To',
-    'Today'         => 'Today',
-    'Trash'         => 'Trash',
-    'Week'          => 'Week',
-    'Year'          => 'Year',
+    'Month'             => 'Month',
+    'New'               => 'New',
+    'Outbox'            => 'Outbox',
+    'Received'          => 'Received',
+    'Save'              => 'Save',
+    'Select'            => 'Select',
+    'Sent'              => 'Sent',
+    'Spam'              => 'Spam',
+    'Statistics'        => 'Statistics',
+    'Status'            => 'Status',
+    'Subject'           => 'Subject',
+    'Tag'               => 'Tag',
+    'To'                => 'To',
+    'Today'             => 'Today',
+    'Trash'             => 'Trash',
+    'Week'              => 'Week',
+    'Year'              => 'Year',
 ]];
diff --git a/Theme/Backend/mail-template.tpl.php b/Theme/Backend/mail-template.tpl.php
index d0fc2d9..61f9086 100644
--- a/Theme/Backend/mail-template.tpl.php
+++ b/Theme/Backend/mail-template.tpl.php
@@ -13,7 +13,6 @@
 declare(strict_types=1);
 
 use phpOMS\Localization\ISO639Enum;
-use phpOMS\Uri\UriFactory;
 use phpOMS\Utils\Formatter\HtmlFormatter;
 
 $mail = $this->data['template'];
diff --git a/Theme/Backend/mail-templates.tpl.php b/Theme/Backend/mail-templates.tpl.php
index 3df292e..60015e9 100755
--- a/Theme/Backend/mail-templates.tpl.php
+++ b/Theme/Backend/mail-templates.tpl.php
@@ -43,7 +43,7 @@ echo $this->data['nav']->render(); ?>
             <?php $count = 0;
                 foreach ($messages as $key => $value) : ++$count;
                 $url = UriFactory::build('{/base}/messages/template/single?{?}&id=' . $value->id); ?>
-                <tr data-href="<?= $url ?>">
+                <tr data-href="<?= $url; ?>">
                     <td><span class="check"><input type="checkbox" name=""></span>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml(empty($value->subject) ? $value->getL11nByLanguage($this->response->header->l11n->language)->subject : $value->subject); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a>