work on golden-files

coder · defelmnq · Mar 21, 2025 · Mar 18, 2025 · Mar 18, 2025 · Mar 18, 2025
commit 672e4c5c170b13f4710e574ac8456c86a132b27a
diff --git a/coderd/database/migrations/000302_remove_greetings_notifications_templates.down.sql b/coderd/database/migrations/000302_remove_greetings_notifications_templates.down.sql
@@ -1,12 +1,27 @@
-UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nYour workspace **{{.Labels.name}}** was deleted.\nThe specified reason was "**{{.Labels.reason}}{{ if .Labels.initiator }} ({{ .Labels.initiator }}){{end}}**".' WHERE id = 'f517da0b-cdc9-410f-ab89-a86107c420ed';
-UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nAutomatic build of your workspace **{{.Labels.name}}** failed.\nThe specified reason was "**{{.Labels.reason}}**".' WHERE id = '381df2a9-c0c0-4749-420f-80a9280c66f9';
-UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nYour workspace **{{.Labels.name}}** has been updated automatically to the latest template version ({{.Labels.template_version_name}}).' WHERE id = 'c34a0c09-0704-4cac-bd1c-0c0146811c2b';
-UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nNew user account **{{.Labels.created_account_name}}** has been created.' WHERE id = '4e19c0ac-94e1-4532-9515-d1801aa283b2';
-UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nUser account **{{.Labels.deleted_account_name}}** has been deleted.' WHERE id = 'f44d9314-ad03-4bc8-95d0-5cad491da6b6';
-UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nUser account **{{.Labels.suspended_account_name}}** has been suspended.' WHERE id = 'b02ddd82-4733-4d02-a2d7-c36f3598997d';
+UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
+					E'Your workspace **{{.Labels.name}}** was deleted.\n\n' ||
+					E'The specified reason was "**{{.Labels.reason}}{{ if .Labels.initiator }} ({{ .Labels.initiator }}){{end}}**".' WHERE id = 'f517da0b-cdc9-410f-ab89-a86107c420ed';
+UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
+					E'Automatic build of your workspace **{{.Labels.name}}** failed.\n\n' ||
+					E'The specified reason was "**{{.Labels.reason}}**".' WHERE id = '381df2a9-c0c0-4749-420f-80a9280c66f9';
+UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
+					E'Your workspace **{{.Labels.name}}** has been updated automatically to the latest template version ({{.Labels.template_version_name}}).\n\n' ||
+					E'Reason for update: **{{.Labels.template_version_message}}**.' WHERE id = 'c34a0c09-0704-4cac-bd1c-0c0146811c2b';
+UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
+					E'New user account **{{.Labels.created_account_name}}** has been created.\n\n' ||
+					E'This new user account was created {{if .Labels.created_account_user_name}}for **{{.Labels.created_account_user_name}}** {{end}}by **{{.Labels.initiator}}**.' WHERE id = '4e19c0ac-94e1-4532-9515-d1801aa283b2';
+UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
+					E'User account **{{.Labels.deleted_account_name}}** has been deleted.\n\n' ||
+					E'The deleted account {{if .Labels.deleted_account_user_name}}belonged to **{{.Labels.deleted_account_user_name}}** and {{end}}was deleted by **{{.Labels.initiator}}**.' WHERE id = 'f44d9314-ad03-4bc8-95d0-5cad491da6b6';
+UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
+					E'User account **{{.Labels.suspended_account_name}}** has been suspended.\n\n' ||
+  					E'The account {{if .Labels.suspended_account_user_name}}belongs to **{{.Labels.suspended_account_user_name}}** and it {{end}}was suspended by **{{.Labels.initiator}}**.' WHERE id = 'b02ddd82-4733-4d02-a2d7-c36f3598997d';
 UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nYour account **{{.Labels.suspended_account_name}}** has been suspended.' WHERE id = '6a2f0609-9b69-4d36-a989-9f5925b6cbff';
-UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nUser account **{{.Labels.activated_account_name}}** has been activated.' WHERE id = '9f5af851-8408-4e73-a7a1-c6502ba46689';
-UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\nYour account **{{.Labels.activated_account_name}}** has been activated.' WHERE id = '1a6a6bea-ee0a-43e2-9e7c-eabdb53730e4';
+UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
+					E'User account **{{.Labels.activated_account_name}}** has been activated.\n\n' ||
+					E'The account {{if .Labels.activated_account_user_name}}belongs to **{{.Labels.activated_account_user_name}}** and it {{ end }}was activated by **{{.Labels.initiator}}**.' WHERE id = '9f5af851-8408-4e73-a7a1-c6502ba46689';
+UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\n' ||
+					E'Your account **{{.Labels.activated_account_name}}** has been activated by **{{.Labels.initiator}}**.' WHERE id = '1a6a6bea-ee0a-43e2-9e7c-eabdb53730e4';
 UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\nA manual build of the workspace **{{.Labels.name}}** using the template **{{.Labels.template_name}}** failed (version: **{{.Labels.template_version_name}}**).\nThe workspace build was initiated by **{{.Labels.initiator}}**.' WHERE id = '2faeee0f-26cb-4e96-821c-85ccb9f71513';
 UPDATE notification_templates SET body_template = E'Hi {{.UserName}},
 
