diff --git a/src/Core/MailTemplates/Handlebars/ChangeEmail.html.hbs b/src/Core/MailTemplates/Handlebars/ChangeEmail.html.hbs index 74f5de47e8..d188accc8a 100644 --- a/src/Core/MailTemplates/Handlebars/ChangeEmail.html.hbs +++ b/src/Core/MailTemplates/Handlebars/ChangeEmail.html.hbs @@ -1,5 +1,14 @@ {{#>FullHtmlLayout}} -

- To finalize changing your email address enter the following code in the pop-up window: {{Token}} -

+ + + + + + + +
+ To finalize changing your Bitwarden email address enter the following code in the pop-up window: {{Token}} +
+ If you did not try to change an email address, you can safely ignore this email. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/ChangeEmail.text.hbs b/src/Core/MailTemplates/Handlebars/ChangeEmail.text.hbs index 38ba8741a5..2aa959804c 100644 --- a/src/Core/MailTemplates/Handlebars/ChangeEmail.text.hbs +++ b/src/Core/MailTemplates/Handlebars/ChangeEmail.text.hbs @@ -1,3 +1,5 @@ {{#>BasicTextLayout}} -To finalize changing your email address enter the following code in the pop-up window: {{Token}} +To finalize changing your Bitwarden email address enter the following code in the pop-up window: {{Token}} + +If you did not try to change an email address, you can safely ignore this email. {{/BasicTextLayout}} \ No newline at end of file diff --git a/src/Core/MailTemplates/Handlebars/ChangeEmailAlreadyExists.html.hbs b/src/Core/MailTemplates/Handlebars/ChangeEmailAlreadyExists.html.hbs index a913793a8c..59fc6a16a7 100644 --- a/src/Core/MailTemplates/Handlebars/ChangeEmailAlreadyExists.html.hbs +++ b/src/Core/MailTemplates/Handlebars/ChangeEmailAlreadyExists.html.hbs @@ -1,9 +1,14 @@ {{#>FullHtmlLayout}} -

- A user ({{FromEmail}}) recently tried to change their account to use this email address ({{ToEmail}}). - An account already exists with this email ({{ToEmail}}). -

-

- If you did not try to change an email address, you can safely ignore this email. -

+ + + + + + + +
+ A user ({{FromEmail}}) recently tried to change their account to use this email address ({{ToEmail}}). An account already exists with this email ({{ToEmail}}). +
+ If you did not try to change an email address, you can safely ignore this email. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs index 15214375c4..735a131979 100644 --- a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs +++ b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs @@ -1,27 +1,37 @@ {{#>FullHtmlLayout}} -

- This is a reminder that your Bitwarden subscription is due for renewal soon. Your payment method on file will - be charged for {{usd AmountDue}} on {{date DueDate 'MMM dd, yyyy'}}. -

-{{#if Items}} -

- Summary Of Charges
- {{#each Items}} - {{this}}
- {{/each}} -

-{{/if}} -

- To avoid any interruption in service, please ensure that your payment method on file is up to date and can be - charged for the above amount. You can manage your subscription and payment method by logging into the web vault at - {{{link WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account. -

-{{#if MentionInvoices}} -

- Invoices for your payments can also be downloaded from Billing page for your account. -

-{{/if}} -

- If you have any questions or problems, please feel free to email us at hello@bitwarden.com. -

+ + + + + {{#if Items}} + + + + {{/if}} + + + + {{#if MentionInvoices}} + + + + {{/if}} + + + +
+ This is a reminder that your Bitwarden subscription is due for renewal soon. Your payment method on file will be charged for {{usd AmountDue}} on {{date DueDate 'MMM dd, yyyy'}}. +
+ Summary Of Charges
+ {{#each Items}} + {{this}}
+ {{/each}} +
+ To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription and payment method by logging into the web vault at {{{link WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account. +
+ Invoices for your payments can also be downloaded from Billing page for your account. +
+ If you have any questions or problems, please feel free to email us at hello@bitwarden.com. +
{{/FullHtmlLayout}} + diff --git a/src/Core/MailTemplates/Handlebars/MasterPasswordHint.html.hbs b/src/Core/MailTemplates/Handlebars/MasterPasswordHint.html.hbs index 5b5b9324ff..74d6a1dbbc 100644 --- a/src/Core/MailTemplates/Handlebars/MasterPasswordHint.html.hbs +++ b/src/Core/MailTemplates/Handlebars/MasterPasswordHint.html.hbs @@ -1,8 +1,20 @@ {{#>FullHtmlLayout}} -

You (or someone) recently requested your master password hint.

-

- Your hint is: "{{Hint}}"
- Log in: {{{link WebVaultUrl}}} -

-

If you did not request your master password hint you can safely ignore this email.

+ + + + + + + + + + +
+ You (or someone) recently requested your master password hint. +
+ Your hint is: "{{Hint}}"
+ Log in: {{{link WebVaultUrl}}} +
+ If you did not request your master password hint you can safely ignore this email. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/NoMasterPasswordHint.html.hbs b/src/Core/MailTemplates/Handlebars/NoMasterPasswordHint.html.hbs index a4cd81c775..308b1da938 100644 --- a/src/Core/MailTemplates/Handlebars/NoMasterPasswordHint.html.hbs +++ b/src/Core/MailTemplates/Handlebars/NoMasterPasswordHint.html.hbs @@ -1,7 +1,14 @@ {{#>FullHtmlLayout}} -

- You (or someone) recently requested your master password hint. Unfortunately, your account does not have a - master password hint. -

-

If you did not request your master password hint you can safely ignore this email.

+ + + + + + + +
+ You (or someone) recently requested your master password hint. Unfortunately, your account does not have a master password hint. +
+ If you did not request your master password hint you can safely ignore this email. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs b/src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs index 16a7eced46..bd8cc6b8a3 100644 --- a/src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs +++ b/src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs @@ -1,5 +1,19 @@ {{#>FullHtmlLayout}} -

This email is to notify you that {{UserEmail}} has accepted your invitation to join {{OrganizationName}}.

-

To confirm this user, log into the Bitwarden web vault, manage your organization "People", and confirm the user.

-

If you do not wish to confirm this user, you can also remove them from the organization on the same page.

+ + + + + + + + + + +
+ This email is to notify you that {{UserEmail}} has accepted your invitation to join {{OrganizationName}}. +
+ To confirm this user, log into the Bitwarden web vault, manage your organization "People", and confirm the user. +
+ If you do not wish to confirm this user, you can also remove them from the organization on the same page. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/OrganizationUserConfirmed.html.hbs b/src/Core/MailTemplates/Handlebars/OrganizationUserConfirmed.html.hbs index 11117bab0e..81b6628c7d 100644 --- a/src/Core/MailTemplates/Handlebars/OrganizationUserConfirmed.html.hbs +++ b/src/Core/MailTemplates/Handlebars/OrganizationUserConfirmed.html.hbs @@ -1,4 +1,14 @@ {{#>FullHtmlLayout}} -

This email is to notify you that you have been confirmed as a user of {{OrganizationName}}.

-

Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault.

+ + + + + + + +
+ This email is to notify you that you have been confirmed as a user of {{OrganizationName}}. +
+ Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/OrganizationUserInvited.html.hbs b/src/Core/MailTemplates/Handlebars/OrganizationUserInvited.html.hbs index 2a096c9463..e1e7ba9597 100644 --- a/src/Core/MailTemplates/Handlebars/OrganizationUserInvited.html.hbs +++ b/src/Core/MailTemplates/Handlebars/OrganizationUserInvited.html.hbs @@ -1,11 +1,21 @@ {{#>FullHtmlLayout}} -

- You have been invited to join the {{OrganizationName}} organization. To accept this invite, click the following - link: -

-

{{{link Url 'true'}}}

-

- If you do not wish to join this organization, you can safely ignore - this email. -

+ + + + + + + + + + +
+ You have been invited to join the {{OrganizationName}} organization. +
+ + Join Organization Now + +
+ If you do not wish to join this organization, you can safely ignore this email. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/PasswordlessSignIn.html.hbs b/src/Core/MailTemplates/Handlebars/PasswordlessSignIn.html.hbs index 7bfa7288f7..0278cd54fb 100644 --- a/src/Core/MailTemplates/Handlebars/PasswordlessSignIn.html.hbs +++ b/src/Core/MailTemplates/Handlebars/PasswordlessSignIn.html.hbs @@ -1,9 +1,21 @@ {{#>FullHtmlLayout}} -

- Click the following link to log in: -

-

{{{link Url 'true'}}}

-

- If you did not request to log in, you can safely ignore this email. -

+ + + + + + + + + + +
+ Click the following link to log in: +
+ + Log In + +
+ If you did not request to log in, you can safely ignore this email. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/TwoFactorEmail.html.hbs b/src/Core/MailTemplates/Handlebars/TwoFactorEmail.html.hbs index fe14a0f1ae..be51c4e9f3 100644 --- a/src/Core/MailTemplates/Handlebars/TwoFactorEmail.html.hbs +++ b/src/Core/MailTemplates/Handlebars/TwoFactorEmail.html.hbs @@ -1,8 +1,14 @@ {{#>FullHtmlLayout}} -

- Your two-step verification code is: {{Token}} -

-

- Use this code to complete logging in with Bitwarden. -

+ + + + + + + +
+ Your two-step verification code is: {{Token}} +
+ Use this code to complete logging in with Bitwarden. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/VerifyDelete.html.hbs b/src/Core/MailTemplates/Handlebars/VerifyDelete.html.hbs index 10a7597ffb..82fb9b0bc9 100644 --- a/src/Core/MailTemplates/Handlebars/VerifyDelete.html.hbs +++ b/src/Core/MailTemplates/Handlebars/VerifyDelete.html.hbs @@ -1,7 +1,21 @@ {{#>FullHtmlLayout}} -

- Click the link below to delete your Bitwarden account ({{Email}}). If you did not request this email to delete - your Bitwarden account, you can safely ignore it. -

-

{{{link Url 'true'}}}

+ + + + + + + + + + +
+ Click the link below to delete your Bitwarden account. +
+ + Delete Your Account + +
+ If you did not request this email to delete your Bitwarden account, you can safely ignore it. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/VerifyDelete.text.hbs b/src/Core/MailTemplates/Handlebars/VerifyDelete.text.hbs index 6d9f508c64..959cafeba1 100644 --- a/src/Core/MailTemplates/Handlebars/VerifyDelete.text.hbs +++ b/src/Core/MailTemplates/Handlebars/VerifyDelete.text.hbs @@ -1,5 +1,7 @@ {{#>BasicTextLayout}} -Click the link below to delete your Bitwarden account ({{Email}}). If you did not request this email to delete your Bitwarden account, you can safely ignore it. +Click the link below to delete your Bitwarden account ({{Email}}). {{{Url}}} + +If you did not request this email to delete your Bitwarden account, you can safely ignore it. {{/BasicTextLayout}} \ No newline at end of file diff --git a/src/Core/MailTemplates/Handlebars/VerifyEmail.html.hbs b/src/Core/MailTemplates/Handlebars/VerifyEmail.html.hbs index 160c84d6ec..0d97298bac 100644 --- a/src/Core/MailTemplates/Handlebars/VerifyEmail.html.hbs +++ b/src/Core/MailTemplates/Handlebars/VerifyEmail.html.hbs @@ -1,7 +1,21 @@ {{#>FullHtmlLayout}} -

- Verify this email address for your Bitwarden account by clicking the following link. If you did not request this - email to verify a Bitwarden account, you can safely ignore it. -

-

{{{link Url 'true'}}}

+ + + + + + + + + + +
+ Verify this email address for your Bitwarden account by clicking the link below. +
+ + Verify Email Address Now + +
+ If you did not request to verify a Bitwarden account, you can safely ignore this email. +
{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/VerifyEmail.text.hbs b/src/Core/MailTemplates/Handlebars/VerifyEmail.text.hbs index 3a7fde5305..eb14353c3c 100644 --- a/src/Core/MailTemplates/Handlebars/VerifyEmail.text.hbs +++ b/src/Core/MailTemplates/Handlebars/VerifyEmail.text.hbs @@ -1,5 +1,7 @@ {{#>BasicTextLayout}} -Verify this email address for your Bitwarden account by clicking the following link. If you did not request this email to verify a Bitwarden account, you can safely ignore it. +Verify this email address for your Bitwarden account by clicking the link below. {{{Url}}} + +If you did not request to verify a Bitwarden account, you can safely ignore this email. {{/BasicTextLayout}} \ No newline at end of file