diff --git a/job_runner.py b/job_runner.py
index f0925160..048c727f 100644
--- a/job_runner.py
+++ b/job_runner.py
@@ -58,7 +58,7 @@ def onboarding_send_from_alias(user):
 
     send_email(
         to_email,
-        f"Do you know you can send emails from your alias?",
+        f"SimpleLogin Tip: Send emails from your alias",
         render("com/onboarding/send-from-alias.txt", user=user, to_email=to_email),
         render("com/onboarding/send-from-alias.html", user=user, to_email=to_email),
     )
@@ -71,7 +71,7 @@ def onboarding_pgp(user):
 
     send_email(
         to_email,
-        f"Do you know you can encrypt your emails so only you can read them?",
+        f"SimpleLogin Tip: Secure your emails with PGP",
         render("com/onboarding/pgp.txt", user=user, to_email=to_email),
         render("com/onboarding/pgp.html", user=user, to_email=to_email),
     )
@@ -84,7 +84,7 @@ def onboarding_browser_extension(user):
 
     send_email(
         to_email,
-        f"Have you tried SimpleLogin Chrome/Firefox extensions and Android/iOS apps?",
+        f"SimpleLogin Tip: Chrome/Firefox/Safari extensions and Android/iOS apps",
         render("com/onboarding/browser-extension.txt", user=user, to_email=to_email),
         render("com/onboarding/browser-extension.html", user=user, to_email=to_email),
     )
@@ -97,7 +97,7 @@ def onboarding_mailbox(user):
 
     send_email(
         to_email,
-        f"Do you know you can have multiple mailboxes on SimpleLogin?",
+        f"SimpleLogin Tip: Multiple mailboxes",
         render("com/onboarding/mailbox.txt", user=user, to_email=to_email),
         render("com/onboarding/mailbox.html", user=user, to_email=to_email),
     )
diff --git a/templates/emails/com/onboarding/browser-extension.html b/templates/emails/com/onboarding/browser-extension.html
index 3a278fd9..7e18dc11 100644
--- a/templates/emails/com/onboarding/browser-extension.html
+++ b/templates/emails/com/onboarding/browser-extension.html
@@ -1,7 +1,11 @@
 {% extends "base.html" %}
 
 {% block content %}
-  {{ render_text("Hi " + user.name) }}
+  {% call text() %}
+    <h1>
+      Download SimpleLogin browser extensions and mobile apps to create aliases on-the-fly.
+    </h1>
+  {% endcall %}
 
   {% call text() %}
     If you want to quickly create aliases <b>without</b> going to SimpleLogin website, you can do that with SimpleLogin
diff --git a/templates/emails/com/onboarding/mailbox.html b/templates/emails/com/onboarding/mailbox.html
index 48c68f2b..0a15a56c 100644
--- a/templates/emails/com/onboarding/mailbox.html
+++ b/templates/emails/com/onboarding/mailbox.html
@@ -1,7 +1,11 @@
 {% extends "base.html" %}
 
 {% block content %}
-  {{ render_text("Hi " + user.name) }}
+  {% call text() %}
+    <h1>
+      Add other mailboxes to SimpleLogin.
+    </h1>
+  {% endcall %}
 
   {% call text() %}
     If you have several email addresses, e.g. Gmail for work and Protonmail for personal uses,
diff --git a/templates/emails/com/onboarding/pgp.html b/templates/emails/com/onboarding/pgp.html
index d33ccb22..cac2bbae 100644
--- a/templates/emails/com/onboarding/pgp.html
+++ b/templates/emails/com/onboarding/pgp.html
@@ -1,7 +1,11 @@
 {% extends "base.html" %}
 
 {% block content %}
-  {{ render_text("Hi " + user.name) }}
+  {% call text() %}
+    <h1>
+      Secure your emails with PGP.
+    </h1>
+  {% endcall %}
 
   {% call text() %}
     If you use Gmail, Yahoo, Outlook, etc, you might want to use
diff --git a/templates/emails/com/onboarding/send-from-alias.html b/templates/emails/com/onboarding/send-from-alias.html
index ff2ef3f6..f294dda1 100644
--- a/templates/emails/com/onboarding/send-from-alias.html
+++ b/templates/emails/com/onboarding/send-from-alias.html
@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 
 {% block content %}
-  {{ render_text("Hi " + user.name) }}
-
   {% call text() %}
-    Do you know you can send emails <b>from your alias</b>? <br>
+    <h1>
+      Send emails from your alias.
+    </h1>
   {% endcall %}
 
   {% call text() %}