@@ -20,7 +35,7 @@ Template **{{.Labels.template_display_name}}** has failed to build {{.Data.faile
 {{- end}}
 {{end}}
 We recommend reviewing these issues to ensure future builds are successful.' WHERE id = '34a20db2-e9cc-4a93-b0e4-8569699d7a00';
-UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\nA request to reset the password for your Coder account has been made. Your one-time passcode is:\n\n**{{.Labels.one_time_passcode}}**\n\nIf you did not request to reset your password, you can ignore this message.' WHERE id = '62f86a30-2330-4b61-a26d-311ff3b608cf';
+UPDATE notification_templates SET body_template = E'Hi {{.UserName}},\n\nUse the link below to reset your password.\n\nIf you did not make this request, you can ignore this message.' WHERE id = '62f86a30-2330-4b61-a26d-311ff3b608cf';
 UPDATE notification_templates SET body_template = E'Hello {{.UserName}},\n\n'||
 		E'The template **{{.Labels.template}}** has been deprecated with the following message:\n\n' ||
 		E'**{{.Labels.message}}**\n\n' ||

diff --git a/coderd/database/migrations/000302_remove_greetings_notifications_templates.up.sql b/coderd/database/migrations/000302_remove_greetings_notifications_templates.up.sql
@@ -1,12 +1,19 @@
-UPDATE notification_templates SET body_template = E'Your workspace **{{.Labels.name}}** was deleted.\nThe specified reason was "**{{.Labels.reason}}{{ if .Labels.initiator }} ({{ .Labels.initiator }}){{end}}**".' WHERE id = 'f517da0b-cdc9-410f-ab89-a86107c420ed';
-UPDATE notification_templates SET body_template = E'Automatic build of your workspace **{{.Labels.name}}** failed.\nThe specified reason was "**{{.Labels.reason}}**".' WHERE id = '381df2a9-c0c0-4749-420f-80a9280c66f9';
-UPDATE notification_templates SET body_template = E'Your workspace **{{.Labels.name}}** has been updated automatically to the latest template version ({{.Labels.template_version_name}}).' WHERE id = 'c34a0c09-0704-4cac-bd1c-0c0146811c2b';
-UPDATE notification_templates SET body_template = E'New user account **{{.Labels.created_account_name}}** has been created.' WHERE id = '4e19c0ac-94e1-4532-9515-d1801aa283b2';
-UPDATE notification_templates SET body_template = E'User account **{{.Labels.deleted_account_name}}** has been deleted.' WHERE id = 'f44d9314-ad03-4bc8-95d0-5cad491da6b6';
-UPDATE notification_templates SET body_template = E'User account **{{.Labels.suspended_account_name}}** has been suspended.' WHERE id = 'b02ddd82-4733-4d02-a2d7-c36f3598997d';
-UPDATE notification_templates SET body_template = E'Your account **{{.Labels.suspended_account_name}}** has been suspended.' WHERE id = '6a2f0609-9b69-4d36-a989-9f5925b6cbff';
-UPDATE notification_templates SET body_template = E'User account **{{.Labels.activated_account_name}}** has been activated.' WHERE id = '9f5af851-8408-4e73-a7a1-c6502ba46689';
-UPDATE notification_templates SET body_template = E'Your account **{{.Labels.activated_account_name}}** has been activated.' WHERE id = '1a6a6bea-ee0a-43e2-9e7c-eabdb53730e4';
+UPDATE notification_templates SET body_template = E'Your workspace **{{.Labels.name}}** was deleted.\n\n' ||
+					E'The specified reason was "**{{.Labels.reason}}{{ if .Labels.initiator }} ({{ .Labels.initiator }}){{end}}**".' WHERE id = 'f517da0b-cdc9-410f-ab89-a86107c420ed';
+UPDATE notification_templates SET body_template = E'Automatic build of your workspace **{{.Labels.name}}** failed.\n\n' ||
+					E'The specified reason was "**{{.Labels.reason}}**".' WHERE id = '381df2a9-c0c0-4749-420f-80a9280c66f9';
+UPDATE notification_templates SET body_template = E'Your workspace **{{.Labels.name}}** has been updated automatically to the latest template version ({{.Labels.template_version_name}}).\n\n' ||
+					E'Reason for update: **{{.Labels.template_version_message}}**.' WHERE id = 'c34a0c09-0704-4cac-bd1c-0c0146811c2b';
+UPDATE notification_templates SET body_template = E'New user account **{{.Labels.created_account_name}}** has been created.\n\n' ||
+					E'This new user account was created {{if .Labels.created_account_user_name}}for **{{.Labels.created_account_user_name}}** {{end}}by **{{.Labels.initiator}}**.' WHERE id = '4e19c0ac-94e1-4532-9515-d1801aa283b2';
+UPDATE notification_templates SET body_template = E'User account **{{.Labels.deleted_account_name}}** has been deleted.\n\n' ||
+					E'The deleted account {{if .Labels.deleted_account_user_name}}belonged to **{{.Labels.deleted_account_user_name}}** and {{end}}was deleted by **{{.Labels.initiator}}**.' WHERE id = 'f44d9314-ad03-4bc8-95d0-5cad491da6b6';
+UPDATE notification_templates SET body_template = E'User account **{{.Labels.suspended_account_name}}** has been suspended.\n\n' ||
+  					E'The account {{if .Labels.suspended_account_user_name}}belongs to **{{.Labels.suspended_account_user_name}}** and it {{end}}was suspended by **{{.Labels.initiator}}**.' WHERE id = 'b02ddd82-4733-4d02-a2d7-c36f3598997d';
+UPDATE notification_templates SET body_template = E'Your account **{{.Labels.suspended_account_name}}** has been suspended by **{{.Labels.initiator}}**.' WHERE id = '6a2f0609-9b69-4d36-a989-9f5925b6cbff';
+UPDATE notification_templates SET body_template = E'User account **{{.Labels.activated_account_name}}** has been activated.\n\n' ||
+					E'The account {{if .Labels.activated_account_user_name}}belongs to **{{.Labels.activated_account_user_name}}** and it {{ end }}was activated by **{{.Labels.initiator}}**.' WHERE id = '9f5af851-8408-4e73-a7a1-c6502ba46689';
+UPDATE notification_templates SET body_template = E'Your account **{{.Labels.activated_account_name}}** has been activated by **{{.Labels.initiator}}**.' WHERE id = '1a6a6bea-ee0a-43e2-9e7c-eabdb53730e4';
 UPDATE notification_templates SET body_template = E'A manual build of the workspace **{{.Labels.name}}** using the template **{{.Labels.template_name}}** failed (version: **{{.Labels.template_version_name}}**).\nThe workspace build was initiated by **{{.Labels.initiator}}**.' WHERE id = '2faeee0f-26cb-4e96-821c-85ccb9f71513';
 UPDATE notification_templates SET body_template = E'Template **{{.Labels.template_display_name}}** has failed to build {{.Data.failed_builds}}/{{.Data.total_builds}} times over the last {{.Data.report_frequency}}.
 
@@ -18,7 +25,7 @@ UPDATE notification_templates SET body_template = E'Template **{{.Labels.templat
 {{- end}}
 {{end}}
 We recommend reviewing these issues to ensure future builds are successful.' WHERE id = '34a20db2-e9cc-4a93-b0e4-8569699d7a00';
-UPDATE notification_templates SET body_template = E'A request to reset the password for your Coder account has been made. Your one-time passcode is:\n\n**{{.Labels.one_time_passcode}}**\n\nIf you did not request to reset your password, you can ignore this message.' WHERE id = '62f86a30-2330-4b61-a26d-311ff3b608cf';
+UPDATE notification_templates SET body_template = E'Use the link below to reset your password.\n\nIf you did not make this request, you can ignore this message.' WHERE id = '62f86a30-2330-4b61-a26d-311ff3b608cf';
 UPDATE notification_templates SET body_template = E'The template **{{.Labels.template}}** has been deprecated with the following message:\n\n' ||
 		E'**{{.Labels.message}}**\n\n' ||
 		E'New workspaces may not be created from this template. Existing workspaces will continue to function normally.' WHERE id = 'f40fae84-55a2-42cd-99fa-b41c1ca64894';

diff --git a/...d/notifications/testdata/rendered-templates/smtp/TemplateUserAccountActivated.html.golden b/...d/notifications/testdata/rendered-templates/smtp/TemplateUserAccountActivated.html.golden
@@ -12,6 +12,8 @@ Content-Type: text/plain; charset=UTF-8
 
 User account bobby has been activated.
 
+The account belongs to William Tables and it was activated by rob.
+
 
 View accounts: http://test.com/deployment/users?filter=3Dstatus%3Aactive
 
@@ -45,6 +47,9 @@ argin: 8px 0 32px; line-height: 1.5;">
       <div style=3D"line-height: 1.5;">
 				<p>Hi bobby,</p>
         <p>User account <strong>bobby</strong> has been activated.</p>
+
+<p>The account belongs to <strong>William Tables</strong> and it was activa=
+ted by <strong>rob</strong>.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountCreated.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountCreated.html.golden
@@ -12,6 +12,8 @@ Content-Type: text/plain; charset=UTF-8
 
 New user account bobby has been created.
 
+This new user account was created for William Tables by rob.
+
 
 View accounts: http://test.com/deployment/users?filter=3Dstatus%3Aactive
 
@@ -45,6 +47,9 @@ argin: 8px 0 32px; line-height: 1.5;">
       <div style=3D"line-height: 1.5;">
 				<p>Hi bobby,</p>
         <p>New user account <strong>bobby</strong> has been created.</p>
+
+<p>This new user account was created for <strong>William Tables</strong> by=
+ <strong>rob</strong>.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountDeleted.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateUserAccountDeleted.html.golden
@@ -12,6 +12,8 @@ Content-Type: text/plain; charset=UTF-8
 
 User account bobby has been deleted.
 
+The deleted account belonged to William Tables and was deleted by rob.
+
 
 View accounts: http://test.com/deployment/users?filter=3Dstatus%3Aactive
 
@@ -45,6 +47,9 @@ argin: 8px 0 32px; line-height: 1.5;">
       <div style=3D"line-height: 1.5;">
 				<p>Hi bobby,</p>
         <p>User account <strong>bobby</strong> has been deleted.</p>
+
+<p>The deleted account belonged to <strong>William Tables</strong> and was =
+deleted by <strong>rob</strong>.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...d/notifications/testdata/rendered-templates/smtp/TemplateUserAccountSuspended.html.golden b/...d/notifications/testdata/rendered-templates/smtp/TemplateUserAccountSuspended.html.golden
@@ -12,6 +12,8 @@ Content-Type: text/plain; charset=UTF-8
 
 User account bobby has been suspended.
 
+The account belongs to William Tables and it was suspended by rob.
+
 
 View suspended accounts: http://test.com/deployment/users?filter=3Dstatus%3=
 Asuspended
@@ -46,6 +48,9 @@ argin: 8px 0 32px; line-height: 1.5;">
       <div style=3D"line-height: 1.5;">
 				<p>Hi bobby,</p>
         <p>User account <strong>bobby</strong> has been suspended.</p>
+
+<p>The account belongs to <strong>William Tables</strong> and it was suspen=
+ded by <strong>rob</strong>.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...cations/testdata/rendered-templates/smtp/TemplateUserRequestedOneTimePasscode.html.golden b/...cations/testdata/rendered-templates/smtp/TemplateUserRequestedOneTimePasscode.html.golden
@@ -10,12 +10,9 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-A request to reset the password for your Coder account has been made. Your =
-one-time passcode is:
+Use the link below to reset your password.
 
-fad9020b-6562-4cdb-87f1-0486f1bea415
-
-If you did not request to reset your password, you can ignore this message.
+If you did not make this request, you can ignore this message.
 
 
 Reset password: http://test.com/reset-password/change?otp=3Dfad9020b-6562-4=
@@ -50,13 +47,9 @@ argin: 8px 0 32px; line-height: 1.5;">
       </h1>
       <div style=3D"line-height: 1.5;">
 				<p>Hi bobby,</p>
-        <p>A request to reset the password for your Coder account has been =
-made. Your one-time passcode is:</p>
-
-<p><strong>fad9020b-6562-4cdb-87f1-0486f1bea415</strong></p>
+        <p>Use the link below to reset your password.</p>
 
-<p>If you did not request to reset your password, you can ignore this messa=
-ge.</p>
+<p>If you did not make this request, you can ignore this message.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...d/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutoUpdated.html.golden b/...d/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutoUpdated.html.golden
@@ -13,6 +13,8 @@ Content-Type: text/plain; charset=UTF-8
 Your workspace bobby-workspace has been updated automatically to the latest=
  template version (1.0).
 
+Reason for update: template now includes catnip.
+
 
 View workspace: http://test.com/@bobby/bobby-workspace
 
@@ -47,6 +49,8 @@ argin: 8px 0 32px; line-height: 1.5;">
 				<p>Hi bobby,</p>
         <p>Your workspace <strong>bobby-workspace</strong> has been updated=
  automatically to the latest template version (1.0).</p>
+
+<p>Reason for update: <strong>template now includes catnip</strong>.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...tifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutobuildFailed.html.golden b/...tifications/testdata/rendered-templates/smtp/TemplateWorkspaceAutobuildFailed.html.golden
@@ -11,6 +11,7 @@ Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
 Automatic build of your workspace bobby-workspace failed.
+
 The specified reason was "autostart".
 
 
@@ -46,8 +47,9 @@ argin: 8px 0 32px; line-height: 1.5;">
       <div style=3D"line-height: 1.5;">
 				<p>Hi bobby,</p>
         <p>Automatic build of your workspace <strong>bobby-workspace</stron=
-g> failed.<br>
-The specified reason was &ldquo;<strong>autostart</strong>&rdquo;.</p>
+g> failed.</p>
+
+<p>The specified reason was &ldquo;<strong>autostart</strong>&rdquo;.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted.html.golden b/coderd/notifications/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted.html.golden
@@ -11,6 +11,7 @@ Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
 Your workspace bobby-workspace was deleted.
+
 The specified reason was "autodeleted due to dormancy (autobuild)".
 
 
@@ -47,9 +48,10 @@ argin: 8px 0 32px; line-height: 1.5;">
       </h1>
       <div style=3D"line-height: 1.5;">
 				<p>Hi bobby,</p>
-        <p>Your workspace <strong>bobby-workspace</strong> was deleted.<br>
-The specified reason was &ldquo;<strong>autodeleted due to dormancy (autobu=
-ild)</strong>&rdquo;.</p>
+        <p>Your workspace <strong>bobby-workspace</strong> was deleted.</p>
+
+<p>The specified reason was &ldquo;<strong>autodeleted due to dormancy (aut=
+obuild)</strong>&rdquo;.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...ns/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted_CustomAppearance.html.golden b/...ns/testdata/rendered-templates/smtp/TemplateWorkspaceDeleted_CustomAppearance.html.golden
@@ -11,6 +11,7 @@ Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
 Your workspace bobby-workspace was deleted.
+
 The specified reason was "autodeleted due to dormancy (autobuild)".
 
 
@@ -47,9 +48,10 @@ argin: 8px 0 32px; line-height: 1.5;">
       </h1>
       <div style=3D"line-height: 1.5;">
 				<p>Hi bobby,</p>
-        <p>Your workspace <strong>bobby-workspace</strong> was deleted.<br>
-The specified reason was &ldquo;<strong>autodeleted due to dormancy (autobu=
-ild)</strong>&rdquo;.</p>
+        <p>Your workspace <strong>bobby-workspace</strong> was deleted.</p>
+
+<p>The specified reason was &ldquo;<strong>autodeleted due to dormancy (aut=
+obuild)</strong>&rdquo;.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20

diff --git a/...d/notifications/testdata/rendered-templates/smtp/TemplateYourAccountActivated.html.golden b/...d/notifications/testdata/rendered-templates/smtp/TemplateYourAccountActivated.html.golden
@@ -10,7 +10,7 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain; charset=UTF-8
 
-Your account bobby has been activated.
+Your account bobby has been activated by rob.
 
 
 Open Coder: http://test.com
@@ -44,7 +44,8 @@ argin: 8px 0 32px; line-height: 1.5;">
       </h1>
       <div style=3D"line-height: 1.5;">
 				<p>Hi bobby,</p>
-        <p>Your account <strong>bobby</strong> has been activated.</p>
+        <p>Your account <strong>bobby</strong> has been activated by <stron=
+g>rob</strong>.</p>
       </div>
       <div style=3D"text-align: center; margin-top: 32px;">
        =20