diff --git a/app/views/subscription_mailer/confirmation_email.html.haml b/app/views/subscription_mailer/confirmation_email.html.haml
index 2989296d1f..8e6d442e72 100644
--- a/app/views/subscription_mailer/confirmation_email.html.haml
+++ b/app/views/subscription_mailer/confirmation_email.html.haml
@@ -12,21 +12,25 @@
 %p.callout
   = t(".explainer_html")
   - if @order.user.present?
+    %br
     = t("subscription_mailer.shared.edit_false_html",
       orders_close_at: l(@order.order_cycle.orders_close_at, format: mail_long_datetime_format),
       order_url: order_url(@order))
-  = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email)
+  %br
+  = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name)
+  %a{:href => "mailto:#{@order.distributor.contact.email}", :target => "_blank"}
+    = @order.distributor.contact.email
 
-%p  
-%h4
+%h3
   = t("mailers_shared.order_confirmation_html", number: @order.number)
 %p
   = t(".details_html", distributor: @order.distributor.name)
 
-= render 'spree/order_mailer/order_summary'
+= render 'shared/mailers/order_summary'
 
-= render 'spree/shared/payment'
-= render 'spree/order_mailer/shipping'
-= render 'spree/order_mailer/special_instructions'
+.detail
+  = render 'spree/shared/payment'
+  = render 'spree/order_mailer/shipping'
+  = render 'spree/order_mailer/special_instructions'
 
 = render 'shared/mailers/signoff_distributor'
diff --git a/app/views/subscription_mailer/confirmation_summary_email.html.haml b/app/views/subscription_mailer/confirmation_summary_email.html.haml
index 4d3bbadc7d..6bdda35fd6 100644
--- a/app/views/subscription_mailer/confirmation_summary_email.html.haml
+++ b/app/views/subscription_mailer/confirmation_summary_email.html.haml
@@ -12,5 +12,4 @@
 = render 'summary_overview', summary: @summary
 = render 'summary_detail', summary: @summary
 
-%p  
 = render 'shared/mailers/signoff_instance'
diff --git a/app/views/subscription_mailer/empty_email.html.haml b/app/views/subscription_mailer/empty_email.html.haml
index 0f263e6603..85d6221ba9 100644
--- a/app/views/subscription_mailer/empty_email.html.haml
+++ b/app/views/subscription_mailer/empty_email.html.haml
@@ -11,14 +11,16 @@
 
 %p.callout
   = t(".explainer_html")
-  = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email)
+  %br
+  = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name)
+  %a{:href => "mailto:#{@order.distributor.contact.email}", :target => "_blank"}
+    = @order.distributor.contact.email
 
-%p  
-%h4
-  = t("mailers_shared.order_confirmation_html", number: @order.number)
+%h3
+  = t("mailers_shared.order_summary_html", number: @order.number)
 %p
   = t(".details_html", distributor: @order.distributor.name)
 
-= render 'spree/order_mailer/order_summary'
+= render 'shared/mailers/order_summary'
 
 = render 'shared/mailers/signoff_distributor'
diff --git a/app/views/subscription_mailer/failed_payment_email.html.haml b/app/views/subscription_mailer/failed_payment_email.html.haml
index 3becd41e60..956cb167bb 100644
--- a/app/views/subscription_mailer/failed_payment_email.html.haml
+++ b/app/views/subscription_mailer/failed_payment_email.html.haml
@@ -12,15 +12,18 @@
 %p.callout
   = t(".explainer_html", distributor: @order.distributor.name)
   - if @order.user.present?
+    %br
     = t("subscription_mailer.shared.edit_false_html",
       orders_close_at: l(@order.order_cycle.orders_close_at, format: mail_long_datetime_format),
       order_url: order_url(@order))
-  = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email)
+  %br
+  = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name)
+  %a{:href => "mailto:#{@order.distributor.contact.email}", :target => "_blank"}
+    = @order.distributor.contact.email
 
 - if @order.errors.any?
-  %p  
-  %h4
-    = t("mailers_shared.order_confirmation_html", number: @order.number)
+  %h3
+    = t("mailers_shared.order_summary_html", number: @order.number)
   %p
     = t(".details_html", distributor: @order.distributor.name)
     - @order.errors.full_messages.each do |message|
