diff --git a/app/Http/Controllers/Dashboard/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php
index aeb6cabc14ef..7f3288855018 100644
--- a/app/Http/Controllers/Dashboard/SettingsController.php
+++ b/app/Http/Controllers/Dashboard/SettingsController.php
@@ -333,6 +333,17 @@ public function postMail()
 
         execute(new UpdateConfigCommand($config));
 
+        $setting = app(Repository::class);
+        $parameters = Binput::get('setting');
+
+        if (isset($parameters['mail_signature'])) {
+            if ($mail_signature = Binput::get('setting.mail_signature', null, false, false)) {
+                $setting->set('mail_signature', $mail_signature);
+            } else {
+                $setting->delete('mail_signature');
+            }
+        }
+
         return cachet_redirect('dashboard.settings.mail')
             ->withInput(Binput::all())
             ->withSuccess(trans('dashboard.notifications.awesome'));
diff --git a/resources/lang/de-DE/dashboard.php b/resources/lang/de-DE/dashboard.php
index d6659dc827da..f5bc946550b6 100644
--- a/resources/lang/de-DE/dashboard.php
+++ b/resources/lang/de-DE/dashboard.php
@@ -233,6 +233,7 @@
                 'subject' => 'Test-Benachrichtigung von Cachet',
                 'body'    => 'Dies ist eine Test-Benachrichtigung von Cachet.',
             ],
+            'signature'      => 'Benutzerdefinierte HTML E-Mail Signatur',
         ],
         'security' => [
             'security'   => 'Sicherheit',
diff --git a/resources/lang/en/dashboard.php b/resources/lang/en/dashboard.php
index 2af0d6073aea..a72689a5a623 100644
--- a/resources/lang/en/dashboard.php
+++ b/resources/lang/en/dashboard.php
@@ -233,6 +233,7 @@
                 'subject' => 'Test notification from Cachet',
                 'body'    => 'This is a test notification from Cachet.',
             ],
+            'signature'      => 'Custom HTML E-Mail Signature',
         ],
         'security' => [
             'security'   => 'Security',
diff --git a/resources/views/dashboard/settings/mail.blade.php b/resources/views/dashboard/settings/mail.blade.php
index 133ecb038aa6..1a9f0de0e488 100644
--- a/resources/views/dashboard/settings/mail.blade.php
+++ b/resources/views/dashboard/settings/mail.blade.php
@@ -40,6 +40,10 @@
                             <label>{{ trans('forms.setup.mail_password') }}</label>
                             <input type="password" class="form-control" name="config[mail_password]" value="{{ Binput::old('config.mail_password') }}" autocomplete="off" placeholder="{{ trans('forms.setup.mail_password') }}">
                         </div>
+                        <div class="form-group">
+                            <label>{{ trans('dashboard.settings.mail.signature') }}</label>
+                            <textarea name="setting[mail_signature]" class="form-control" rows="10" placeholder="{{ trans('dashboard.settings.mail.signature') }}">{{ Config::get('setting.mail_signature') }}</textarea>
+                        </div>
                     </fieldset>
 
                     <div class="row">
diff --git a/resources/views/notifications/incident/new.blade.php b/resources/views/notifications/incident/new.blade.php
index 7dbcad641375..f76b56a9886e 100644
--- a/resources/views/notifications/incident/new.blade.php
+++ b/resources/views/notifications/incident/new.blade.php
@@ -10,6 +10,7 @@
 @lang('Thanks,')<br>
 {{ Config::get('setting.app_name') }}
 
+{!! Config::get('setting.mail_signature') !!}
 @include('notifications.partials.subscription')
 
 @endcomponent
diff --git a/resources/views/notifications/partials/subscription.blade.php b/resources/views/notifications/partials/subscription.blade.php
index 6e8ebf3d3574..89ec227d1efb 100644
--- a/resources/views/notifications/partials/subscription.blade.php
+++ b/resources/views/notifications/partials/subscription.blade.php
@@ -1,3 +1,5 @@
+{!! Config::get('setting.mail_signature') !!}
+
 @component('mail::subcopy')
 [{{ $unsubscribeText }}]({{ $unsubscribeUrl }}) &mdash; [{{ $manageSubscriptionText }}]({{ $manageSubscriptionUrl }})
 @endcomponent
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index fd55d94881e8..20b385e9954f 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -46,6 +46,8 @@
 @lang('Regards'),<br>{{ setting('app_name', config('app.name')) }}
 @endif
 
+{!! Config::get('setting.mail_signature') !!}
+
 {{-- Subcopy --}}
 @isset($actionText)
 @component('mail::subcopy')