diff --git a/src/topics/follow.js b/src/topics/follow.js
index 5d0de0e5a5..f26fa20a46 100644
--- a/src/topics/follow.js
+++ b/src/topics/follow.js
@@ -259,12 +259,7 @@ module.exports = function (Topics) {
 								subject: '[' + (meta.config.title || 'NodeBB') + '] ' + title,
 								intro: '[[notifications:user_posted_to, ' + postData.user.username + ', ' + titleEscaped + ']]',
 								postBody: postData.content.replace(/"\/\//g, '"https://'),
-								username: data.userData.username,
-								userslug: data.userData.userslug,
-								url: nconf.get('url') + '/topic/' + postData.topic.tid,
 								topicSlug: postData.topic.slug,
-								postCount: postData.topic.postcount,
-								base_url: nconf.get('url'),
 								showUnsubscribe: true,
 							}, next);
 						} else {
diff --git a/src/views/emails/notif_post.tpl b/src/views/emails/notif_post.tpl
index 917926a390..e2f7921a47 100644
--- a/src/views/emails/notif_post.tpl
+++ b/src/views/emails/notif_post.tpl
@@ -17,11 +17,7 @@
 			<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
 				<tr>
 					<td style="padding: 40px; font-family: sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
-						<p style="margin: 0;">{intro}</p>
-					</td>
-				</tr>
-				<tr>
-					<td style="padding: 60px; font-family: sans-serif; font-size: 12px; font-style: italic; line-height: 20px; color: #777777;">
+						<p style="margin: 0 0 20px 0;">{intro}</p>
 						<p style="margin: 0;">{postBody}</p>
 					</td>
 				</tr>
@@ -31,7 +27,7 @@
 						<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" style="margin: auto;">
 							<tr>
 								<td style="border-radius: 3px; background: #222222; text-align: center;" class="button-td">
-									<a href="{url}" style="background: #222222; border: 15px solid #222222; font-family: sans-serif; font-size: 13px; line-height: 1.1; text-align: center; text-decoration: none; display: block; border-radius: 3px; font-weight: bold;" class="button-a">
+									<a href="{url}{topicSlug}" style="background: #222222; border: 15px solid #222222; font-family: sans-serif; font-size: 13px; line-height: 1.1; text-align: center; text-decoration: none; display: block; border-radius: 3px; font-weight: bold;" class="button-a">
 										<span style="color:#ffffff;" class="button-link">&nbsp;&nbsp;&nbsp;&nbsp;[[email:notif.post.cta]]&nbsp;&nbsp;&nbsp;&nbsp;</span>
 									</a>
 								</td>
diff --git a/src/views/emails/partials/footer.tpl b/src/views/emails/partials/footer.tpl
index 236887425c..2d891efaa9 100644
--- a/src/views/emails/partials/footer.tpl
+++ b/src/views/emails/partials/footer.tpl
@@ -1,7 +1,7 @@
 			<!-- Email Footer : BEGIN -->
 			<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="max-width: 680px;">
 				<tr>
-					<td style="padding: 40px 10px;width: 100%;font-size: 12px; font-family: sans-serif; line-height:18px; text-align: center; color: #888888;" class="x-gmail-data-detectors">
+					<td style="padding: 40px 10px;width: 100%;font-size: 12px; font-family: sans-serif; line-height:18px; text-align: center; color: #888888;">
 						<br><br>
 						<!-- IF showUnsubscribe -->
 						[[email:notif.post.unsub.info]] <a href="{base_url}/user/{userslug}/settings">[[email:unsub.cta]]</a>.