diff --git a/app/views/spree/order_mailer/confirm_email_for_customer.html.haml b/app/views/spree/order_mailer/confirm_email_for_customer.html.haml
index 8b3e93c92b..5fe2764607 100644
--- a/app/views/spree/order_mailer/confirm_email_for_customer.html.haml
+++ b/app/views/spree/order_mailer/confirm_email_for_customer.html.haml
@@ -41,7 +41,7 @@
           - else
             %strong
               %span= "#{raw(item.variant.product.name)}"
-              %span.light= "- " + "#{raw(item.variant.name_to_display)}"
+              %span= "- " + "#{raw(item.variant.name_to_display)}"
           - if item.variant.options_text
             = "(" + "#{raw(item.variant.options_text)}" + ")"
           %br
@@ -98,24 +98,21 @@
     %h4 
       Delivery on:
       %strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
-    %br  
-  
-  %h4 Delivery address:
-  %p
-    #{@order.ship_address.full_name}
-    %br
-    #{@order.ship_address.full_address}
-    %br
-    #{@order.ship_address.phone}
-
     - if @order.shipping_method.andand.description
-      %p #{@order.shipping_method.description.html_safe}
+      %p 
+        %em #{@order.shipping_method.description.html_safe}
+    %br  
+    
+  - if @order.ship_address
+    %h4 Delivery address:
+    %p
+      #{@order.ship_address.full_name}
+      %br
+      #{@order.ship_address.full_address}
+      %br
+      #{@order.ship_address.phone}
       %br  
 
-    / - if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
-    /   %h4 Other delivery info:
-    /   %p
-    /     %strong #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
 
 - else
   / Collection details
@@ -155,7 +152,7 @@
   %br
   %p
     %small
-      %strong Customer notes / custom delivery instructions:
+      %strong Your notes / custom delivery instructions:
       %br
       #{@order.special_instructions}
 
diff --git a/app/views/spree/order_mailer/confirm_email_for_shop.html.haml b/app/views/spree/order_mailer/confirm_email_for_shop.html.haml
index c2dc363876..68ccfe099f 100644
--- a/app/views/spree/order_mailer/confirm_email_for_shop.html.haml
+++ b/app/views/spree/order_mailer/confirm_email_for_shop.html.haml
@@ -36,8 +36,14 @@
     - @order.line_items.each do |item|
       %tr
         %td
-          %strong= "#{raw(item.variant.product.name)}" 
-          = "#{raw(item.variant.options_text)}"
+          - if item.variant.product.name == item.variant.name_to_display
+            %strong= "#{raw(item.variant.product.name)}"
+          - else
+            %strong
+              %span= "#{raw(item.variant.product.name)}"
+              %span= "- " + "#{raw(item.variant.name_to_display)}"
+          - if item.variant.options_text
+            = "(" + "#{raw(item.variant.options_text)}" + ")"
           %br
           %small
             %em= raw(item.variant.product.supplier.name)
@@ -92,25 +98,21 @@
     %h4 
       Delivery on:
       %strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
-    %br  
-  
-  %h4 Delivery address:
-  %p
-    #{@order.ship_address.full_name}
-    %br
-    #{@order.ship_address.full_address}
-    %br
-    #{@order.ship_address.phone}
-
     - if @order.shipping_method.andand.description
-      %p #{@order.shipping_method.description.html_safe}
+      %p 
+        %em #{@order.shipping_method.description.html_safe}
+    %br  
+    
+  - if @order.ship_address
+    %h4 Delivery address:
+    %p
+      #{@order.ship_address.full_name}
+      %br
+      #{@order.ship_address.full_address}
+      %br
+      #{@order.ship_address.phone}
       %br  
 
-    / - if @order.order_cycle.andand.pickup_instructions_for(@order.distributor)
-    /   %h4 Other delivery info:
-    /   %p
-    /     %strong #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
-
 - else
   / Collection details
   %p.callout