diff --git a/app/jobs/domain_delete_confirm_job.rb b/app/jobs/domain_delete_confirm_job.rb
index 9b30a6cbd..5d1e27bb6 100644
--- a/app/jobs/domain_delete_confirm_job.rb
+++ b/app/jobs/domain_delete_confirm_job.rb
@@ -2,7 +2,7 @@ class DomainDeleteConfirmJob < Que::Job
   def run(domain_id, action)
     # it's recommended to keep transaction against job table as short as possible.
     ActiveRecord::Base.transaction do
-      domain = Epp::Domain.find(domain_id)
+      domain = Epp::Domain.find(domain_id).include(:registrar)
       case action
       when RegistrantVerification::CONFIRMED
         domain.poll_message!(:poll_pending_delete_confirmed_by_registrant)
diff --git a/app/jobs/domain_update_confirm_job.rb b/app/jobs/domain_update_confirm_job.rb
index c668307a6..975ad885c 100644
--- a/app/jobs/domain_update_confirm_job.rb
+++ b/app/jobs/domain_update_confirm_job.rb
@@ -2,7 +2,7 @@ class DomainUpdateConfirmJob < Que::Job
   def run(domain_id, action)
     # it's recommended to keep transaction against job table as short as possible.
     ActiveRecord::Base.transaction do
-      domain = Epp::Domain.find(domain_id)
+      domain = Epp::Domain.find(domain_id).include(:registrar)
       case action
       when RegistrantVerification::CONFIRMED
         domain.poll_message!(:poll_pending_update_confirmed_by_registrant)
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 76a1f89fa..45924e5b7 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -350,7 +350,7 @@ class Domain < ActiveRecord::Base
 
   def poll_message!(message_key)
     registrar.messages.create!(
-      body: I18n.t(message_key),
+      body: "#{I18n.t(message_key)}: #{name}",
       attached_obj_id: id,
       attached_obj_type: self.class.to_s
     )
diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb
index 18e5f8f60..0befd7e09 100644
--- a/spec/models/domain_spec.rb
+++ b/spec/models/domain_spec.rb
@@ -419,9 +419,9 @@ describe Domain do
     end
 
     it 'should add poll message to registrar' do
-      domain = Fabricate(:domain)
+      domain = Fabricate(:domain, name: 'testpollmessage123.ee')
       domain.poll_message!(:poll_pending_update_confirmed_by_registrant)
-      domain.registrar.messages.first.body.should == 'Registrant confirmed domain update'
+      domain.registrar.messages.first.body.should == 'Registrant confirmed domain update: testpollmessage123.ee'
     end
 
     context 'about registrant update confirm' do