diff --git a/app/mailers/agent_notifications/conversation_notifications_mailer.rb b/app/mailers/agent_notifications/conversation_notifications_mailer.rb
index bc498d43b..a728bbbc6 100644
--- a/app/mailers/agent_notifications/conversation_notifications_mailer.rb
+++ b/app/mailers/agent_notifications/conversation_notifications_mailer.rb
@@ -61,10 +61,9 @@ class AgentNotifications::ConversationNotificationsMailer < ApplicationMailer
                   user: @agent,
                   conversation: @conversation,
                   inbox: @conversation.inbox,
-                  message: @message,
-                  sla_policy: @sla_policy
+                  message: @message
                 })
   end
 end
 
-AgentNotifications::ConversationNotificationsMailer.include_mod_with('AgentNotifications::ConversationNotificationsMailer')
+AgentNotifications::ConversationNotificationsMailer.prepend_mod_with('AgentNotifications::ConversationNotificationsMailer')
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 64fc8cebf..c6877c883 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -50,4 +50,4 @@ class ApplicationRecord < ActiveRecord::Base
   end
 end
 
-ApplicationRecord.include_mod_with('Enterprise::ApplicationRecord')
+ApplicationRecord.prepend_mod_with('ApplicationRecord')
diff --git a/enterprise/app/mailers/enterprise/agent_notifications/conversation_notifications_mailer.rb b/enterprise/app/mailers/enterprise/agent_notifications/conversation_notifications_mailer.rb
index df71beb10..8b153377d 100644
--- a/enterprise/app/mailers/enterprise/agent_notifications/conversation_notifications_mailer.rb
+++ b/enterprise/app/mailers/enterprise/agent_notifications/conversation_notifications_mailer.rb
@@ -29,4 +29,10 @@ module Enterprise::AgentNotifications::ConversationNotificationsMailer
     @action_url = app_account_conversation_url(account_id: @conversation.account_id, id: @conversation.display_id)
     send_mail_with_liquid(to: @agent.email, subject: "Conversation [ID - #{@conversation.display_id}] missed SLA for resolution time") and return
   end
+
+  def liquid_droppables
+    super.merge({
+                  sla_policy: @sla_policy
+                })
+  end
 end
diff --git a/enterprise/app/services/sla/evaluate_applied_sla_service.rb b/enterprise/app/services/sla/evaluate_applied_sla_service.rb
index 4cc953899..2da350289 100644
--- a/enterprise/app/services/sla/evaluate_applied_sla_service.rb
+++ b/enterprise/app/services/sla/evaluate_applied_sla_service.rb
@@ -50,6 +50,7 @@ class Sla::EvaluateAppliedSlaService
   end
 
   def get_last_message_id(conversation)
+    # TODO: refactor the method to fetch last message without reply
     conversation.messages.where(message_type: :incoming).last&.id
   end