html email template formatting updates

src/Core/MailTemplates/Handlebars/ChangeEmail.html.hbs

@@ -1,5 +1,5 @@
 {{#>FullHtmlLayout}}
 <p>
-    To finalize changing your email address enter the following code in the pop-up window: {{Token}}
+    To finalize changing your email address enter the following code in the pop-up window: <b>{{Token}}</b>
 </p>
 {{/FullHtmlLayout}}

src/Core/MailTemplates/Handlebars/ChangeEmailAlreadyExists.html.hbs

@@ -1,7 +1,7 @@
 {{#>FullHtmlLayout}}
 <p>
-    A user ({{FromEmail}}) recently tried to change their account to use this
+    A user ({{FromEmail}}) recently tried to change their account to use this email address ({{ToEmail}}).
-    email address ({{ToEmail}}). An account already exists with this email ({{ToEmail}}).
+    An account already exists with this email ({{ToEmail}}).
 </p>
 <p>
     If you did not try to change an email address, you can safely ignore this email.

src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs

@@ -1,8 +1,7 @@
 {{#>FullHtmlLayout}}
 <p>
-    This is a reminder that your Bitwarden subscription is due for renewal soon.
+    This is a reminder that your Bitwarden subscription is due for renewal soon. Your payment method on file will
-    Your payment method on file will be charged for <b>{{usd AmountDue}}</b> on
+    be charged for <b>{{usd AmountDue}}</b> on <b>{{date DueDate 'MMM dd, yyyy'}}</b>.
-    <b>{{date DueDate 'MMM dd, yyyy'}}</b>.
 </p>
 {{#if Items}}
 <p>
@@ -13,9 +12,8 @@
 </p>
 {{/if}}
 <p>
-    To avoid any interruption in service, please ensure that your payment method
+    To avoid any interruption in service, please ensure that your payment method on file is up to date and can be
-    on file is up to date and can be charged for the above amount. You can manage your
+    charged for the above amount. You can manage your subscription and payment method by logging into the web vault at
-    subscription and payment method by logging into the web vault at
     {{{link WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account.
 </p>
 {{#if MentionInvoices}}
@@ -24,7 +22,6 @@
 </p>
 {{/if}}
 <p>
-    If you have any questions or problems, please feel free to email us at
+    If you have any questions or problems, please feel free to email us at hello@bitwarden.com.
-    hello@bitwarden.com.
 </p>
 {{/FullHtmlLayout}}

src/Core/MailTemplates/Handlebars/NoMasterPasswordHint.html.hbs

@@ -1,7 +1,7 @@
 {{#>FullHtmlLayout}}
 <p>
-    You (or someone) recently requested your master password hint.
+    You (or someone) recently requested your master password hint. Unfortunately, your account does not have a
-    Unfortunately, your account does not have a master password hint.
+    master password hint.
 </p>
 <p>If you did not request your master password hint you can safely ignore this email.</p>
 {{/FullHtmlLayout}}

src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs

@@ -1,5 +1,5 @@
 {{#>FullHtmlLayout}}
-<p>This email is to notify you that {{UserEmail}} has accepted your invitation to join {{OrganizationName}}.</p>
+<p>This email is to notify you that {{UserEmail}} has accepted your invitation to join <b>{{OrganizationName}}</b>.</p>
-<p>To confirm this user, log into the Bitwarden web vault, manage your organization "People, and confirm the user.</p>
+<p>To confirm this user, log into the Bitwarden web vault, manage your organization "People", and confirm the user.</p>
 <p>If you do not wish to confirm this user, you can also remove them from the organization on the same page.</p>
 {{/FullHtmlLayout}}

src/Core/MailTemplates/Handlebars/OrganizationUserConfirmed.html.hbs

@@ -1,4 +1,4 @@
 {{#>FullHtmlLayout}}
-<p>This email is to notify you that you have been confirmed as a user of {{OrganizationName}}.</p>
+<p>This email is to notify you that you have been confirmed as a user of <b>{{OrganizationName}}</b>.</p>
 <p>Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault.</p>
 {{/FullHtmlLayout}}

src/Core/MailTemplates/Handlebars/OrganizationUserInvited.html.hbs

@@ -1,7 +1,7 @@
 {{#>FullHtmlLayout}}
 <p>
-    You have been invited to join the {{OrganizationName}} organization.
+    You have been invited to join the {{OrganizationName}} organization. To accept this invite, click the following
-    To accept this invite, click the following link:
+    link:
 </p>
 <p>{{{link Url 'true'}}}</p>
 <p>

src/Core/MailTemplates/Handlebars/TwoFactorEmail.html.hbs

@@ -1,6 +1,6 @@
 {{#>FullHtmlLayout}}
 <p>
-    Your two-step verification code is: {{Token}}
+    Your two-step verification code is: <b>{{Token}}</b>
 </p>
 <p>
     Use this code to complete logging in with Bitwarden.

src/Core/MailTemplates/Handlebars/VerifyDelete.html.hbs

@@ -1,7 +1,7 @@
 {{#>FullHtmlLayout}}
 <p>
-    Click the link below to delete your Bitwarden account ({{Email}}).
+    Click the link below to delete your Bitwarden account ({{Email}}). If you did not request this email to delete
-    If you did not request this email to delete your Bitwarden account, you can safely ignore it.
+    your Bitwarden account, you can safely ignore it.
 </p>
 <p>{{{link Url 'true'}}}</p>
 {{/FullHtmlLayout}}

src/Core/MailTemplates/Handlebars/VerifyEmail.html.hbs

@@ -1,7 +1,7 @@
 {{#>FullHtmlLayout}}
 <p>
-    Verify this email address for your Bitwarden account by clicking the following link.
+    Verify this email address for your Bitwarden account by clicking the following link. If you did not request this
-    If you did not request this email to verify a Bitwarden account, you can safely ignore it.
+    email to verify a Bitwarden account, you can safely ignore it.
 </p>
 <p>{{{link Url 'true'}}}</p>
 {{/FullHtmlLayout}}