diff --git a/CRM/Civicase/Hook/BuildForm/AttachQuotationToInvoiceMail.php b/CRM/Civicase/Hook/BuildForm/AttachQuotationToInvoiceMail.php
index ea9dd080a..74a660cb0 100644
--- a/CRM/Civicase/Hook/BuildForm/AttachQuotationToInvoiceMail.php
+++ b/CRM/Civicase/Hook/BuildForm/AttachQuotationToInvoiceMail.php
@@ -22,6 +22,7 @@ public function run(CRM_Core_Form &$form, $formName) {
     }
 
     $form->add('checkbox', 'attach_quote', ts('Attach Quotation'));
+    $form->setDefaults(array_merge($form->_defaultValues, ['attach_quote' => TRUE]));
 
     CRM_Core_Region::instance('page-body')->add([
       'template' => "CRM/Civicase/Form/Contribute/AttachQuotation.tpl",
diff --git a/CRM/Civicase/Hook/alterMailParams/AttachQuotation.php b/CRM/Civicase/Hook/alterMailParams/AttachQuotation.php
index e368a33ef..d6a99919c 100644
--- a/CRM/Civicase/Hook/alterMailParams/AttachQuotation.php
+++ b/CRM/Civicase/Hook/alterMailParams/AttachQuotation.php
@@ -23,12 +23,13 @@ public function run(array &$params, $context) {
       return;
     }
 
-    $rendered = $this->getContributionQuotationInvoice($params['tokenContext']['contributionId']);
+    $contributionId = $params['tokenContext']['contributionId'] ?? $params['tplParams']['id'];
+    $rendered = $this->getContributionQuotationInvoice($contributionId);
 
     $attachment = CRM_Utils_Mail::appendPDF('quotation_invoice.pdf', $rendered['html'], $rendered['format']);
 
     if ($attachment) {
-      $params['attachments'][] = $attachment;
+      $params['attachments']['quotaition_invoice'] = $attachment;
     }
   }
 
@@ -73,7 +74,7 @@ private function getContributionQuotationInvoice($contributionId) {
    */
   private function shouldRun(array $params, $context, $shouldAttachQuote) {
     $component = $params['tplParams']['component'] ?? '';
-    if ($component !== 'contribute' || $context !== 'messageTemplate' || empty($shouldAttachQuote)) {
+    if ($component !== 'contribute' || empty($shouldAttachQuote)) {
       return FALSE;
     }
 
diff --git a/templates/CRM/Civicase/Form/Contribute/AttachQuotation.tpl b/templates/CRM/Civicase/Form/Contribute/AttachQuotation.tpl
index b84493606..68e374fef 100644
--- a/templates/CRM/Civicase/Form/Contribute/AttachQuotation.tpl
+++ b/templates/CRM/Civicase/Form/Contribute/AttachQuotation.tpl
@@ -9,6 +9,7 @@
 {literal}
   <script type="text/javascript">
     CRM.$(function ($) {
+      $('#attach_quote').prop('checked', 1)
       if ($('#html_message').length) {
         $('#html_message').parent().parent().after($('tr.attach-quote'))