diff --git a/resources/views/invoices/email.blade.php b/resources/views/invoices/email.blade.php
index 24d87c53c762..1e6a56423a50 100644
--- a/resources/views/invoices/email.blade.php
+++ b/resources/views/invoices/email.blade.php
@@ -4,7 +4,7 @@
 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title" id="emailModalLabel">{{ trans('texts.email_invoice') }}</h4>
+                <h4 class="modal-title" id="emailModalLabel">{{ trans($invoice->isQuote() ? 'texts.email_quote' : 'texts.email_invoice') }}</h4>
             </div>
 
             <div class="container" style="width: 100%; padding-bottom: 0px !important">
@@ -225,7 +225,7 @@
           NINJA.formIsChanged = true;
         });
 
-      @if (Utils::isPro())
+      @if (Utils::isPro() && $invoice->isStandard())
           if (window.defaultTemplate) {
               $('#template_type').val(window.defaultTemplate);
           }
diff --git a/resources/views/partials/email_templates.blade.php b/resources/views/partials/email_templates.blade.php
index 91f1bfb74226..5aa12fa725b5 100644
--- a/resources/views/partials/email_templates.blade.php
+++ b/resources/views/partials/email_templates.blade.php
@@ -28,7 +28,9 @@
             'password': passwordHtml,
             'documents': documentsHtml,
             'viewLink': '{{ link_to('#', url('/view/...')) }}$password',
-            'viewButton': '{!! Form::flatButton('view_invoice', '#0b4d78') !!}$password',
+            'viewButton': invoice && invoice.invoice_type_id == {{ INVOICE_TYPE_QUOTE }} ?
+                '{!! Form::flatButton('view_quote', '#0b4d78') !!}$password' :
+                '{!! Form::flatButton('view_invoice', '#0b4d78') !!}$password',
             'paymentLink': '{{ link_to('#', url('/payment/...')) }}$password',
             'paymentButton': '{!! Form::flatButton('pay_now', '#36c157') !!}$password',
             'autoBill': '{{ trans('texts.auto_bill_notification_placeholder') }}',