diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 9ce5b30..6cfc458 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -44,4 +44,5 @@ jobs:
         extra_files: LICENSE README.md
         md5sum: false
         overwrite: true
+        retry: 5
         ldflags: -w -X "github.com/axllent/mailpit/config.Version=${{ github.ref_name }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36b1557..f43d2a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 Notable changes to Mailpit will be documented in this file.
 
+## [v1.6.19]
+
+### Fix
+- Only display sendmail help when sendmail subcommand is invoked
+
+
 ## [v1.6.18]
 
 ### API
diff --git a/cmd/sendmail.go b/cmd/sendmail.go
index b44c5cf..6d9305a 100644
--- a/cmd/sendmail.go
+++ b/cmd/sendmail.go
@@ -21,7 +21,7 @@ func init() {
 	rootCmd.AddCommand(sendmailCmd)
 
 	// print out manual help screen
-	rootCmd.SetHelpTemplate(sendmail.HelpTemplate([]string{os.Args[0], "sendmail"}))
+	sendmailCmd.SetHelpTemplate(sendmail.HelpTemplate([]string{os.Args[0], "sendmail"}))
 
 	// these are simply repeated for cli consistency as cobra/viper does not allow
 	// multi-letter single-dash variables (-bs)
diff --git a/server/ui-src/App.vue b/server/ui-src/App.vue
index 1695c32..8b3fd67 100644
--- a/server/ui-src/App.vue
+++ b/server/ui-src/App.vue
@@ -944,7 +944,7 @@ export default {
 		<div class="col-lg-10 col-md-9 mh-100 ps-0 ps-md-2 pe-0">
 			<div class="mh-100" style="overflow-y: auto;" :class="message ? 'd-none' : ''" id="message-page">
 				<div class="list-group my-2" v-if="items.length">
-					<a v-for="message in items" :href="'#' + message.ID"
+					<a v-for="message in items" :href="'#' + message.ID" :key="message.ID"
 						v-on:click.ctrl="toggleSelected($event, message.ID)"
 						v-on:click.shift="selectRange($event, message.ID)"
 						class="row gx-1 message d-flex small list-group-item list-group-item-action border-start-0 border-end-0"