diff --git a/src/messaging.js b/src/messaging.js
index 980dc13e86..339ec7798c 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -78,7 +78,7 @@ var db = require('./database'),
 								if (!messages || !messages[0]) {
 									return next(null, null);
 								}
-								
+
 								messages[0].newSet = isNewSet;
 								messages[0].mid = mid;
 								next(null, messages[0]);
@@ -341,7 +341,8 @@ var db = require('./database'),
 						summary: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
 						message: messageObj,
 						site_title: meta.config.title || 'NodeBB',
-						url: nconf.get('url') + '/chats/' + utils.slugify(messageObj.fromUser.username)
+						url: nconf.get('url'),
+						fromUserslug: utils.slugify(messageObj.fromUser.username)
 					});
 				}
 			});
diff --git a/src/views/emails/notif_chat.tpl b/src/views/emails/notif_chat.tpl
index 39bbe1e6cd..a7e6be420d 100644
--- a/src/views/emails/notif_chat.tpl
+++ b/src/views/emails/notif_chat.tpl
@@ -3,7 +3,7 @@
 <p>{summary}:</p>
 <blockquote>{message.content}</blockquote>
 
-<a href="{url}">[[email:notif.chat.cta]]</a>
+<a href="{url}/chats/{fromUserslug}">[[email:notif.chat.cta]]</a>
 
 <p>
 	[[email:closing]]<br />
diff --git a/src/views/emails/notif_chat_plaintext.tpl b/src/views/emails/notif_chat_plaintext.tpl
index a7b78ee481..3ecc1f82fc 100644
--- a/src/views/emails/notif_chat_plaintext.tpl
+++ b/src/views/emails/notif_chat_plaintext.tpl
@@ -4,7 +4,7 @@
 
 {message.content}
 
-[[email:notif.chat.cta]]: {url}
+[[email:notif.chat.cta]]: {url}/chats/{fromUserslug}
 
 
 [[email:closing]]