diff --git a/app/mailers/enterprise_mailer.rb b/app/mailers/enterprise_mailer.rb
index c64907cf6a..7704faaa6c 100644
--- a/app/mailers/enterprise_mailer.rb
+++ b/app/mailers/enterprise_mailer.rb
@@ -21,7 +21,7 @@ class EnterpriseMailer < ApplicationMailer
     @instance = Spree::Config[:site_name]
 
     I18n.with_locale valid_locale(@enterprise.owner) do
-      subject = t('enterprise_mailer.invite_manager.subject', enterprise: @enterprise.name)
+      subject = t('enterprise_mailer.manager_invitation.subject', enterprise: @enterprise.name)
       mail(to: user.email,
            subject:)
     end
diff --git a/app/mailers/payment_mailer.rb b/app/mailers/payment_mailer.rb
index 88bbdf5ab9..bf29402cff 100644
--- a/app/mailers/payment_mailer.rb
+++ b/app/mailers/payment_mailer.rb
@@ -8,7 +8,7 @@ class PaymentMailer < ApplicationMailer
     @payment = payment
     @order = @payment.order
     @hide_ofn_navigation = @payment.order.distributor.hide_ofn_navigation
-    subject = I18n.t('spree.payment_mailer.authorize_payment.subject',
+    subject = I18n.t('payment_mailer.authorize_payment.subject',
                      distributor: @payment.order.distributor.name)
     I18n.with_locale valid_locale(@payment.order.user) do
       mail(to: payment.order.email, subject:)
@@ -19,7 +19,7 @@ class PaymentMailer < ApplicationMailer
     @payment = payment
     @order = @payment.order
     shop_owner = @payment.order.distributor.owner
-    subject = I18n.t('spree.payment_mailer.authorization_required.subject',
+    subject = I18n.t('payment_mailer.authorization_required.subject',
                      order: @payment.order)
     I18n.with_locale valid_locale(shop_owner) do
       mail(to: shop_owner.email,
diff --git a/app/mailers/producer_mailer.rb b/app/mailers/producer_mailer.rb
index 99c5f0f4f5..c881a5af65 100644
--- a/app/mailers/producer_mailer.rb
+++ b/app/mailers/producer_mailer.rb
@@ -41,7 +41,7 @@ class ProducerMailer < ApplicationMailer
   end
 
   def subject
-    order_cycle_subject = I18n.t('producer_mailer.order_cycle.subject', producer: @producer.name)
+    order_cycle_subject = I18n.t('producer_mailer.order_cycle_report.subject', producer: @producer.name)
     "[#{Spree::Config.site_name}] #{order_cycle_subject}"
   end
 
diff --git a/app/mailers/spree/order_mailer.rb b/app/mailers/spree/order_mailer.rb
index 4f932dcc46..ee71f84a07 100644
--- a/app/mailers/spree/order_mailer.rb
+++ b/app/mailers/spree/order_mailer.rb
@@ -31,7 +31,7 @@ module Spree
       @order = find_order(order_or_order_id)
       @hide_ofn_navigation = @order.distributor.hide_ofn_navigation
       I18n.with_locale valid_locale(@order.user) do
-        subject = mail_subject(t('spree.order_mailer.confirm_email.subject'), resend)
+        subject = mail_subject(t('spree.order_mailer.confirm_email_for_customer.subject'), resend)
         mail(to: @order.email,
              subject:,
              reply_to: @order.distributor.contact.email)
@@ -41,7 +41,7 @@ module Spree
     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('spree.order_mailer.confirm_email.subject'), resend)
+        subject = mail_subject(t('spree.order_mailer.confirm_email_for_shop.subject'), resend)
         mail(to: @order.distributor.contact.email,
              subject:)
       end
diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb
index 08b0031de4..cfc9150ea7 100644
--- a/app/mailers/subscription_mailer.rb
+++ b/app/mailers/subscription_mailer.rb
@@ -57,7 +57,7 @@ class SubscriptionMailer < ApplicationMailer
 
   def send_mail(order)
     I18n.with_locale valid_locale(order.user) do
-      confirm_email_subject = t('spree.order_mailer.confirm_email.subject')
+      confirm_email_subject = t('spree.order_mailer.confirm_email_for_customer.subject')
       subject = "#{Spree::Config[:site_name]} #{confirm_email_subject} ##{order.number}"
       mail(to: order.email,
            subject:,
diff --git a/app/views/enterprise_mailer/manager_invitation.html.haml b/app/views/enterprise_mailer/manager_invitation.html.haml
index 80ead4355a..9ce92c63b4 100644
--- a/app/views/enterprise_mailer/manager_invitation.html.haml
+++ b/app/views/enterprise_mailer/manager_invitation.html.haml
@@ -10,11 +10,11 @@
                    enterprise_for_logo: @enterprise_for_logo }
 
 %p
-  = t('invite_email.confirm_your_email', enterprise: @enterprise.name)
-%p
-  = t('invite_email.mistakenly_sent', owner_email: @enterprise.owner.email)
+  = t('.confirm_your_email_html', enterprise: @enterprise.name)
 %p
   = t('.set_a_password')
+%p
+  = t('.mistakenly_sent', owner_email: @enterprise.owner.email)
 
 = render 'shared/mailers/signoff_instance'
 
diff --git a/app/views/enterprise_mailer/welcome.html.haml b/app/views/enterprise_mailer/welcome.html.haml
index 12681f1294..79a3e10061 100644
--- a/app/views/enterprise_mailer/welcome.html.haml
+++ b/app/views/enterprise_mailer/welcome.html.haml
@@ -6,12 +6,12 @@
                    intro: t(intro_key, enterprise: @enterprise.name, sitename: Spree::Config.site_name) }
 
 %p
-  = t(".email_userguide_html", link: link_to(t(".userguide"), ContentConfig.user_guide_link))
+  = t(".userguide_html", link: link_to(t(".userguide"), ContentConfig.user_guide_link))
 %p
-  = t(".email_admin_html", link: link_to(t(".admin_panel"), spree.admin_dashboard_url))
+  = t(".admin_html", link: link_to(t(".admin_panel"), spree.admin_dashboard_url))
 
 %p
-  = t(".email_community_html", link: link_to(t(".join_community"), ContentConfig.community_forum_url))
+  = t(".community_html", link: link_to(t(".join_community"), ContentConfig.community_forum_url))
 
 = render 'shared/mailers/signoff_instance'
 
diff --git a/app/views/producer_mailer/order_cycle_report.html.haml b/app/views/producer_mailer/order_cycle_report.html.haml
index 7b920d143d..1ddc1807da 100644
--- a/app/views/producer_mailer/order_cycle_report.html.haml
+++ b/app/views/producer_mailer/order_cycle_report.html.haml
@@ -10,7 +10,7 @@
                    enterprise_for_logo: @enterprise_for_logo }
 
 %p
