diff --git a/app/Events/QuoteInvitationWasApproved.php b/app/Events/QuoteInvitationWasApproved.php
index 954aa83b4cf2..5e69fe9c7895 100644
--- a/app/Events/QuoteInvitationWasApproved.php
+++ b/app/Events/QuoteInvitationWasApproved.php
@@ -9,6 +9,7 @@ class QuoteInvitationWasApproved extends Event {
 	use SerializesModels;
 
     public $quote;
+    public $invoice;
     public $invitation;
     
 	/**
@@ -16,9 +17,10 @@ class QuoteInvitationWasApproved extends Event {
 	 *
 	 * @return void
 	 */
-    public function __construct($quote, $invitation)
+    public function __construct($quote, $invoice, $invitation)
     {
         $this->quote = $quote;
+        $this->invoice = $invoice;
         $this->invitation = $invitation;
     }
 
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index c95b41101935..bf730af09e93 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -34,7 +34,6 @@ class StartupCheck
 
         // Ensure all request are over HTTPS in production
         if (Utils::requireHTTPS() && !Request::secure()) {
-            //return Redirect::secure(Request::getRequestUri());
             return Redirect::secure(Request::path());
         }
 
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 71989afbd866..7c8fd031fa30 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -445,7 +445,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('PHANTOMJS_CLOUD', 'http://api.phantomjscloud.com/api/browser/v2/');
     define('PHP_DATE_FORMATS', 'http://php.net/manual/en/function.date.php');
     define('REFERRAL_PROGRAM_URL', 'https://www.invoiceninja.com/referral-program/');
-    define('EMAIL_MARKUP_URL', 'https://developers.google.com/gmail/markup/overview');
+    define('EMAIL_MARKUP_URL', 'https://developers.google.com/gmail/markup');
 
     define('COUNT_FREE_DESIGNS', 4);
     define('COUNT_FREE_DESIGNS_SELF_HOST', 5); // include the custom design
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index e097ce447705..9e10021ab874 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -313,6 +313,15 @@ class Invoice extends EntityModel implements BalanceAffecting
         return $this->invoice_status_id >= INVOICE_STATUS_PAID;
     }
 
