diff --git a/app/controllers/documents_controller.php b/app/controllers/documents_controller.php
index 9ee3bd36..8a92543c 100755
--- a/app/controllers/documents_controller.php
+++ b/app/controllers/documents_controller.php
@@ -983,8 +983,10 @@ EOT;
         if ($document['OrderAcknowledgement']['signature_required']) {
           $template = 'orderAck_email_signature_required';
         }
+	break;
     case 'packingList':
-      $subject .= "Packing List";
+      $subject = "Packing List: ".$enquiry['Enquiry']['title'];
+      break;
     }
 
 
diff --git a/app/views/elements/email/html/invoice_email.ctp b/app/views/elements/email/html/invoice_email.ctp
index bec514c3..3e8ef597 100755
--- a/app/views/elements/email/html/invoice_email.ctp
+++ b/app/views/elements/email/html/invoice_email.ctp
@@ -1,7 +1,7 @@
 Dear <?php echo $enquiry['Contact']['first_name']; ?>,<br /><br />
 
 <p>
-Thank you for your Purchase Order # <?=$job['Job']['title']; ?>. Please see attached the Tax Invoice <?=$document['Invoice']['title']?>  for your
+Thank you for your Purchase Order #<?=$job['Job']['customer_order_number']; ?>. Please see attached the Tax Invoice <?=$document['Invoice']['title']?>  for your
 processing. Please send us a copy of the remittance once payment has been made. Please include our
 invoice number <?php echo $document['Invoice']['title']?> as a reference with your payment.</p>
 
diff --git a/app/views/elements/email/html/orderAck_email.ctp b/app/views/elements/email/html/orderAck_email.ctp
index a85eabb2..8c79f446 100755
--- a/app/views/elements/email/html/orderAck_email.ctp
+++ b/app/views/elements/email/html/orderAck_email.ctp
@@ -1,6 +1,6 @@
 Dear <?php echo $enquiry['Contact']['first_name']; ?>,<br /><br />
 
-<p>Thank you for your Purchase Order # <?=$job['Job']['customer_order_number']; ?>.
+<p>Thank you for your Purchase Order #<?=$job['Job']['customer_order_number']; ?>.</p>
 
 
 <p>Should you have any questions regarding your enquiry or quotation, please reply to this email or
diff --git a/app/views/elements/email/text/invoice_email.ctp b/app/views/elements/email/text/invoice_email.ctp
index 2655bc32..2fdb6944 100755
--- a/app/views/elements/email/text/invoice_email.ctp
+++ b/app/views/elements/email/text/invoice_email.ctp
@@ -1,6 +1,6 @@
 Dear <?php echo $enquiry['Contact']['first_name']; ?>,
 
-Thank you for your Purchase Order # <?=$invoice['Job']['title']; ?>. Please see attached the Tax Invoice <?=$document['Invoice']['title']?>  for your
+Thank you for your Purchase Order #<?=$job['Job']['customer_order_number']; ?>. Please see attached the Tax Invoice <?=$document['Invoice']['title']?>  for your
 processing. Please send us a copy of the remittance once payment has been made. Please include our
 invoice number <?php echo $document['Invoice']['title']?> as a reference with your payment.
 
diff --git a/app/views/elements/email/text/orderAck_email.ctp b/app/views/elements/email/text/orderAck_email.ctp
index 02f8eac7..c374699e 100755
--- a/app/views/elements/email/text/orderAck_email.ctp
+++ b/app/views/elements/email/text/orderAck_email.ctp
@@ -1,6 +1,6 @@
 Dear <?php echo $enquiry['Contact']['first_name']; ?>,
 
-Thank you for your Purchase Order # <?=$invoice['Job']['title']; ?>. Please find attached the Order Acknowledgement for your review. 
+Thank you for your Purchase Order # <?=$job['Job']['customer_order_number']; ?>. Please find attached the Order Acknowledgement for your review. 
 
 Should you have any questions regarding your enquiry or quotation, please reply to this email or
 reference <?php echo $enquiry['Enquiry']['title']; ?> to expedite our response time.