-  = t :producer_mail_text_before
+  = t('.text_before')
   %ul
     - @distributors_pickup_times.each do |distributor_name, pickup_time|
       %li
@@ -19,10 +19,10 @@
   - if @receival_instructions
     %p
       %b
-        =t :producer_mail_delivery_instructions
+        = t('.delivery_instructions')
       = @receival_instructions
 %p
-  = t :producer_mail_order_text
+  = t('.order_text')
   %table.order-summary
     %thead
       %tr
@@ -72,7 +72,7 @@
           = @tax_total
 - if @customer_line_items
   %p
-    = t :producer_mail_order_customer_text
+    = t('.order_customer_text')
   %table.order-summary.customer-order
     %thead
       %tr
@@ -106,6 +106,6 @@
           %td
             = line_item[:last_name]
 %p
-  = t :producer_mail_text_after
+  = t('.text_after')
 
 = render 'shared/mailers/signoff_enterprise'
diff --git a/app/views/spree/order_mailer/_order_summary.html.haml b/app/views/spree/order_mailer/_order_summary.html.haml
index 1c3b4c7480..34e9d861e2 100644
--- a/app/views/spree/order_mailer/_order_summary.html.haml
+++ b/app/views/spree/order_mailer/_order_summary.html.haml
@@ -3,16 +3,16 @@
     %tr
       %th{align: "left"}
         %h4
-          = t :email_order_summary_item
+          = t('.item')
       %th{align: "left"}
         %h4
-          = t :email_order_summary_sku
+          = t('.sku')
       %th{align: "right"}
         %h4
-          = t :email_order_summary_quantity
+          = t('.quantity')
       %th{align: "right", width: "25%"}
         %h4
-          = t :email_order_summary_price
+          = t('.price')
   %tbody
     - @order.line_items.sorted_by_name_and_unit_value.each do |item|
       %tr
@@ -37,7 +37,7 @@
   %tfoot
     %tr
       %td{align: "right", colspan: "3"}
-        = t :email_order_summary_subtotal
+        = t('.subtotal')
       %td{align: "right"}
         = display_checkout_subtotal(@order)
     - checkout_adjustments_for(@order, exclude: [:line_item]).reverse_each do |adjustment|
@@ -49,14 +49,14 @@
     %tr
       %td{align: "right", colspan: "3"}
         %strong
-          = t :email_order_summary_total
+          = t('.total')
       %td{align: "right"}
         %strong= @order.display_total
 
     - if @order.total_tax > 0
       %tr
         %td{align: "right", colspan: "3"}
