diff --git a/app/mailers/spree/order_mailer_decorator.rb b/app/mailers/spree/order_mailer_decorator.rb
index 9d93651563..d71b722384 100644
--- a/app/mailers/spree/order_mailer_decorator.rb
+++ b/app/mailers/spree/order_mailer_decorator.rb
@@ -16,7 +16,7 @@ Spree::OrderMailer.class_eval do
   def confirm_email_for_customer(order_or_order_id, resend = false)
     @order = find_order(order_or_order_id)
     I18n.with_locale valid_locale(@order.user) do
-      subject = mail_subject(t('order_mailer.confirm_email.subject'), resend)
+      subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
       mail(:to => @order.email,
            :from => from_address,
            :subject => subject,
@@ -27,7 +27,7 @@ Spree::OrderMailer.class_eval do
   def confirm_email_for_shop(order_or_order_id, resend = false)
     @order = find_order(order_or_order_id)
     I18n.with_locale valid_locale(@order.user) do
-      subject = mail_subject(t('order_mailer.confirm_email.subject'), resend)
+      subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
       mail(:to => @order.distributor.contact.email,
            :from => from_address,
            :subject => subject)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ae44aea75b..2dbfee1865 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3088,6 +3088,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
         instructions: "Your order has been CANCELED. Please retain this cancellation information for your records."
         order_summary_canceled: "Order Summary [CANCELED]"
         subject: "Cancellation of Order"
+      confirm_email:
+        subject: "Order Confirmation"
       invoice_email:
         hi: "Hi %{name}"
         invoice_attached_text: Please find attached an invoice for your recent order from