diff --git a/mails/en/src/bankwire.php b/mails/en/src/bankwire.php
index ddea4f0ec..1fea3a3a3 100644
--- a/mails/en/src/bankwire.php
+++ b/mails/en/src/bankwire.php
@@ -12,7 +12,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Awaiting wire payment'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Awaiting wire payment'); ?> 
 		</p>
 		<span>
 			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.'); ?>
diff --git a/mails/en/src/cheque.php b/mails/en/src/cheque.php
index 12f3662b5..44c9e176d 100644
--- a/mails/en/src/cheque.php
+++ b/mails/en/src/cheque.php
@@ -12,7 +12,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Awaiting check payment'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Awaiting check payment'); ?>
 		</p>
 		<span>
 			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> has been placed successfully and will be <strong>shipped as soon as we receive your payment</strong>.'); ?>
diff --git a/mails/en/src/download_product.php b/mails/en/src/download_product.php
index b77b22877..b528308c2 100644
--- a/mails/en/src/download_product.php
+++ b/mails/en/src/download_product.php
@@ -3,7 +3,7 @@
 <tr>
 	<td align="center">
 		<span class="title"><?php echo t('Hi {firstname} {lastname},'); ?></span><br/>
-		<span class="subtitle"><?php echo t('Thank you for your order from <strong>{shop_name}'); ?></span>
+		<span class="subtitle"><?php echo t('Thank you for your order from <strong>{shop_name}</strong>'); ?></span>
 	</td>
 </tr>
 <tr>
diff --git a/mails/en/src/forward_msg.php b/mails/en/src/forward_msg.php
index a1f3048f8..d08284c98 100644
--- a/mails/en/src/forward_msg.php
+++ b/mails/en/src/forward_msg.php
@@ -14,9 +14,9 @@
 			<?php echo t('Customer service - Forwarded discussion'); ?>
 		</p>
 		<span>
-			<span><strong>{employee}</strong></span> <?php echo t('wanted to forward this discussion to you.'); ?> <br /><br />
+			<?php echo t('<span><strong>{employee}</strong></span> wanted to forward this discussion to you.'); ?> <br /><br />
 			<span><strong><?php echo t('Discussion history:'); ?></strong></span> {messages}<br /><br />
-			<span><strong>{employee}</strong></span> <?php echo t('added'); ?> <span><strong>"{comment}"</strong></span>
+			<?php echo t('<span><strong>{employee}</strong></span> added <span><strong>"{comment}"</strong></span>'); ?> 
 		</span>
 	</td>
 </tr>
diff --git a/mails/en/src/in_transit.php b/mails/en/src/in_transit.php
index 4b1005870..21621a37c 100644
--- a/mails/en/src/in_transit.php
+++ b/mails/en/src/in_transit.php
@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - In transit'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('In transit'); ?>
 		</p>
 		<span>
 			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> is currently in transit.'); ?> <br /><br />
diff --git a/mails/en/src/order_canceled.php b/mails/en/src/order_canceled.php
index 40802554d..cd1187ac8 100644
--- a/mails/en/src/order_canceled.php
+++ b/mails/en/src/order_canceled.php
@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Order cancelled'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Order cancelled'); ?>
 		</p>
 		<span>
 			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> from <span><strong>{shop_name}</strong></span> has been cancelled.'); ?><br />
diff --git a/mails/en/src/order_changed.php b/mails/en/src/order_changed.php
index 3256f3901..30a996d44 100644
--- a/mails/en/src/order_changed.php
+++ b/mails/en/src/order_changed.php
@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Order changed'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Order changed'); ?>
 		</p>
 		<span>
 			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> from <span><strong>{shop_name}</strong></span> has been changed by the merchant.'); ?><br />
diff --git a/mails/en/src/order_conf.php b/mails/en/src/order_conf.php
index c9cbee9ff..37e4dbdb8 100644
--- a/mails/en/src/order_conf.php
+++ b/mails/en/src/order_conf.php
@@ -15,7 +15,7 @@
 			<?php echo t('Order details'); ?>
 		</p>
 		<span>
-			<span><strong><?php echo t('Order:'); ?></strong></span> {order_name} <?php echo t('placed on'); ?> {date}<br /><br />
+			<span><strong><?php echo t('Order:'); ?></strong></span> {order_name} <?php echo t('Placed on'); ?> {date}<br /><br />
 			<span><strong><?php echo t('Payment:'); ?></strong></span> {payment}
 		</span>
 	</td>
diff --git a/mails/en/src/outofstock.php b/mails/en/src/outofstock.php
index e4cb5935d..8518b7843 100644
--- a/mails/en/src/outofstock.php
+++ b/mails/en/src/outofstock.php
@@ -12,7 +12,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Item(s) out of stock'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Item(s) out of stock'); ?>
 		</p>
 		<span>
 			<?php echo t('Unfortunately, one or more items are currently out of stock. This may cause a slight delay in your delivery. Please accept our apologies and rest assured that we are working hard to rectify this.'); ?>