-          = t :email_order_summary_includes_tax
+          = t('.includes_tax')
         %td{align: "right"}
           = display_checkout_tax_total(@order)
 %p &nbsp;
diff --git a/app/views/spree/order_mailer/_shipping.html.haml b/app/views/spree/order_mailer/_shipping.html.haml
index e0403f8b83..094dda03c2 100644
--- a/app/views/spree/order_mailer/_shipping.html.haml
+++ b/app/views/spree/order_mailer/_shipping.html.haml
@@ -5,11 +5,11 @@
       - if @order.shipping_method&.name
         #{@order.shipping_method.name.html_safe}
       - else
-        = t :email_shipping_delivery_details
+        = t('.delivery_details')
 
   - if @order.order_cycle&.pickup_time_for(@order.distributor)
     %h4
-      = t :email_shipping_delivery_time
+      = t('.delivery_time')
       %strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
     - if @order.shipping_method&.description
       %p
@@ -18,7 +18,7 @@
 
   - if @order.ship_address
     %h4
-      = t :email_shipping_delivery_address
+      = t('.delivery_address')
     %p
       #{@order.ship_address.full_name}
       %br
@@ -35,11 +35,11 @@
       - if @order.shipping_method&.name
         #{@order.shipping_method.name.html_safe}
       - else
-        = t :email_shipping_collection_details
+        = t('.collection_details')
 
   - if @order.order_cycle&.pickup_time_for(@order.distributor).present?
     %h4
-      = t :email_shipping_collection_time
+      = t('.collection_time')
       %strong #{@order.order_cycle.pickup_time_for(@order.distributor)}
 
   - if @order.shipping_method&.description.present?
@@ -50,6 +50,6 @@
   - if @order.order_cycle&.pickup_instructions_for(@order.distributor).present?
     %p
       %strong
-        = t :email_shipping_collection_instructions
+        = t('.collection_instructions')
       %br
       #{@order.order_cycle.pickup_instructions_for(@order.distributor)}
diff --git a/app/views/spree/order_mailer/_special_instructions.html.haml b/app/views/spree/order_mailer/_special_instructions.html.haml
index 2d2f947405..79036103bb 100644
--- a/app/views/spree/order_mailer/_special_instructions.html.haml
+++ b/app/views/spree/order_mailer/_special_instructions.html.haml
@@ -3,6 +3,6 @@
   %p
     %small
       %strong
-        = t :email_special_instructions
+        = t('.special_instructions')
       %br
       #{@order.special_instructions}
diff --git a/app/views/spree/order_mailer/cancel_email_for_shop.html.haml b/app/views/spree/order_mailer/cancel_email_for_shop.html.haml
index 173d3e96df..4b100a2248 100644
--- a/app/views/spree/order_mailer/cancel_email_for_shop.html.haml
+++ b/app/views/spree/order_mailer/cancel_email_for_shop.html.haml
@@ -9,6 +9,6 @@
                    intro: t(intro_key, number: @order.number),
                    enterprise_for_logo: @enterprise_for_logo }
 
-= link_to t('spree.order_mailer.cancel_email_for_shop.view_cancelled_order'), spree.edit_admin_order_url(@order)
+= link_to t('.view_cancelled_order'), spree.edit_admin_order_url(@order)
 
 = render 'shared/mailers/signoff_instance'
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 417ff23ad4..5933dc64bb 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
@@ -12,7 +12,7 @@
 %h4
   = t('mailers_shared.order_confirmation_html', number: @order.number)
 %p
-  = t :email_confirm_customer_details_html, distributor: @order.distributor.name
+  = t('.details_html', distributor: @order.distributor.name)
 
 = render 'order_summary'
 = render 'spree/shared/payment'
diff --git a/app/views/spree/shared/_payment.html.haml b/app/views/spree/shared/_payment.html.haml
index 0c1bc8c8d0..9e6540a26c 100644
--- a/app/views/spree/shared/_payment.html.haml
+++ b/app/views/spree/shared/_payment.html.haml
@@ -6,15 +6,15 @@
       %strong= @order.display_outstanding_balance
     - else
       - if @order.paid?
-        = t :email_payment_paid
+        = t('.email_paid')
       - else
-        = t :email_payment_not_paid
+        = t('.email_not_paid')
   %strong
-    = t :email_payment_summary
+    = t('.email_summary')
 - if @order.payments.any?
   = render partial: 'spree/shared/payments_list', locals: { payments: @order.payments }
   - if last_payment_method(@order).present?
     %p.callout{style: "margin-top: 40px"}
       %strong
-        = t :email_payment_description
+        = t('.email_description')
     %p{style: "margin: 5px"}= last_payment_method(@order).description
