diff --git a/app/views/spree/order_mailer/confirm_email.text.erb b/app/views/spree/order_mailer/confirm_email.text.erb
index 29549e4ffa..16517d80f8 100644
--- a/app/views/spree/order_mailer/confirm_email.text.erb
+++ b/app/views/spree/order_mailer/confirm_email.text.erb
@@ -1,4 +1,4 @@
-Dear <%= @order.bill_address.firstname %>,
+	Dear <%= @order.bill_address.firstname %>,
 
 Please review and retain the following order information for your records.
 
@@ -22,20 +22,10 @@ Payment Details
 ============================================================
 <%= @order.payment_method.description.html_safe %>
 
-<% end %>
+    <% end %>
 ============================================================
 Collection / Delivery Details
 ============================================================
-Address:
-    <%= @order.distributor.name %>
-    <% address = @order.distributor.address %>
-    <%= address.address1 %> <%= ",\n    #{address.address2}" unless address.address2.blank? %>
-    <%= [address.city, address.state_text, address.zipcode, address.country.name].compact.join ', ' %>
-Collection time:
-    <%= @order.distributor.next_collection_at %>
-Contact:
-    <%= @order.distributor.contact %>
-    <%= "Phone: #{@order.distributor.phone}" %>
-    <%= "Email: #{@order.distributor.email}" %>
+<%= strip_tags render :partial => 'enterprises/distributor_details', :formats => :html, :locals => {:distributor => @order.distributor} %>
 
-Thank you for your business.
+Thank you for your support.
diff --git a/app/views/spree/shared/_order_details_steps_data.html.erb b/app/views/spree/shared/_order_details_steps_data.html.erb
index 96214287f8..d0fa4d262d 100644
--- a/app/views/spree/shared/_order_details_steps_data.html.erb
+++ b/app/views/spree/shared/_order_details_steps_data.html.erb
@@ -11,8 +11,7 @@
   <div class="columns alpha six">
     <h6><%= "Distributor Details" %> <%# link_to "(#{t(:edit)})", checkout_state_path(:address) unless @order.completed? %></h6>
     <div class="address">
-      Distributor: <%= order.distributor.name %><br />
-	  Address: <%= order.distributor.address.address1 + ", " + order.distributor.address.city %>
+      <%= render 'enterprises/distributor_details', :distributor => order.distributor %>
     </div>
   </div>
 
@@ -46,4 +45,4 @@
       <% end %>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>