+    public function isOverdue()
+    {
+        if ( ! $this->due_date) {
+            return false;
+        }
+
+        return time() > strtotime($this->due_date);
+    }
+
     public function getRequestedAmount()
     {
         return $this->partial > 0 ? $this->partial : $this->balance;
diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index 1d955935644b..36dcc6fb6cf6 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -172,7 +172,12 @@ class ContactMailer extends Mailer
 
         $data = [
             'body' => $this->processVariables($emailTemplate, $variables),
+            'link' => $invitation->getLink(),
+            'invoice' => $invoice,
+            'client' => $client,
             'account' => $account,
+            'payment' => $payment,
+            'entityType' => ENTITY_INVOICE,
         ];
 
         if ($account->attatchPDF()) {
diff --git a/app/Ninja/Mailers/UserMailer.php b/app/Ninja/Mailers/UserMailer.php
index 21e8b0528631..ce0c5383410d 100644
--- a/app/Ninja/Mailers/UserMailer.php
+++ b/app/Ninja/Mailers/UserMailer.php
@@ -53,6 +53,7 @@ class UserMailer extends Mailer
             'invoiceAmount' => $account->formatMoney($invoice->getRequestedAmount(), $client),
             'invoiceNumber' => $invoice->invoice_number,
             'invoiceLink' => SITE_URL."/{$entityType}s/{$invoice->public_id}",
+            'account' => $account,
         ];
 
         if ($payment) {
@@ -70,6 +71,7 @@ class UserMailer extends Mailer
     public function sendEmailBounced(Invitation $invitation)
     {
         $user = $invitation->user;
+        $account = $user->account;
         $invoice = $invitation->invoice;
         $entityType = $invoice->getEntityType();
 
diff --git a/app/Ninja/Presenters/InvoicePresenter.php b/app/Ninja/Presenters/InvoicePresenter.php
index 73a248355441..fb292a8859b9 100644
--- a/app/Ninja/Presenters/InvoicePresenter.php
+++ b/app/Ninja/Presenters/InvoicePresenter.php
@@ -26,6 +26,18 @@ class InvoicePresenter extends Presenter {
         }
     }
 
+    // https://schema.org/PaymentStatusType
+    public function paymentStatus()
+    {
+        if ( ! $this->entity->balance) {
+            return 'PaymentComplete';
+        } elseif ($this->entity->isOverdue()) {
+            return 'PaymentPastDue';
+        } else {
+            return 'PaymentDue';
+        }
+    }
+
     public function status()
     {
         $status = $this->entity->invoice_status ? $this->entity->invoice_status->name : 'draft';
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index d1e4f3914d45..2142588ec99a 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -627,6 +627,8 @@ class InvoiceRepository extends BaseRepository
 
         if ($recurInvoice->auto_bill) {
             if ($this->paymentService->autoBillInvoice($invoice)) {
+                // update the invoice reference to match its actual state
+                // this is to ensure a 'payment received' email is sent
                 $invoice->invoice_status_id = INVOICE_STATUS_PAID;
             }
         }
diff --git a/app/Services/InvoiceService.php b/app/Services/InvoiceService.php
index d2f73f58f65c..664180e5a95f 100644
--- a/app/Services/InvoiceService.php
+++ b/app/Services/InvoiceService.php
@@ -74,7 +74,7 @@ class InvoiceService extends BaseService
             return $invoice;
         }
 
-        event(new QuoteInvitationWasApproved($invoice, $invitation));
+        event(new QuoteInvitationWasApproved($quote, $invoice, $invitation));
 
         foreach ($invoice->invitations as $invoiceInvitation) {
             if ($invitation->contact_id == $invoiceInvitation->contact_id) {
diff --git a/resources/views/accounts/email_settings.blade.php b/resources/views/accounts/email_settings.blade.php
index 2bc11b45bb15..01269a4bb808 100644
--- a/resources/views/accounts/email_settings.blade.php
+++ b/resources/views/accounts/email_settings.blade.php
@@ -15,9 +15,20 @@
         </div>
         <div class="panel-body form-padding-right">
             {!! Former::checkbox('pdf_email_attachment')->text(trans('texts.enable')) !!}
+            
             &nbsp;
+            
             {{-- Former::select('recurring_hour')->options($recurringHours) --}}
+            
+            {!! Former::select('email_design_id')
+                        ->style('width: 200px')
+                        ->addOption(trans('texts.plain'), 1)
+                        ->addOption(trans('texts.light'), 2)
+                        ->addOption(trans('texts.dark'), 3)
+                        ->help(trans('texts.email_design_help')) !!}
 
+            &nbsp;
+            
             {!! Former::inline_radios('custom_invoice_link')
                     ->onchange('onCustomLinkChange()')
                     ->label(trans('texts.invoice_link'))
@@ -26,7 +37,7 @@
                         trans('texts.website') => ['value' => 'website', 'name' => 'custom_link'],
                     ])->check($account->iframe_url ? 'website' : 'subdomain') !!}
             {{ Former::setOption('capitalize_translations', false) }}
-
+            
             {!! Former::text('subdomain')
                         ->placeholder(trans('texts.www'))
                         ->onchange('onSubdomainChange()')
@@ -41,13 +52,6 @@
                         ->label(' ')
                         ->help(trans('texts.subdomain_help')) !!}
             &nbsp;
-            {!! Former::select('email_design_id')
-                        ->style('width: 200px')
-                        ->addOption(trans('texts.plain'), 1)
-                        ->addOption(trans('texts.light'), 2)
-                        ->addOption(trans('texts.dark'), 3)
-                        ->help(trans('texts.email_design_help')) !!}
-            &nbsp;
             @if (Utils::isNinja())
                 {!! Former::checkbox('enable_email_markup')
                         ->text(trans('texts.enable') . 
diff --git a/resources/views/emails/email_bounced_html.blade.php b/resources/views/emails/email_bounced_html.blade.php
index b80c35dbf748..81dbbebf0909 100644
--- a/resources/views/emails/email_bounced_html.blade.php
+++ b/resources/views/emails/email_bounced_html.blade.php
@@ -4,9 +4,6 @@
   <meta charset="utf-8">
 </head>
 <body>
-  @if (false)
-    @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
-  @endif
   {{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
 
   {{ trans("texts.notification_{$entityType}_bounced", ['contact' => $contactName, 'invoice' => $invoiceNumber]) }} <p/>  
diff --git a/resources/views/emails/invoice_html.blade.php b/resources/views/emails/invoice_html.blade.php
index 86a799dc1da7..762726e95d81 100644
--- a/resources/views/emails/invoice_html.blade.php
+++ b/resources/views/emails/invoice_html.blade.php
@@ -5,7 +5,7 @@
 </head>
 <body>
     @if ($account->enable_email_markup)
-        @include('emails.view_action', ['link' => $link, 'entityType' => $entityType])
+        @include('emails.partials.client_view_action')
     @endif
     {!! $body !!}
 </body>
diff --git a/resources/views/emails/invoice_paid_html.blade.php b/resources/views/emails/invoice_paid_html.blade.php
index 07e478b0338d..98fdce5b637d 100644
--- a/resources/views/emails/invoice_paid_html.blade.php
+++ b/resources/views/emails/invoice_paid_html.blade.php
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
 </head>
 <body>
-  @if (false)
-    @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @if ($account->enable_email_markup)
+    @include('emails.partials.user_view_action')
   @endif
   {{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
 
diff --git a/resources/views/emails/invoice_sent_html.blade.php b/resources/views/emails/invoice_sent_html.blade.php
index 3426820e1db3..420f4260aa1a 100644
--- a/resources/views/emails/invoice_sent_html.blade.php
+++ b/resources/views/emails/invoice_sent_html.blade.php
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
 </head>
 <body>
-  @if (false)
-    @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @if ($account->enable_email_markup)
+    @include('emails.partials.user_view_action')
   @endif
   {{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
 
diff --git a/resources/views/emails/invoice_viewed_html.blade.php b/resources/views/emails/invoice_viewed_html.blade.php
index 60fd6faaae65..e38a63550019 100644
--- a/resources/views/emails/invoice_viewed_html.blade.php
+++ b/resources/views/emails/invoice_viewed_html.blade.php
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
 </head>
 <body>
-  @if (false)
-    @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @if ($account->enable_email_markup)
+    @include('emails.partials.user_view_action')
   @endif
   {{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
 
diff --git a/resources/views/emails/master.blade.php b/resources/views/emails/master.blade.php
index f12bf04c963b..77da4142311e 100644
--- a/resources/views/emails/master.blade.php
+++ b/resources/views/emails/master.blade.php
@@ -7,7 +7,7 @@
 <body style="min-height: 700px; color: #000000; font-family: Arial, Helvetica, sans-serif; font-size: 12px; -webkit-text-size-adjust: none; -ms-text-size-adjust: none; background: #F4F5F5; margin: 0; padding: 0;" 
     alink="#FF0000" link="#FF0000" bgcolor="#F4F5F5" text="#000000" yahoo="fix">
     @if ($account->enable_email_markup)
-        @include('emails.view_action', ['link' => $link, 'entityType' => $entityType])
+        @include('emails.partials.client_view_action')
     @endif
 
     <style type="text/css">
diff --git a/resources/views/emails/view_action.blade.php b/resources/views/emails/partials/client_view_action.blade.php
similarity index 81%
rename from resources/views/emails/view_action.blade.php
rename to resources/views/emails/partials/client_view_action.blade.php
index 30a3025ce56c..c2b00faf19c7 100644
--- a/resources/views/emails/view_action.blade.php
+++ b/resources/views/emails/partials/client_view_action.blade.php
@@ -4,7 +4,7 @@
 {
   "@context": "http://schema.org",
   "@type": "Invoice",
-  "paymentStatus": "PaymentDue",
+  "paymentStatus": "{{ $invoice->present()->paymentStatus }}",
   @if ($invoice->due_date)
   "paymentDue": "{{ $invoice->due_date }}T00:00:00+00:00",
   @endif
@@ -19,7 +19,7 @@
   },
   "totalPaymentDue": {
     "@type": "PriceSpecification",
-    "price": "{{ $account->formatMoney($invoice->getRequestedAmount(), $client) }}"
+    "price": "{{ $account->formatMoney(isset($payment) ? $payment->amount : $invoice->getRequestedAmount(), $client) }}"
   },
   "action": {
     "@type": "ViewAction",
diff --git a/resources/views/emails/partials/user_view_action.blade.php b/resources/views/emails/partials/user_view_action.blade.php
new file mode 100644
index 000000000000..1338ebee5292
--- /dev/null
+++ b/resources/views/emails/partials/user_view_action.blade.php
@@ -0,0 +1,13 @@
+<script type="application/ld+json">
+[
+{
+  "@context": "http://schema.org",
+  "@type": "EmailMessage",
+  "action": {
+    "@type": "ViewAction",
+    "url": "{!! $invoiceLink !!}",
+    "name": "{{ trans("texts.view_{$entityType}") }}"
+  }
+}
+]
+</script>
\ No newline at end of file
diff --git a/resources/views/emails/payment_confirmation_html.blade.php b/resources/views/emails/payment_confirmation_html.blade.php
index 7e944a2f39fb..87af7aada2c1 100644
--- a/resources/views/emails/payment_confirmation_html.blade.php
+++ b/resources/views/emails/payment_confirmation_html.blade.php
@@ -3,5 +3,10 @@
 <head>
   <meta charset="utf-8">
 </head>
-<body>{!! $body !!}</body>
+<body>
+    @if ($account->enable_email_markup)
+        @include('emails.partials.client_view_action', ['link' => $link])
+    @endif
+    {!! $body !!}
+</body>
 </html>
diff --git a/resources/views/emails/quote_approved_html.blade.php b/resources/views/emails/quote_approved_html.blade.php
index 4f1396a1a81b..5162b70ff0c9 100644
--- a/resources/views/emails/quote_approved_html.blade.php
+++ b/resources/views/emails/quote_approved_html.blade.php
@@ -4,12 +4,12 @@
   <meta charset="utf-8">
 </head>
 <body>
-  @if (false)
-    @include('emails.view_action', ['link' => $invoiceLink, 'entityType' => $entityType])
+  @if ($account->enable_email_markup)
+    @include('emails.partials.user_view_action')
   @endif
   {{ trans('texts.email_salutation', ['name' => $userName]) }} <p/>
 
-  {{ trans("texts.notification_{$entityType}_approved", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} <p/>  
+  {{ trans("texts.notification_quote_approved", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} <p/>  
 
   {{ trans('texts.email_signature') }} <br/>
   {{ trans('texts.email_from') }} <p/>