diff --git a/app/views/spree/user_mailer/confirmation_instructions.html.haml b/app/views/spree/user_mailer/confirmation_instructions.html.haml
index 6dcc1b60ad..7bf1cf3c2b 100644
--- a/app/views/spree/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/spree/user_mailer/confirmation_instructions.html.haml
@@ -5,15 +5,16 @@
          locals: { greeting: t(greeting_key),
                    intro: t(intro_key, sitename: @instance) }
 
-%p= t :email_confirmation_activate_account
+%p
+  = t('.activate_account')
 
 %p.callout
-  = t :email_confirmation_click_link
+  = t('.click_link')
   %br
   %strong
-    = link_to t(:email_confirmation_link_label), spree.spree_user_confirmation_url(:confirmation_token => @user.confirmation_token)
+    = link_to t('.link_label'), spree.spree_user_confirmation_url(:confirmation_token => @user.confirmation_token)
 
 = render 'shared/mailers/signoff_instance'
 
 %p.notice
-  = t :email_confirmation_notice_unexpected, sitename: @instance, contact: @contact
+  = t('.notice_unexpected', sitename: @instance, contact: @contact)
diff --git a/app/views/spree/user_mailer/signup_confirmation.html.haml b/app/views/spree/user_mailer/signup_confirmation.html.haml
index bc33209a42..45d9e3bd95 100644
--- a/app/views/spree/user_mailer/signup_confirmation.html.haml
+++ b/app/views/spree/user_mailer/signup_confirmation.html.haml
@@ -6,17 +6,17 @@
                    intro: t(intro_key, sitename: Spree::Config[:site_name]) }
 
 %p
-  = t :email_signup_confirmed_email
+  = t('.confirmed_email')
 %p
   -# Remove http:// and trailing slashes from root url if they exist
