diff --git a/application/views/sales/invoice_email.php b/application/views/sales/invoice_email.php
index ada375f31..c57427a10 100644
--- a/application/views/sales/invoice_email.php
+++ b/application/views/sales/invoice_email.php
@@ -4,7 +4,6 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/invoice_email.css"/>
-	<script src="<?php echo base_url();?>js/jquery-1.4.4.min.js" type="text/javascript" language="javascript" charset="UTF-8"></script>
 </head>
 <body>
 <?php
diff --git a/application/views/sales/receipt.php b/application/views/sales/receipt.php
index 5ea962082..1849607f6 100644
--- a/application/views/sales/receipt.php
+++ b/application/views/sales/receipt.php
@@ -108,9 +108,10 @@ if (isset($error_message))
 	<?php endif; ?>
 	<tr>
 	</tr>
+	<?php $border = (!$this->Appconfig->get('receipt_show_taxes') && !($this->Appconfig->get('show_total_discount') && $discount > 0)); ?> 
 	<tr>
-	<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_total'); ?></td>
-	<td style='text-align:right'><?php echo to_currency($total); ?></td>
+	<td colspan="3" style='<?php echo $border? 'border-top: 2px solid black;' :''; ?>text-align:right;'><?php echo $this->lang->line('sales_total'); ?></td>
+	<td style='<?php echo $border? 'border-top: 2px solid black;' :''; ?>text-align:right'><?php echo to_currency($total); ?></td>
 	</tr>
 
     <tr><td colspan="4">&nbsp;</td></tr>
