diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index c867459a..72349851 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -46,4 +46,8 @@ return [
     'submit'           => 'Submit',
     'edit'             => 'Edit',
     'close'            => 'Close',
+    'whoops'           => 'Whoops',
+    'hello'            => 'Hello',
+    'regards'          => 'Regards',
+    'rightsreserved'   => 'All Rights Reserved',
 ];
diff --git a/resources/lang/en/email.php b/resources/lang/en/email.php
new file mode 100644
index 00000000..74e5fc03
--- /dev/null
+++ b/resources/lang/en/email.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ *
+ */
+
+return [
+    'buttontroubles' =>
+        'If you’re having trouble clicking the ":actiontext" button, ' .
+        'copy and paste the URL below into your web browser:',
+];
diff --git a/resources/lang/en/frontend.php b/resources/lang/en/frontend.php
index 64501c3e..4c6e449e 100644
--- a/resources/lang/en/frontend.php
+++ b/resources/lang/en/frontend.php
@@ -6,14 +6,4 @@ return [
         'nodownloads' => 'There are no downloads!',
     ],
 
-    'emails' => [
-        'whoops' => 'Whoops',
-        'hello' => 'Hello',
-        'regards' => 'Regards',
-        'buttontroubles' => [
-            'If you’re having trouble clicking the ":actiontext" button,',
-            'copy and paste the URL below into your web browser:',
-        ],
-        'allrightsreserved' => 'All Rights Reserved',
-    ],
 ];
diff --git a/resources/lang/it/common.php b/resources/lang/it/common.php
index b0df7cca..328c4688 100644
--- a/resources/lang/it/common.php
+++ b/resources/lang/it/common.php
@@ -47,4 +47,8 @@ return [
     'submit'           => 'Invia',
     'edit'             => 'Modifica',
     'close'            => 'Chiudi',
+    'whoops'           => 'Ops',
+    'hello'            => 'Ciao',
+    'regards'          => 'Saluti',
+    'rightsreserved'   => 'Tutti i Diritti Riservati',
 ];
diff --git a/resources/lang/it/email.php b/resources/lang/it/email.php
new file mode 100644
index 00000000..05c3e248
--- /dev/null
+++ b/resources/lang/it/email.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ *
+ */
+
+return [
+    'buttontroubles'    =>
+        'Se hai problemi a cliccare il bottone ":actiontext", ' .
+        'copia e incolla l\'URL qui sotto nel tuo browser:',
+];
diff --git a/resources/lang/it/frontend.php b/resources/lang/it/frontend.php
index cc831c1b..f7b52e85 100644
--- a/resources/lang/it/frontend.php
+++ b/resources/lang/it/frontend.php
@@ -1,21 +1,7 @@
 <?php
 
 return [
-
-    'emails' => [
-        'whoops' => 'Ops',
-        'hello' => 'Ciao',
-        'regards' => 'Saluti',
-        'buttontroubles' => [
-            'Se hai problemi a cliccare il bottone ":actiontext",',
-            'copia e incolla l\'URL qui sotto nel tuo browser:',
-        ],
-        'allrightsreserved' => 'Tutti i Diritti Riservati',
-    ],
-
-
     'downloads' => [
         'nodownloads' => 'Non ci sono downloads!',
     ],
-
 ];