-  = t :email_signup_shop_html, link: link_to(main_app.root_url.sub(/http:\/\//,"").sub(/\/$/,""), main_app.root_url, target: '_blank')
+  = t('.shop_html', link: link_to(main_app.root_url.sub(/http:\/\//,"").sub(/\/$/,""), main_app.root_url, target: '_blank'))
 %p &nbsp;
 %hr/
 %p &nbsp;
 %p.lead
-  = t :email_signup_text
+  = t('.signup_text')
 %p
-  = t :email_signup_help_html, email: mail_to(ContentConfig.footer_email)
+  = t('.help_html', email: mail_to(ContentConfig.footer_email))
 
 = render 'shared/mailers/signoff_instance'
 
diff --git a/app/views/subscription_mailer/confirmation_email.html.haml b/app/views/subscription_mailer/confirmation_email.html.haml
index dcd8e1c18e..2989296d1f 100644
--- a/app/views/subscription_mailer/confirmation_email.html.haml
+++ b/app/views/subscription_mailer/confirmation_email.html.haml
@@ -10,7 +10,7 @@
                    enterprise_for_logo: @enterprise_for_logo }
 
 %p.callout
-  = t("email_so_confirmation_explainer_html")
+  = t(".explainer_html")
   - if @order.user.present?
     = t("subscription_mailer.shared.edit_false_html",
       orders_close_at: l(@order.order_cycle.orders_close_at, format: mail_long_datetime_format),
@@ -21,7 +21,7 @@
 %h4
   = t("mailers_shared.order_confirmation_html", number: @order.number)
 %p
-  = t("email_so_confirmation_details_html", distributor: @order.distributor.name)
+  = t(".details_html", distributor: @order.distributor.name)
 
 = render 'spree/order_mailer/order_summary'
 
diff --git a/app/views/subscription_mailer/empty_email.html.haml b/app/views/subscription_mailer/empty_email.html.haml
index a31a60359f..0f263e6603 100644
--- a/app/views/subscription_mailer/empty_email.html.haml
+++ b/app/views/subscription_mailer/empty_email.html.haml
@@ -10,14 +10,14 @@
                    enterprise_for_logo: @enterprise_for_logo }
 
 %p.callout
-  = t("email_so_empty_explainer_html")
+  = t(".explainer_html")
   = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email)
 
 %p &nbsp;
 %h4
   = t("mailers_shared.order_confirmation_html", number: @order.number)
 %p
-  = t("email_so_empty_details_html", distributor: @order.distributor.name)
+  = t(".details_html", distributor: @order.distributor.name)
 
 = render 'spree/order_mailer/order_summary'
 
diff --git a/app/views/subscription_mailer/failed_payment_email.html.haml b/app/views/subscription_mailer/failed_payment_email.html.haml
index 42331d15fa..3becd41e60 100644
--- a/app/views/subscription_mailer/failed_payment_email.html.haml
+++ b/app/views/subscription_mailer/failed_payment_email.html.haml
@@ -10,7 +10,7 @@
                    enterprise_for_logo: @enterprise_for_logo }
 
 %p.callout
-  = t("email_so_failed_payment_explainer_html", distributor: @order.distributor.name)
+  = t(".explainer_html", distributor: @order.distributor.name)
   - if @order.user.present?
     = t("subscription_mailer.shared.edit_false_html",
       orders_close_at: l(@order.order_cycle.orders_close_at, format: mail_long_datetime_format),
@@ -22,7 +22,7 @@
   %h4
     = t("mailers_shared.order_confirmation_html", number: @order.number)
   %p
-    = t("email_so_failed_payment_details_html", distributor: @order.distributor.name)
+    = t(".details_html", distributor: @order.distributor.name)
     - @order.errors.full_messages.each do |message|
       = message
       %br
diff --git a/app/views/subscription_mailer/placement_email.html.haml b/app/views/subscription_mailer/placement_email.html.haml
index 5eeb3bf51d..b77f704f87 100644
--- a/app/views/subscription_mailer/placement_email.html.haml
+++ b/app/views/subscription_mailer/placement_email.html.haml
@@ -10,7 +10,7 @@
                    enterprise_for_logo: @enterprise_for_logo }
 
 %p.callout
-  = t("email_so_placement_explainer_html")
+  = t(".explainer_html")
 
   - if @order.user.present?
     - allow_changes = !!@order.distributor.allow_order_changes?
@@ -19,7 +19,7 @@
       order_url: order_url(@order))
     = t("subscription_mailer.shared.contact_distributor_html", distributor: @order.distributor.name, email: @order.distributor.contact.email)
   - else
-    = t("email_so_contact_distributor_to_change_order_html",
+    = 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)
@@ -28,11 +28,11 @@
 %h4
   = t("mailers_shared.order_confirmation_html", number: @order.number)
 %p
-  = t("email_so_placement_details_html", distributor: @order.distributor.name)
+  = t(".details_html", distributor: @order.distributor.name)
 
 - if @changes.any?
   %p.callout
-    = t("email_so_placement_changes")
+    = t(".changes")
 
 = render 'spree/order_mailer/order_summary'
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1686c4d537..89534972c7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -367,6 +367,16 @@ en:
 
 # E-Mails
 #
+# Are these used anywhere?
+  email_payment_method: "Paying via:"
+  email_confirmed: "Thank you for confirming your email address."
+  email_confirmation_greeting: "Hi, %{contact}!"
+  email_confirmation_profile_created: "A profile for %{name} has been successfully created!
+To activate your Profile we need to confirm this email address."
+  email_confirmation_help_html: "After confirming your email you can access your administration account for this enterprise.
+See the %{link} to find out more about %{sitename}'s features and to start using your profile or online store."
+
+# These are used!
   mailers_shared:
     customer_greeting: "Dear %{name},"
     enterprise_greeting: "Dear %{name},"
@@ -374,44 +384,47 @@ en:
     order_confirmation_html: "Order confirmation <strong>#%{number}</strong>"
   enterprise_mailer:
     confirmation_instructions:
-      subject: "Please confirm the email address for %{enterprise}"
+      subject: "Please confirm the email address for %{enterprise}" # I don't think this is ever used, because 'confirmation_instructions' is part of user_mailer and has a different subject defined.
     welcome:
       subject: "%{enterprise} is now on %{sitename}"
-      email_userguide_html: "The User Guide with detailed support for setting up your Producer or Hub is here: %{link}"
       greeting: "Welcome!"
       registered: "%{enterprise} is now part of %{sitename}!"
+      userguide_html: "The User Guide with detailed support for setting up your Producer or Hub is here: %{link}"
       userguide: "Open Food Network User Guide"
-      email_admin_html: "You can manage your account by logging into the %{link} or by clicking on the cog in the top right hand side of the homepage, and selecting Administration."
+      admin_html: "You can manage your account by logging into the %{link} or by clicking on the cog in the top right hand side of the homepage, and selecting Administration."
       admin_panel: "Admin Panel"
-      email_community_html: "We also have an online forum for community discussion related to OFN software and the unique challenges of running a food enterprise. You are encouraged to join in. We are constantly evolving and your input into this forum will shape what happens next. %{link}"
+      community_html: "We also have an online forum for community discussion related to OFN software and the unique challenges of running a food enterprise. You are encouraged to join in. We are constantly evolving and your input into this forum will shape what happens next. %{link}"
       join_community: "Join the community"
     manager_invitation:
       subject: "%{enterprise} has invited you to be a manager"
       invited_to_manage_html: "You have been invited to manage <strong>%{enterprise}</strong> on %{instance}."
+      confirm_your_email_html: "You should have received or will soon receive an email with a confirmation link. You won’t be able to access <strong>%{enterprise}'s</strong> profile until you have confirmed your email."
+      set_a_password: "You will then be prompted to set a password before you are able to administer the enterprise."
+      mistakenly_sent: "Not sure why you have received this email? Please contact %{owner_email} for more information."
   payment_mailer:
     authorize_payment:
+      subject: "Please authorize your payment to %{distributor} on OFN"
       intro_html: "Your payment of <strong>%{amount}</strong> to <strong>%{distributor}</strong> requires additional authentication."
       instructions: "Please visit the following URL to authorize your payment:"
     authorization_required:
+      subject: "A payment requires authorization from the customer"
       intro_html: "A payment for order <strong>%{order_number}</strong> at <strong>%{distributor}</strong> requires additional authorization from the customer."
       instructions: "The customer has been notified via email and the payment will appear as pending until it is authorized."
   producer_mailer:
     order_cycle_report:
       subject: "Order cycle report for %{producer}"
       intro_html: "An order cycle report is ready for <strong>%{producer}</strong>."
+      text_before: "Please find below an update about the order cycle ready for:"
+      order_text: "Here is a summary of the orders for your products:"
+      order_customer_text: "Here is a summary of the orders grouped by customers:"
+      delivery_instructions: "Stock pickup/delivery instructions:"
+      text_after: ""
   report_mailer:
     report_ready:
       subject: "Report ready"
       intro: "Your report is ready for download."
       message: "The link below will expire after one week."
       link_label: "%{name}"
-  shipment_mailer:
-    shipped_email:
-      shipment_summary: "Shipment Summary"
-      subject: "Shipment Notification"
-      thanks: "Thank you for your business."
-      track_information: "Tracking Information: %{tracking}"
-      track_link: "Tracking Link: %{url}"
   subscription_mailer:
     shared:
       edit_true_html: "You can <a href='%{order_url}'>make changes</a> until orders close on %{orders_close_at}."
@@ -419,12 +432,18 @@ en:
       contact_distributor_html: "If you have any questions you can contact <strong>%{distributor}</strong> via %{email}."
     placement_email:
       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}."
