diff --git a/app/Notifications/Incident/NewIncidentNotification.php b/app/Notifications/Incident/NewIncidentNotification.php
index 15e4ab53..8ad938bb 100644
--- a/app/Notifications/Incident/NewIncidentNotification.php
+++ b/app/Notifications/Incident/NewIncidentNotification.php
@@ -75,12 +75,16 @@ class NewIncidentNotification extends Notification
 
         return (new MailMessage())
                     ->subject(trans('notifications.incident.new.mail.subject'))
-                    ->greeting(trans('notifications.incident.new.mail.greeting', ['app_name' => Config::get('setting.app_name')]))
-                    ->line($content)
-                    ->action(trans('notifications.incident.new.mail.action'), cachet_route('incident', [$this->incident]))
-                    ->line($this->incident->raw_message)
-                    ->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)]))
-                    ->line(trans('cachet.subscriber.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)]));
+                    ->markdown('notifications.incident.new', [
+                        'incident'               => $this->incident,
+                        'content'                => $content,
+                        'actionText'             => trans('notifications.incident.new.mail.action'),
+                        'actionUrl'              => cachet_route('incident', [$this->incident]),
+                        'unsubscribeText'        => trans('cachet.subscriber.unsubscribe'),
+                        'unsubscribeUrl'         => cachet_route('subscribe.unsubscribe', $notifiable->verify_code),
+                        'manageSubscriptionText' => trans('cachet.subscriber.manage_subscription'),
+                        'manageSubscriptionUrl'  => cachet_route('subscribe.manage', $notifiable->verify_code),
+                    ]);
     }
 
     /**
diff --git a/resources/lang/en/cachet.php b/resources/lang/en/cachet.php
index c1b48d01..ff1cd22b 100644
--- a/resources/lang/en/cachet.php
+++ b/resources/lang/en/cachet.php
@@ -75,10 +75,11 @@ return [
 
     // Subscriber
     'subscriber' => [
-        'subscribe'   => 'Subscribe to get the updates',
-        'unsubscribe' => 'Unsubscribe at :link',
-        'button'      => 'Subscribe',
-        'manage'      => [
+        'subscribe'           => 'Subscribe to get the updates',
+        'unsubscribe'         => 'Unsubscribe',
+        'button'              => 'Subscribe',
+        'manage_subscription' => 'Manage subscription',
+        'manage'              => [
             'no_subscriptions' => 'You\'re currently subscribed to all updates.',
             'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
             'manage_at_link'   => 'Manage your subscriptions at :link',
diff --git a/resources/views/notifications/incident/new.blade.php b/resources/views/notifications/incident/new.blade.php
new file mode 100644
index 00000000..22f4ddcc
--- /dev/null
+++ b/resources/views/notifications/incident/new.blade.php
@@ -0,0 +1,15 @@
+@component('mail::message')
+# {{ trans('notifications.incident.new.mail.greeting', ['app_name' => Config::get('setting.app_name')]) }}
+
+{{ $incident->message }}
+
+@component('mail::button', ['url' => $actionUrl])
+{{ $actionText }}
+@endcomponent
+
+Thanks,<br>
+{{ Config::get('setting.app_name') }}
+
+@include('notifications.partials.subscription')
+
+@endcomponent
diff --git a/resources/views/notifications/partials/subscription.blade.php b/resources/views/notifications/partials/subscription.blade.php
new file mode 100644
index 00000000..6e8ebf3d
--- /dev/null
+++ b/resources/views/notifications/partials/subscription.blade.php
@@ -0,0 +1,3 @@
+@component('mail::subcopy')
+[{{ $unsubscribeText }}]({{ $unsubscribeUrl }}) &mdash; [{{ $manageSubscriptionText }}]({{ $manageSubscriptionUrl }})
+@endcomponent