diff --git a/resources/views/layouts/default/notifications/email-plain.blade.php b/resources/views/layouts/default/notifications/email-plain.blade.php
index f3df0403..9ef9dad3 100644
--- a/resources/views/layouts/default/notifications/email-plain.blade.php
+++ b/resources/views/layouts/default/notifications/email-plain.blade.php
@@ -3,7 +3,7 @@
 if (! empty($greeting)) {
     echo $greeting, "\n\n";
 } else {
-    echo $level == 'error' ? trans('frontend.emails.whoops').'!' : trans('frontend.emails.hello').',', "\n\n";
+    echo $level == 'error' ? __('common.whoops').'!' : __('common.hello').',', "\n\n";
 }
 
 if (! empty($introLines)) {
@@ -18,5 +18,5 @@ if (! empty($outroLines)) {
     echo implode("\n", $outroLines), "\n\n";
 }
 
-echo trans('frontend.emails.regards).',', "\n";
+echo __('common.regards).',', "\n";
 echo config('app.name'), "\n";
diff --git a/resources/views/layouts/default/notifications/email.blade.php b/resources/views/layouts/default/notifications/email.blade.php
index 8a19016d..2eec10e8 100644
--- a/resources/views/layouts/default/notifications/email.blade.php
+++ b/resources/views/layouts/default/notifications/email.blade.php
@@ -2,8 +2,8 @@
 <html>
 
 <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 
     <style type="text/css" rel="stylesheet" media="all">
         /* Media Queries */
@@ -20,32 +20,32 @@
 $style = [
     /* Layout ------------------------------ */
 
-    'body' => 'margin: 0; padding: 0; width: 100%; background-color: #F2F4F6;',
+    'body'          => 'margin: 0; padding: 0; width: 100%; background-color: #F2F4F6;',
     'email-wrapper' => 'width: 100%; margin: 0; padding: 0; background-color: #F2F4F6;',
 
     /* Masthead ----------------------- */
 
-    'email-masthead' => 'padding: 25px 0; text-align: center;',
+    'email-masthead'      => 'padding: 25px 0; text-align: center;',
     'email-masthead_name' => 'font-size: 16px; font-weight: bold; color: #2F3133; text-decoration: none; text-shadow: 0 1px 0 white;',
 
-    'email-body' => 'width: 100%; margin: 0; padding: 0; border-top: 1px solid #EDEFF2; border-bottom: 1px solid #EDEFF2; background-color: #FFF;',
+    'email-body'       => 'width: 100%; margin: 0; padding: 0; border-top: 1px solid #EDEFF2; border-bottom: 1px solid #EDEFF2; background-color: #FFF;',
     'email-body_inner' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0;',
-    'email-body_cell' => 'padding: 35px;',
+    'email-body_cell'  => 'padding: 35px;',
 
-    'email-footer' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0; text-align: center;',
+    'email-footer'      => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0; text-align: center;',
     'email-footer_cell' => 'color: #AEAEAE; padding: 35px; text-align: center;',
 
     /* Body ------------------------------ */
 
     'body_action' => 'width: 100%; margin: 30px auto; padding: 0; text-align: center;',
-    'body_sub' => 'margin-top: 25px; padding-top: 25px; border-top: 1px solid #EDEFF2;',
+    'body_sub'    => 'margin-top: 25px; padding-top: 25px; border-top: 1px solid #EDEFF2;',
 
     /* Type ------------------------------ */
 
-    'anchor' => 'color: #3869D4;',
-    'header-1' => 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;',
-    'paragraph' => 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;',
-    'paragraph-sub' => 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em;',
+    'anchor'           => 'color: #3869D4;',
+    'header-1'         => 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;',
+    'paragraph'        => 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;',
+    'paragraph-sub'    => 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em;',
     'paragraph-center' => 'text-align: center;',
 
     /* Buttons ------------------------------ */
@@ -55,135 +55,139 @@ $style = [
                  text-align: center; text-decoration: none; -webkit-text-size-adjust: none;',
 
     'button--green' => 'background-color: #22BC66;',
-    'button--red' => 'background-color: #dc4d2f;',
-    'button--blue' => 'background-color: #3869D4;',
+    'button--red'   => 'background-color: #dc4d2f;',
+    'button--blue'  => 'background-color: #3869D4;',
 ];
 ?>
 
 <?php $fontFamily = 'font-family: Arial, \'Helvetica Neue\', Helvetica, sans-serif;'; ?>
 
 <body style="{{ $style['body'] }}">
-    <table width="100%" cellpadding="0" cellspacing="0">
-        <tr>
-            <td style="{{ $style['email-wrapper'] }}" align="center">
-                <table width="100%" cellpadding="0" cellspacing="0">
-                    <!-- Logo -->
-                    <tr>
-                        <td style="{{ $style['email-masthead'] }}">
-                            <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank">
-                                {{ config('app.name') }}
-                            </a>
-                        </td>
-                    </tr>
+<table width="100%" cellpadding="0" cellspacing="0">
+    <tr>
+        <td style="{{ $style['email-wrapper'] }}" align="center">
+            <table width="100%" cellpadding="0" cellspacing="0">
+                <!-- Logo -->
+                <tr>
+                    <td style="{{ $style['email-masthead'] }}">
+                        <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}"
+                           href="{{ url('/') }}" target="_blank">
+                            {{ config('app.name') }}
+                        </a>
+                    </td>
+                </tr>
 
-                    <!-- Email Body -->
-                    <tr>
-                        <td style="{{ $style['email-body'] }}" width="100%">
-                            <table style="{{ $style['email-body_inner'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td style="{{ $fontFamily }} {{ $style['email-body_cell'] }}">
-                                        <!-- Greeting -->
-                                        <h1 style="{{ $style['header-1'] }}">
-                                            @if ($level == 'error')
-                                                @lang('frontend.emails.whoops')!
-                                            @else
-                                                @lang('frontend.emails.hello'),
-                                            @endif
-                                        </h1>
-
-                                        <!-- Intro -->
-                                        @foreach ($introLines as $line)
-                                            <p style="{{ $style['paragraph'] }}">
-                                                {{ $line }}
-                                            </p>
-                                        @endforeach
-
-                                        <!-- Action Button -->
-                                        @if (isset($actionText))
-                                            <table style="{{ $style['body_action'] }}" align="center" width="100%" cellpadding="0" cellspacing="0">
-                                                <tr>
-                                                    <td align="center">
-                                                        <?php
-                                                            switch ($level) {
-                                                                case 'success':
-                                                                    $actionColor = 'button--green';
-                                                                    break;
-                                                                case 'error':
-                                                                    $actionColor = 'button--red';
-                                                                    break;
-                                                                default:
-                                                                    $actionColor = 'button--blue';
-                                                            }
-                                                        ?>
-
-                                                        <a href="{{ $actionUrl }}"
-                                                            style="{{ $fontFamily }} {{ $style['button'] }} {{ $style[$actionColor] }}"
-                                                            class="button"
-                                                            target="_blank">
-                                                            {{ $actionText }}
-                                                        </a>
-                                                    </td>
-                                                </tr>
-                                            </table>
+                <!-- Email Body -->
+                <tr>
+                    <td style="{{ $style['email-body'] }}" width="100%">
+                        <table style="{{ $style['email-body_inner'] }}" align="center" width="570"
+                               cellpadding="0" cellspacing="0">
+                            <tr>
+                                <td style="{{ $fontFamily }} {{ $style['email-body_cell'] }}">
+                                    <!-- Greeting -->
+                                    <h1 style="{{ $style['header-1'] }}">
+                                        @if ($level === 'error')
+                                            @lang('common.whoops')!
+                                        @else
+                                            @lang('common.hello'),
                                         @endif
+                                    </h1>
 
-                                        <!-- Outro -->
-                                        @foreach ($outroLines as $line)
-                                            <p style="{{ $style['paragraph'] }}">
-                                                {{ $line }}
-                                            </p>
-                                        @endforeach
-
-                                        <!-- Salutation -->
+                                    <!-- Intro -->
+                                    @foreach ($introLines as $line)
                                         <p style="{{ $style['paragraph'] }}">
-                                            @lang('frontend.emails.regards'),<br>{{ config('app.name') }}
+                                            {{ $line }}
                                         </p>
+                                    @endforeach
 
-                                        <!-- Sub Copy -->
-                                        @if (isset($actionText))
-                                            <table style="{{ $style['body_sub'] }}">
-                                                <tr>
-                                                    <td style="{{ $fontFamily }}">
-                                                        <p style="{{ $style['paragraph-sub'] }}">
-															@foreach(trans('frontend.emails.buttontroubles' as $line)
-																{{ str_replace(':actiontext', $actionText, $line) }}
-															@endforeach
-                                                        </p>
+                                <!-- Action Button -->
+                                    @if (isset($actionText))
+                                        <table style="{{ $style['body_action'] }}" align="center"
+                                               width="100%" cellpadding="0" cellspacing="0">
+                                            <tr>
+                                                <td align="center">
+                                                    <?php
+                                                    switch ($level) {
+                                                        case 'success':
+                                                            $actionColor = 'button--green';
+                                                            break;
+                                                        case 'error':
+                                                            $actionColor = 'button--red';
+                                                            break;
+                                                        default:
+                                                            $actionColor = 'button--blue';
+                                                    }
+                                                    ?>
 
-                                                        <p style="{{ $style['paragraph-sub'] }}">
-                                                            <a style="{{ $style['anchor'] }}" href="{{ $actionUrl }}" target="_blank">
-                                                                {{ $actionUrl }}
-                                                            </a>
-                                                        </p>
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        @endif
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
+                                                    <a href="{{ $actionUrl }}"
+                                                       style="{{ $fontFamily }} {{ $style['button'] }} {{ $style[$actionColor] }}"
+                                                       class="button"
+                                                       target="_blank">
+                                                        {{ $actionText }}
+                                                    </a>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    @endif
 
-                    <!-- Footer -->
-                    <tr>
-                        <td>
-                            <table style="{{ $style['email-footer'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
-                                        <p style="{{ $style['paragraph-sub'] }}">
-                                            &copy; {{ date('Y') }}
-                                            <a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ config('app.name') }}</a>.
-                                            @lang(frontend.emails.allrightsreserved')
+                                <!-- Outro -->
+                                    @foreach ($outroLines as $line)
+                                        <p style="{{ $style['paragraph'] }}">
+                                            {{ $line }}
                                         </p>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
-    </table>
+                                    @endforeach
+
+                                <!-- Salutation -->
+                                    <p style="{{ $style['paragraph'] }}">
+                                        @lang('common.regards')
+                                        ,<br>{{ config('app.name') }}
+                                    </p>
+
+                                    <!-- Sub Copy -->
+                                    @if (isset($actionText))
+                                        <table style="{{ $style['body_sub'] }}">
+                                            <tr>
+                                                <td style="{{ $fontFamily }}">
+                                                    <p style="{{ $style['paragraph-sub'] }}">
+                                                        @lang('email.buttontroubles')
+                                                    </p>
+                                                    <p style="{{ $style['paragraph-sub'] }}">
+                                                        <a style="{{ $style['anchor'] }}"
+                                                           href="{{ $actionUrl }}" target="_blank">
+                                                            {{ $actionUrl }}
+                                                        </a>
+                                                    </p>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    @endif
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <!-- Footer -->
+                <tr>
+                    <td>
+                        <table style="{{ $style['email-footer'] }}" align="center" width="570"
+                               cellpadding="0" cellspacing="0">
+                            <tr>
+                                <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
+                                    <p style="{{ $style['paragraph-sub'] }}">
+                                        &copy; {{ date('Y') }}
+                                        <a style="{{ $style['anchor'] }}" href="{{ url('/') }}"
+                                           target="_blank">{{ config('app.name') }}</a>.
+                                        @lang('common.rightsreserved')
+                                    </p>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
 </body>
 </html>