+      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:
       subject: A summary of recently placed subscription orders
       intro_html: "Below is a summary of the subscription orders that have just been placed for <strong>%{shop}</strong>."
     confirmation_email:
       payment_success_intro_html: "An automatic payment has been processed for your order from <strong>%{distributor}</strong>."
       confirmation_intro_html: "Your order with <strong>%{distributor}</strong> is now confirmed."
+      explainer_html: "This order was automatically placed for you, and it has now been finalised."
+      details_html: "Here's everything you need to know about your order from <strong>%{distributor}</strong>:"
     confirmation_summary_email:
       subject: A summary of recently confirmed subscription orders
       intro_html: "Below is a summary of the subscription orders that have just been finalised for <strong>%{shop}</strong>."
@@ -456,8 +475,12 @@ en:
         explainer: Automatic processing of these orders failed for an unknown reason. This should not occur, please contact us if you are seeing this.
     empty_email:
       intro_html: "We tried to place a new order with <strong>%{distributor}</strong>, but had some problems..."
+      explainer_html: "Unfortunately, none of products that you ordered were available, so no order has been placed. The original quantities that you requested appear crossed-out below."
+      details_html: "Here are the details of the unplaced order for <strong>%{distributor}</strong>:"
     failed_payment_email:
       intro_html: "We tried to process a payment for <strong>%{distributor}</strong>, but had some problems..."
+      explainer_html: "The payment for your subscription with <strong>%{distributor}</strong> failed because of a problem with your credit card. <strong>%{distributor}</strong> has been notified of this failed payment."
+      details_html: "Here are the details of the failure provided by the payment gateway:"
   shared:
     mailers:
       signoff_distributor:
@@ -2434,62 +2457,6 @@ en:
   products_at: "at %{distributor}"
   products_elsewhere: "Products found elsewhere"
 
