diff --git a/app/views/spree/order_mailer/confirm_email.text.erb b/app/views/spree/order_mailer/confirm_email.text.erb
index 29549e4ffa..3277ccaf00 100644
--- a/app/views/spree/order_mailer/confirm_email.text.erb
+++ b/app/views/spree/order_mailer/confirm_email.text.erb
@@ -7,20 +7,20 @@ Order Summary
 ============================================================
 Order for: <%= @order.bill_address.full_name %> 
 <% @order.line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-Subtotal: <%= number_to_currency @order.item_total %>
+Subtotal: <%= @order.display_item_total %>
 <% @order.adjustments.each do |adjustment| %>
-  <%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
+  <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
-Order Total: <%= number_to_currency(@order.total) %>
+Order Total: <%= @order.display_total %>
 
-<% if @order.payment_method.name.include? "EFT" %>
+<% if @order.payments.first.payment_method.name.include? "EFT" %>
 ============================================================
 Payment Details
 ============================================================
-<%= @order.payment_method.description.html_safe %>
+<%= @order.payments.first.payment_method.description.html_safe %>
 
 <% end %>
 ============================================================
diff --git a/lib/chili/enterprises_distributor_info_rich_text_feature/app/views/spree/order_mailer/confirm_email_with_distributor_info.text.erb b/lib/chili/enterprises_distributor_info_rich_text_feature/app/views/spree/order_mailer/confirm_email_with_distributor_info.text.erb
index bfe5b6bbef..e88f053e1a 100644
--- a/lib/chili/enterprises_distributor_info_rich_text_feature/app/views/spree/order_mailer/confirm_email_with_distributor_info.text.erb
+++ b/lib/chili/enterprises_distributor_info_rich_text_feature/app/views/spree/order_mailer/confirm_email_with_distributor_info.text.erb
@@ -7,20 +7,20 @@ Order Summary
 ============================================================
 Order for: <%= @order.bill_address.full_name %>
 <% @order.line_items.each do |item| %>
-  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
+  <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-Subtotal: <%= number_to_currency @order.item_total %>
-<% @order.adjustments.each do |adjustment| %>
-  <%= raw(adjustment.label) %> <%= number_to_currency(adjustment.amount) %>
+Subtotal: <%= @order.display_item_total %>
+<% @order.adjustments.eligible.each do |adjustment| %>
+  <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
-Order Total: <%= number_to_currency(@order.total) %>
+Order Total: <%= @order.display_total %>
 
-<% if @order.payment_method.name.include? "EFT" %>
+<% if @order.payments.first.payment_method.name.include? "EFT" %>
 ============================================================
 Payment Details
 ============================================================
-<%= @order.payment_method.description.html_safe %>
+<%= @order.payments.first.payment_method.description.html_safe %>
 
 <% end %>
 ============================================================
diff --git a/lib/chili/enterprises_distributor_info_rich_text_feature/lib/enterprises_distributor_info_rich_text_feature/engine.rb b/lib/chili/enterprises_distributor_info_rich_text_feature/lib/enterprises_distributor_info_rich_text_feature/engine.rb
index a50a3091cd..36a13fe94a 100644
--- a/lib/chili/enterprises_distributor_info_rich_text_feature/lib/enterprises_distributor_info_rich_text_feature/engine.rb
+++ b/lib/chili/enterprises_distributor_info_rich_text_feature/lib/enterprises_distributor_info_rich_text_feature/engine.rb
@@ -8,12 +8,10 @@ module EnterprisesDistributorInfoRichTextFeature
       if OpenFoodWeb::FeatureToggle.enabled? :enterprises_distributor_info_rich_text
         ::Spree::OrderMailer.class_eval do
           def confirm_email(order, resend = false)
-            @order = order
+            find_order(order)
             subject = (resend ? "[#{t(:resend).upcase}] " : '')
-            subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{order.number}"
-
-            mail(:to => order.email,
-                 :subject => subject,
+            subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{@order.number}"
+            mail(:to => @order.email, :from => from_address, :subject => subject,
                  :template_name => 'confirm_email_with_distributor_info')
           end
         end