diff --git a/internal/email/email_test.go b/internal/email/email_test.go
index a292ce1..f6e4f12 100644
--- a/internal/email/email_test.go
+++ b/internal/email/email_test.go
@@ -112,7 +112,7 @@ func TestTemplateRenderText(t *testing.T) {
 			data: EmailData{
 				Message: "Done.",
 			},
-			want: []string{"Done."},
+			want: []string{"Hello,", "Done."},
 		},
 	}
 
diff --git a/internal/email/templates/base.html b/internal/email/templates/base.html
index 6011b48..861bd71 100644
--- a/internal/email/templates/base.html
+++ b/internal/email/templates/base.html
@@ -45,11 +45,9 @@
             <td style="padding: 40px 44px;">
 
               <!-- Greeting -->
-              {{if .RecipientName}}
               <p style="margin: 0 0 20px 0; font-size: 15px; line-height: 1.6; color: #3a3835;">
-                Hello {{.RecipientName}},
+                Hello{{if .RecipientName}} {{.RecipientName}}{{end}},
               </p>
-              {{end}}
 
               <!-- Message -->
               <p style="margin: 0 0 24px 0; font-size: 15px; line-height: 1.7; color: #3a3835;">
diff --git a/internal/email/templates/base.txt b/internal/email/templates/base.txt
index 64312b3..499ec01 100644
--- a/internal/email/templates/base.txt
+++ b/internal/email/templates/base.txt
@@ -1,6 +1,6 @@
-{{if .RecipientName}}Hello {{.RecipientName}},
+Hello{{if .RecipientName}} {{.RecipientName}}{{end}},
 
-{{end}}{{.Message}}
+{{.Message}}
 {{if .Button}}
 
 {{.Button.Text}}: {{.Button.URL}}