-  email_confirmed: "Thank you for confirming your email address."
-  email_confirmation_activate_account: "Before we can activate your new account, we need to confirm your email address."
-  email_confirmation_greeting: "Hi, %{contact}!"
-  email_confirmation_profile_created: "A profile for %{name} has been successfully created!
-To activate your Profile we need to confirm this email address."
-  email_confirmation_click_link: "Please click the link below to confirm your email and to continue setting up your profile."
-  email_confirmation_link_label: "Confirm this email address »"
-  email_confirmation_help_html: "After confirming your email you can access your administration account for this enterprise.
-See the %{link} to find out more about %{sitename}'s features and to start using your profile or online store."
-  email_confirmation_notice_unexpected: "You received this message because you signed up on %{sitename}, or were invited to sign up by someone you probably know. If you don't understand why you are receiving this email, please write to %{contact}."
-
-  email_confirm_customer_details_html: "Here are your order details from <strong>%{distributor}</strong>:"
-  email_order_summary_item: "Item"
-  email_order_summary_quantity: "Qty"
-  email_order_summary_sku: "SKU"
-  email_order_summary_price: "Price"
-  email_order_summary_subtotal: "Subtotal:"
-  email_order_summary_total: "Total:"
-  email_order_summary_includes_tax: "(includes tax):"
-  email_payment_method: "Paying via:"
-  email_so_placement_details_html: "Here are the details of your order for <strong>%{distributor}</strong>:"
-  email_so_placement_changes: "Unfortunately, not all products that you requested were available. The original quantities that you requested appear crossed-out below."
-  email_so_placement_explainer_html: "This order was automatically created for you."
-  email_so_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}."
-  email_so_confirmation_explainer_html: "This order was automatically placed for you, and it has now been finalised."
-  email_so_confirmation_details_html: "Here's everything you need to know about your order from <strong>%{distributor}</strong>:"
-  email_so_empty_explainer_html: "Unfortunately, none of products that you ordered were available, so no order has been placed. The original quantities that you requested appear crossed-out below."
-  email_so_empty_details_html: "Here are the details of the unplaced order for <strong>%{distributor}</strong>:"
-  email_so_failed_payment_explainer_html: "The payment for your subscription with <strong>%{distributor}</strong> failed because of a problem with your credit card. <strong>%{distributor}</strong> has been notified of this failed payment."
-  email_so_failed_payment_details_html: "Here are the details of the failure provided by the payment gateway:"
-  email_shipping_delivery_details: Delivery details
-  email_shipping_delivery_time: "Delivery on:"
-  email_shipping_delivery_address: "Delivery address:"
-  email_shipping_collection_details: Collection details
-  email_shipping_collection_time: "Ready for collection:"
-  email_shipping_collection_instructions: "Collection instructions:"
-  email_special_instructions: "Your notes:"
-
-  email_signup_confirmed_email: "Thanks for confirming your email."
-  email_signup_shop_html: "You can now log in at %{link}."
-  email_signup_text: "Thanks for joining the network.
-  If you are a customer, we look forward to introducing you to many fantastic farmers, wonderful food hubs and delicious food!
-  If you are a producer or food enterprise, we are excited to have you as a part of the network."
-  email_signup_help_html: "We welcome all your questions and feedback; you can use the <em>Send Feedback</em> button on the site or email us at %{email}"
-
-  invite_email:
-    confirm_your_email: "You should have received or will soon receive an email with a confirmation link. You won’t be able to access %{enterprise}'s profile until you have confirmed your email."
-    set_a_password: "You will then be prompted to set a password before you are able to administer the enterprise."
-    mistakenly_sent: "Not sure why you have received this email? Please contact %{owner_email} for more information."
-
-  producer_mail_text_before: "Please find below an update about the order cycle ready for:"
-  producer_mail_order_text: "Here is a summary of the orders for your products:"
-  producer_mail_delivery_instructions: "Stock pickup/delivery instructions:"
-  producer_mail_text_after: ""
-  producer_mail_order_customer_text: "Here is a summary of the orders grouped by customers"
-
   shopping_oc_closed: Orders are closed
   shopping_oc_closed_description: "Please wait until the next cycle opens (or contact us directly to see if we can accept any late orders)"
   shopping_oc_last_closed: "The last cycle closed %{distance_of_time} ago"
@@ -3934,32 +3901,85 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   spree:
     order_mailer:
       cancel_email:
+        subject: "Cancellation of Order"
         instructions_html: "Your order with <strong>%{distributor}</strong> has been CANCELED. Please retain this cancellation information for your records."
+        dont_cancel: "If you have changed your mind or don't wish to cancel this order please contact %{email}"
+        order_summary_canceled_html: "<strong>Order Summary #%{number} [CANCELED]</strong>"
+        details: "Here are the details of what you ordered:"
+        paid_order: "Your order was paid so %{distributor} has refunded the full amount"
+        unpaid_order: "Your order was unpaid so no refund has been made"
+        credit_order: "Your order was paid so your account has been credited" # Is this used anywhere?
       cancel_email_for_shop:
+        subject: "Cancellation of Order"
         intro: "A customer has cancelled their order #%{number}."
+        view_cancelled_order: "View cancelled order"
       confirm_email_for_customer:
+        subject: "Order Confirmation"
         intro_html: "Thanks for shopping at <strong>%{distributor}</strong>!"
+        details_html: "Here are your order details from <strong>%{distributor}</strong>:"
       confirm_email_for_shop:
