diff --git a/Admin/Activate.php b/Admin/Activate.php
index 6b354f1..3d681fc 100644
--- a/Admin/Activate.php
+++ b/Admin/Activate.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Messages\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php
index a9da557..68ba0b3 100644
--- a/Admin/Deactivate.php
+++ b/Admin/Deactivate.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Messages\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index 7d9e039..14b83f3 100644
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Messages\Admin\Install;
 use phpOMS\DataStorage\Database\DatabasePool;
 
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 0905585..543552e 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Messages\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php
index d4b91c6..64c0076 100644
--- a/Admin/Uninstall.php
+++ b/Admin/Uninstall.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Messages\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Admin/Update.php b/Admin/Update.php
index e632996..31b07ab 100644
--- a/Admin/Update.php
+++ b/Admin/Update.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Messages\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
diff --git a/Controller.php b/Controller.php
index 6dc2071..7e53465 100644
--- a/Controller.php
+++ b/Controller.php
@@ -11,7 +11,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 namespace Modules\Messages;
 
 use Modules\Navigation\Models\Navigation;
diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php
index 68f3072..c8f5e66 100644
--- a/Theme/Backend/dashboard.tpl.php
+++ b/Theme/Backend/dashboard.tpl.php
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
         <tfoot>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
-            <?php $count = 0; foreach($unseen as $key => $value) : $count++;
+            <?php $count = 0; foreach ($unseen as $key => $value) : $count++;
             $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
             <tr>
                 <td><span class="check"><input type="checkbox"></span>
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
                 <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml((new \DateTime($value->date))->format('Y-m-d H:i:s')); ?></a>
             <?php endforeach; ?>
 
-                    <?php foreach($seen as $key => $value) : $count++;
+                    <?php foreach ($seen as $key => $value) : $count++;
                     $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
             <tr>
                 <td><span class="check"><input type="checkbox"></span>
@@ -58,7 +58,7 @@ echo $this->getData('nav')->render(); ?>
                 <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml($value->from); ?></a>
                 <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml((new \DateTime($value->date))->format('Y-m-d H:i:s')); ?></a>
                     <?php endforeach; ?>
-            <?php if($count < 1) : ?>
+            <?php if ($count < 1) : ?>
         <tr>
             <td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
         <?php endif; ?>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php
index 5215869..44595e9 100644
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
         <tfoot>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
-        <?php $count = 0; foreach($sent as $key => $value) : $count++;
+        <?php $count = 0; foreach ($sent as $key => $value) : $count++;
         $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
@@ -47,7 +47,7 @@ echo $this->getData('nav')->render(); ?>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml($value->from); ?></a>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml((new \DateTime($value->date))->format('Y-m-d H:i:s')); ?></a>
                 <?php endforeach; ?>
-                <?php if($count < 1) : ?>
+                <?php if ($count < 1) : ?>
         <tr>
             <td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                 <?php endif; ?>
diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php
index 5215869..44595e9 100644
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
         <tfoot>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
-        <?php $count = 0; foreach($sent as $key => $value) : $count++;
+        <?php $count = 0; foreach ($sent as $key => $value) : $count++;
         $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
@@ -47,7 +47,7 @@ echo $this->getData('nav')->render(); ?>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml($value->from); ?></a>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml((new \DateTime($value->date))->format('Y-m-d H:i:s')); ?></a>
                 <?php endforeach; ?>
-                <?php if($count < 1) : ?>
+                <?php if ($count < 1) : ?>
         <tr>
             <td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                 <?php endif; ?>
diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php
index 5215869..44595e9 100644
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
         <tfoot>
         <tr><td colspan="5"><?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['usage'])); ?> / <?= $this->printHtml(\phpOMS\Utils\Converter\File::kilobyteSizeToString($quota['limit'])); ?>
         <tbody>
-        <?php $count = 0; foreach($sent as $key => $value) : $count++;
+        <?php $count = 0; foreach ($sent as $key => $value) : $count++;
         $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/messages/mail/single?{?}&id=' . $value->uid); ?>
         <tr>
             <td><span class="check"><input type="checkbox"></span>
@@ -47,7 +47,7 @@ echo $this->getData('nav')->render(); ?>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml($value->from); ?></a>
             <td><a href="<?= $url; ?>"<?= $this->printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>><?= $this->printHtml((new \DateTime($value->date))->format('Y-m-d H:i:s')); ?></a>
                 <?php endforeach; ?>
-                <?php if($count < 1) : ?>
+                <?php if ($count < 1) : ?>
         <tr>
             <td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
                 <?php endif; ?>
diff --git a/Theme/Backend/message-settings.tpl.php b/Theme/Backend/message-settings.tpl.php
index d6baf28..f84adb2 100644
--- a/Theme/Backend/message-settings.tpl.php
+++ b/Theme/Backend/message-settings.tpl.php
@@ -25,35 +25,35 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td><label for="iInbox"><?= $this->getHtml('Inbox') ?></label>
                 <tr><td><select id="iInbox" name="inbox">
                             <option value=""><?= $this->getHtml('Select') ?>
-                            <?php foreach($boxes as $box) : ?>
+                            <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                             <?php endforeach; ?>
                         </select>
                 <tr><td><label for="iOutbox"><?= $this->getHtml('Outbox') ?></label>
                 <tr><td><select id="iOutbox" name="outbox">
                             <option value=""><?= $this->getHtml('Select') ?>
-                            <?php foreach($boxes as $box) : ?>
+                            <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                                 <?php endforeach; ?>
                         </select>
                 <tr><td><label for="iDraft"><?= $this->getHtml('Draft') ?></label>
                 <tr><td><select id="iDraft" name="draft">
                             <option value=""><?= $this->getHtml('Select') ?>
-                            <?php foreach($boxes as $box) : ?>
+                            <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                                 <?php endforeach; ?>
                         </select>
                 <tr><td><label for="iTrash"><?= $this->getHtml('Trash') ?></label>
                 <tr><td><select id="iTrash" name="trash">
                             <option value=""><?= $this->getHtml('Select') ?>
-                            <?php foreach($boxes as $box) : ?>
+                            <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                                 <?php endforeach; ?>
                         </select>
                 <tr><td><label for="iSpam"><?= $this->getHtml('Spam') ?></label>
                 <tr><td><select id="iSpam" name="spam">
                             <option value=""><?= $this->getHtml('Select') ?>
-                            <?php foreach($boxes as $box) : ?>
+                            <?php foreach ($boxes as $box) : ?>
                             <option value="<?= $this->printHtml($box); ?>"><?= $this->printHtml($box); ?>
                                 <?php endforeach; ?>
                         </select>