diff --git a/app/mailers/contact_mailer.rb b/app/mailers/contact_mailer.rb
index bbfecfca6..308bdd827 100644
--- a/app/mailers/contact_mailer.rb
+++ b/app/mailers/contact_mailer.rb
@@ -1,5 +1,6 @@
 class ContactMailer < ApplicationMailer
   include Que::Mailer
+  helper_method :address_processing
 
   def email_updated(old_email, email, contact_id, should_deliver)
     @contact   = Contact.find_by(id: contact_id)
@@ -32,4 +33,10 @@ class ContactMailer < ApplicationMailer
       logger.info "EMAIL SENDING FAILED: #{email}: #{e}"
     end
   end
+
+  private
+
+  def address_processing
+    Contact.address_processing?
+  end
 end
diff --git a/app/views/mailers/contact_mailer/email_updated.html.erb b/app/views/mailers/contact_mailer/email_updated.html.erb
index 6c88f5009..cde26e0c8 100644
--- a/app/views/mailers/contact_mailer/email_updated.html.erb
+++ b/app/views/mailers/contact_mailer/email_updated.html.erb
@@ -1,3 +1,6 @@
+<%
+    contact = RegistrantPresenter.new(registrant: @contact, view: self)
+%>
 Tere <%= @contact.name %>
 <br><br>
 Kontakti <%= @contact.name %> e-posti aadress on muudetud<br>
@@ -14,13 +17,7 @@ Muudatusega seotud domeenid:<br>
 <% end %>
 <br>
 Kontaktandmed:<br>
-Nimi: <%= @contact.name %><br>
-Isikukood: <%= @contact.ident %><br>
-E-post: <%= @contact.email %><br>
-Tel: <%= @contact.phone %><br>
-Tänav: <%= @contact.street %><br>
-Linn: <%= @contact.city %><br>
-Riik: <%= @contact.country %>
+<%= render 'mailers/shared/registrant/registrant.et.html', registrant: contact %>
 <br><br>
 Lugupidamisega<br>
 Eesti Interneti Sihtasutus
@@ -43,13 +40,7 @@ Domains affected by this update:<br>
 <% end %>
 <br>
 Contact information:<br>
-Name: <%= @contact.name %><br>
-Identity Code: <%= @contact.ident %><br>
-E-mail: <%= @contact.email %><br>
-Tel: <%= @contact.phone %><br>
-Street: <%= @contact.street %><br>
-City: <%= @contact.city %><br>
-Country: <%= @contact.country %>
+<%= render 'mailers/shared/registrant/registrant.en.html', registrant: contact %>
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation
diff --git a/app/views/mailers/contact_mailer/email_updated.text.erb b/app/views/mailers/contact_mailer/email_updated.text.erb
index 56cb319bc..a8f02b669 100644
--- a/app/views/mailers/contact_mailer/email_updated.text.erb
+++ b/app/views/mailers/contact_mailer/email_updated.text.erb
@@ -1,3 +1,6 @@
+<%
+    contact = RegistrantPresenter.new(registrant: @contact, view: self)
+%>
 Tere <%= @contact.name %>
 
 Kontakti <%= @contact.name %> e-posti aadress on muudetud
@@ -14,13 +17,7 @@ Muudatusega seotud domeenid:
 <% end %>
 
 Kontaktandmed:
-Nimi: <%= @contact.name %>
-Isikukood: <%= @contact.ident %>
-E-post: <%= @contact.email %>
-Tel: <%= @contact.phone %>
-Tänav: <%= @contact.street %>
-Linn: <%= @contact.city %>
-Riik: <%= @contact.country %>
+<%= render 'mailers/shared/registrant/registrant.et.text', registrant: contact %>
 
 Lugupidamisega
 Eesti Interneti Sihtasutus
@@ -43,13 +40,7 @@ Domains affected by this update:
 <% end %>
 
 Contact information:
-Name: <%= @contact.name %>
-Identity Code: <%= @contact.ident %>
-E-mail: <%= @contact.email %>
-Tel: <%= @contact.phone %>
-Street: <%= @contact.street %>
-City: <%= @contact.city %>
-Country: <%= @contact.country %>
+<%= render 'mailers/shared/registrant/registrant.en.text', registrant: contact %>
 
 Best Regards,
 Estonian Internet Foundation