+        subject: "Order Confirmation"
         intro_html: "Well done! You have a new order for <strong>%{distributor}</strong>!"
       invoice_email:
         intro_html: "Please find attached an invoice for your recent order from <strong>%{distributor}</strong>."
+      order_summary:
+        item: "Item"
+        sku: "SKU"
+        quantity: "Qty"
+        price: "Price"
+        subtotal: "Subtotal:"
+        total: "Total:"
+        includes_tax: "(includes tax):"
+      shipping:
+        delivery_details: "Delivery details"
+        delivery_time: "Delivery on:"
+        delivery_address: "Delivery address:"
+        collection_details: "Collection details"
+        collection_time: "Ready for collection:"
+        collection_instructions: "Collection instructions:"
+      special_instructions:
+        special_instructions: "Your notes:"
     shipment_mailer:
       shipped_email:
+        subject: "Shipment Notification"
+        picked_up_subject: "Pick up Notification"
         shipped_intro_html: "Your order from <strong>%{distributor}</strong> has been shipped."
         picked_up_intro_html: "Your order from <strong>%{distributor}</strong> has been picked-up."
+        shipment_summary: "Shipment Summary"
+        track_information: ! "Tracking Information: %{tracking}"
+        track_link: ! "Tracking Link: %{url}"
+        thanks: "Thank you for your business."
     test_mailer:
       test_email:
+        subject: "Test Mail"
         greeting: "Congratulations!"
         message: "If you have received this email, then your email settings are correct."
     user_mailer:
       confirmation_instructions:
+        subject: "Please confirm your OFN account"
         welcome: "Welcome to %{sitename}!"
+        activate_account: "Before we can activate your new account, we need to confirm your email address."
+        click_link: "Please click the link below to confirm your email and to continue setting up your profile."
+        link_label: "Confirm this email address »"
+        notice_unexpected: "You received this message because you signed up on %{sitename}, or were invited to sign up by someone you probably know. If you don't understand why you are receiving this email, please write to %{contact}."
       signup_confirmation:
         welcome: "Welcome to %{sitename}!"
+        confirmed_email: "Thanks for confirming your email."
+        shop_html: "You can now log in at %{link}."
+        signup_text: "Thanks for joining the network.
+  If you are a customer, we look forward to introducing you to many fantastic farmers, wonderful food hubs and delicious food!
+  If you are a producer or food enterprise, we are excited to have you as a part of the network."
+        help_html: "We welcome all your questions and feedback; you can use the <em>Send Feedback</em> button on the site or email us at %{email}"
       reset_password_instructions:
+        subject: "Reset password instructions"
         request_sent_text: |
           A request to reset your password has been made.
           If you did not make this request, simply ignore this email.
+        link_text: >
+          If you did make this request just click the link below:
+        issue_text: |
+          If the above URL does not work try copying and pasting it into your browser.
+          If you continue to have problems please feel free to contact us.
 
     order_updated: "Order Updated"
     add_country: "Add country"
@@ -4707,46 +4727,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
       void: void
       invalid: invalid
       authorise: authorise
-    order_mailer:
-      cancel_email:
-        dont_cancel: "If you have changed your mind or don't wish to cancel this order please contact %{email}"
-        order_summary_canceled_html: "<strong>Order Summary #%{number} [CANCELED]</strong>"
-        details: "Here are the details of what you ordered:"
-        unpaid_order: "Your order was unpaid so no refund has been made"
-        paid_order: "Your order was paid so %{distributor} has refunded the full amount"
-        credit_order: "Your order was paid so your account has been credited"
-        subject: "Cancellation of Order"
-      cancel_email_for_shop:
-        subject: "Cancellation of Order"
-        view_cancelled_order: "View cancelled order"
-      confirm_email:
-        subject: "Order Confirmation"
-    user_mailer:
-      reset_password_instructions:
-        link_text: >
-          If you did make this request just click the link below:
-        issue_text: |
-          If the above URL does not work try copying and pasting it into your browser.
-          If you continue to have problems please feel free to contact us.
-        subject: "Reset password instructions"
-      confirmation_instructions:
-        subject: "Please confirm your OFN account"
-    payment_mailer:
-      authorize_payment:
-        subject: "Please authorize your payment to %{distributor} on OFN"
-      authorization_required:
-        subject: "A payment requires authorization from the customer"
-    shipment_mailer:
-      shipped_email:
-        shipment_summary: "Shipment Summary"
-        subject: "Shipment Notification"
-        thanks: "Thank you for your business."
-        track_information: ! "Tracking Information: %{tracking}"
-        track_link: ! "Tracking Link: %{url}"
-        picked_up_subject: "Pick up Notification"
-    test_mailer:
-      test_email:
-        subject: "Test Mail"
     order_state:
       address: address
       adjustments: adjustments