diff --git a/mails/en/src/password_query.php b/mails/en/src/password_query.php
index 908e03a4c..c9f3a4402 100644
--- a/mails/en/src/password_query.php
+++ b/mails/en/src/password_query.php
@@ -16,7 +16,7 @@
 		<span>
 			<?php echo t('You have requested to reset your <span><strong>{shop_name}</strong></span> login details.'); ?><br/><br/>
 			<?php echo t('Please note that this will change your current password.'); ?><br/><br/>
-			<?php echo t('To confirm this action, please use the following link:<br /> <a href="{url}">{url}</a>'); ?>
+			<?php echo t('To confirm this action, please use the following link:'); ?> <br /> <a href="{url}">{url}</a>
 		</span>
 	</td>
 </tr>
diff --git a/mails/en/src/payment.php b/mails/en/src/payment.php
index 8926cf09b..742c488fb 100644
--- a/mails/en/src/payment.php
+++ b/mails/en/src/payment.php
@@ -12,7 +12,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Payment processed'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Payment processed'); ?>
 		</p>
 		<span>
 			<?php echo t('Your payment for order with the reference <strong><span>{order_name}</span></strong> was successfully processed.'); ?>
diff --git a/mails/en/src/payment_error.php b/mails/en/src/payment_error.php
index b6c681606..ca1e975c3 100644
--- a/mails/en/src/payment_error.php
+++ b/mails/en/src/payment_error.php
@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Payment processing error'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Payment processing error'); ?>
 		</p>
 		<span>
 			<?php echo t('There is a problem with your payment for <strong><span>{shop_name}</span></strong> order with the reference <strong><span>{order_name}</span></strong>. Please contact us at your earliest convenience.'); ?><br/>
diff --git a/mails/en/src/preparation.php b/mails/en/src/preparation.php
index 66306c961..0280feef4 100644
--- a/mails/en/src/preparation.php
+++ b/mails/en/src/preparation.php
@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order {order_name} - Processing'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Processing'); ?>
 		</p>
 		<span>
 			<?php echo t('We are currently processing your <strong><span>{shop_name}</span></strong> order with the reference <strong><span>{order_name}</span></strong>.'); ?>
diff --git a/mails/en/src/refund.php b/mails/en/src/refund.php
index fd680c25f..f3d4b6168 100644
--- a/mails/en/src/refund.php
+++ b/mails/en/src/refund.php
@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Refund processed for order with the reference {order_name}'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Refund processed'); ?>
 		</p>
 		<span>
 			<?php echo t('We have processed your <strong><span>{shop_name}</strong></span> refund for order with the reference <strong><span>{order_name}</strong></span>.'); ?>
diff --git a/mails/en/src/shipped.php b/mails/en/src/shipped.php
index 7958f19f7..f69757895 100644
--- a/mails/en/src/shipped.php
+++ b/mails/en/src/shipped.php
@@ -12,7 +12,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Shipped'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Shipped'); ?>
 		</p>
 		<span>
 			<?php echo t('Your order with the reference <span><strong>{order_name}</strong></span> has been shipped.'); ?><br /> 
diff --git a/mails/en/src/voucher.php b/mails/en/src/voucher.php
index 2888c4293..d184fb1af 100644
--- a/mails/en/src/voucher.php
+++ b/mails/en/src/voucher.php
@@ -11,7 +11,7 @@
 <tr>
 	<td class="box">
 		<p>
-			<?php echo t('Your order with the reference {order_name} - Voucher created'); ?>
+			<?php echo t('Order {order_name}'); ?>&nbsp;-&nbsp;<?php echo t('Voucher created'); ?>
 		</p>
 		<span>
 			<?php echo t('A voucher has been created in your name as a result of your order with the reference <span><strong>{order_name}</strong></span>.'); ?><br/><br/>
diff --git a/mails/en/src/voucher_new.php b/mails/en/src/voucher_new.php
index 605fa7e02..515d66598 100644
--- a/mails/en/src/voucher_new.php
+++ b/mails/en/src/voucher_new.php
@@ -14,7 +14,7 @@
 			<?php echo t('This is to inform you about the creation of a voucher.'); ?>
 		</p>
 		<span>
-			<?php echo t('Here is the code of your voucher: <span><strong>{voucher_num}</strong></span>'); ?><br/><br/>
+			<?php echo t('Here is the code of your voucher:'); ?> <span><strong>{voucher_num}</strong></span><br/><br/>
 			<?php echo t('Simply copy/paste this code during the payment process for your next order.'); ?>
 	</td>
 </tr>