diff --git a/app/views/subscription_mailer/placement_email.html.haml b/app/views/subscription_mailer/placement_email.html.haml
index b77f704f87..fef0efcb7a 100644
--- a/app/views/subscription_mailer/placement_email.html.haml
+++ b/app/views/subscription_mailer/placement_email.html.haml
@@ -11,22 +11,26 @@
 
 %p.callout
   = t(".explainer_html")
-
   - if @order.user.present?
     - allow_changes = !!@order.distributor.allow_order_changes?
+    %br
     = t("subscription_mailer.shared.edit_#{allow_changes}_html",
       orders_close_at: l(@order.order_cycle.orders_close_at, format: mail_long_datetime_format),
       order_url: order_url(@order))
-    = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email)
+    %br
+    = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name)
+    %a{:href => "mailto:#{@order.distributor.contact.email}", :target => "_blank"}
+      = @order.distributor.contact.email
   - else
+    %br
     = t(".contact_distributor_to_change_order_html",
       orders_close_at: l(@order.order_cycle.orders_close_at, format: mail_long_datetime_format),
-      distributor: @order.distributor.name,
-      email: @order.distributor.contact.email)
+      distributor: @order.distributor.name)
+    %a{:href => "mailto:#{@order.distributor.contact.email}", :target => "_blank"}
+      = @order.distributor.contact.email
 
-%p  
-%h4
-  = t("mailers_shared.order_confirmation_html", number: @order.number)
+%h3
+  = t("mailers_shared.order_summary_html", number: @order.number)
 %p
   = t(".details_html", distributor: @order.distributor.name)
 
@@ -34,10 +38,11 @@
   %p.callout
     = t(".changes")
 
-= render 'spree/order_mailer/order_summary'
+= render 'shared/mailers/order_summary'
 
-= render 'spree/shared/payment'
-= render 'spree/order_mailer/shipping'
-= render 'spree/order_mailer/special_instructions'
+.detail
+  = render 'spree/shared/payment'
+  = render 'spree/order_mailer/shipping'
+  = render 'spree/order_mailer/special_instructions'
 
 = render 'shared/mailers/signoff_distributor'
diff --git a/app/views/subscription_mailer/placement_summary_email.html.haml b/app/views/subscription_mailer/placement_summary_email.html.haml
index 4d3bbadc7d..6bdda35fd6 100644
--- a/app/views/subscription_mailer/placement_summary_email.html.haml
+++ b/app/views/subscription_mailer/placement_summary_email.html.haml
@@ -12,5 +12,4 @@
 = render 'summary_overview', summary: @summary
 = render 'summary_detail', summary: @summary
 
-%p  
 = render 'shared/mailers/signoff_instance'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bddaea79f8..689e24bcd2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -434,12 +434,12 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     shared:
       edit_true_html: "You can <a href='%{order_url}'>make changes</a> until orders close on %{orders_close_at}."
       edit_false_html: "You can <a href='%{order_url}'>view details of this order</a> at any time."
-      contact_distributor_html: "If you have any questions you can contact <strong>%{distributor}</strong> via %{email}."
+      contact_distributor_html: "If you have any questions you can contact <strong>%{distributor}</strong> via email by clicking the following link:"
     placement_email:
       subject: "Subscription order %{number} was placed at %{distributor}"
       intro_html: "You have a new order with <strong>%{distributor}</strong>."
       explainer_html: "This order was automatically created for you."
-      contact_distributor_to_change_order_html: "This order was automatically created for you. You can make changes until orders close on %{orders_close_at} by contacting <strong>%{distributor}</strong> via %{email}."
+      contact_distributor_to_change_order_html: "You can make changes until orders close on %{orders_close_at}. To do so please contact <strong>%{distributor}</strong> via email by clicking the following link:"
       details_html: "Here are the details of your order for <strong>%{distributor}</strong>:"
       changes: "Unfortunately, not all products that you requested were available. The original quantities that you requested appear crossed-out below."
     placement_summary_email: