diff --git a/detox/e2e/support/test_config.js b/detox/e2e/support/test_config.js
index f435c6cad..05e7f2f35 100644
--- a/detox/e2e/support/test_config.js
+++ b/detox/e2e/support/test_config.js
@@ -4,7 +4,7 @@
 module.exports = {
     serverUrl: process.env.SITE_URL || (process.env.IOS ? 'http://localhost:8065' : 'http://10.0.2.2:8065'),
     siteUrl: process.env.SITE_URL || 'http://localhost:8065',
-    smtpUrl: process.env.SMTP_URL || 'http://localhost:10080',
+    smtpUrl: process.env.SMTP_URL || 'http://localhost:9001',
     adminEmail: process.env.ADMIN_EMAIL || 'sysadmin@sample.mattermost.com',
     adminUsername: process.env.ADMIN_USERNAME || 'sysadmin',
     adminPassword: process.env.ADMIN_PASSWORD || 'Sys@dmin-sample1',
diff --git a/detox/e2e/support/utils/email.js b/detox/e2e/support/utils/email.js
index db5858337..f5cd347af 100644
--- a/detox/e2e/support/utils/email.js
+++ b/detox/e2e/support/utils/email.js
@@ -11,7 +11,7 @@ import testConfig from '@support/test_config';
  * @returns {string} email url
  */
 export const getEmailUrl = () => {
-    const smtpUrl = testConfig.smtpUrl || 'http://localhost:10080';
+    const smtpUrl = testConfig.smtpUrl || 'http://localhost:9001';
 
     return `${smtpUrl}/api/v1/mailbox`;
 };
@@ -82,6 +82,7 @@ export const getMentionEmailTemplate = (sender, message, postId, siteName, teamN
         '<skip-local-time-check>',
         '',
         channelDisplayName,
+        '',
         message,
         '',
         'Want to change your notifications settings?',