diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assigned.html.erb b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assigned.html.erb
index 2cb565ddb..73963708e 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assigned.html.erb
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_assigned.html.erb
@@ -2,4 +2,9 @@
 
 <p>Time to save the world. A new conversation has been assigned to you</p>
 
-<p>Click <%= link_to 'here', app_conversation_url(id: @conversation.display_id) %> to get cracking. </p>
+<p>
+Click <%=
+  link_to 'here',
+  app_account_conversation_url(account_id: @conversation.account_id, id: @conversation.display_id)
+%> to get cracking.
+</p>
diff --git a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_created.html.erb b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_created.html.erb
index 091cce51f..75db9a961 100644
--- a/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_created.html.erb
+++ b/app/views/mailers/agent_notifications/conversation_notifications_mailer/conversation_created.html.erb
@@ -2,4 +2,9 @@
 
 <p>Time to save the world. A new conversation has been created in <%= @conversation.inbox.name %></p>
 
-<p>Click <%= link_to 'here', app_conversation_url(id: @conversation.display_id) %> to get cracking. </p>
+<p>
+Click <%=
+  link_to 'here',
+  app_account_conversation_url(account_id: @conversation.account_id, id: @conversation.display_id)
+%> to get cracking.
+</p>
diff --git a/config/routes.rb b/config/routes.rb
index cf0d9a84c..978d394f4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -136,7 +136,9 @@ Rails.application.routes.draw do
   # ----------------------------------------------------------------------
   # Used in mailer templates
   resource :app, only: [:index] do
-    resources :conversations, only: [:show]
+    resources :accounts do
+      resources :conversations, only: [:show]
+    end
   end
 
   # ----------------------------------------------------------------------