diff --git a/app/views/assignment_mailer/conversation_assigned.html.erb b/app/views/assignment_mailer/conversation_assigned.html.erb
index d0c2cf0f8..2cb565ddb 100644
--- a/app/views/assignment_mailer/conversation_assigned.html.erb
+++ b/app/views/assignment_mailer/conversation_assigned.html.erb
@@ -2,4 +2,4 @@
 
 <p>Time to save the world. A new conversation has been assigned to you</p>
 
-<p>Click <%= link_to 'here', conversation_url(id: @conversation.display_id) %> to get cracking. </p>
+<p>Click <%= link_to 'here', app_conversation_url(id: @conversation.display_id) %> to get cracking. </p>
diff --git a/config/routes.rb b/config/routes.rb
index 8a55f2ac1..e810700d9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -13,7 +13,7 @@ Rails.application.routes.draw do
 
   resources :widgets, only: [:index]
 
-  namespace :api, :defaults => { :format => 'json' } do
+  namespace :api, defaults: { format: 'json' } do
     namespace :v1 do
       resources :callbacks, only: [] do
         collection do
@@ -76,18 +76,18 @@ Rails.application.routes.draw do
             get :summary
           end
         end
-      
+
         resources :webhooks, only: [] do
           collection do
             post :chargebee
           end
         end
       end
-
     end
   end
 
-  scope module: 'mailer' do
+  # Used in mailer templates
+  resource :app, only: [:index] do
     resources :conversations, only: [:show]
   end