diff --git a/changelog/unreleased/fix-email-template.md b/changelog/unreleased/fix-email-template.md
new file mode 100644
index 0000000000..d072bac1d6
--- /dev/null
+++ b/changelog/unreleased/fix-email-template.md
@@ -0,0 +1,7 @@
+Bugfix: Fixed the email template
+
+Fixed the email template when the description was marked as a link.
+
+
+https://github.com/owncloud/ocis/pull/9484
+https://github.com/owncloud/ocis/issues/8424
diff --git a/services/notifications/pkg/email/composer.go b/services/notifications/pkg/email/composer.go
index b3f33f0bbb..097ff3631e 100644
--- a/services/notifications/pkg/email/composer.go
+++ b/services/notifications/pkg/email/composer.go
@@ -89,6 +89,6 @@ func callToActionToHTML(s string) string {
 	if strings.TrimSpace(s) == "" {
 		return ""
 	}
-	s = strings.TrimSuffix(s, "{{ .ShareLink }}")
-	return `<a href="{{ .ShareLink }}">` + s + `</a>`
+	s = strings.TrimSuffix(s, "{ShareLink}")
+	return s + `<a href="{ShareLink}">{ShareLink}</a>`
 }
diff --git a/services/notifications/pkg/service/service_test.go b/services/notifications/pkg/service/service_test.go
index afd7e51c4c..2bdcb3651d 100644
--- a/services/notifications/pkg/service/service_test.go
+++ b/services/notifications/pkg/service/service_test.go
@@ -315,7 +315,7 @@ https://owncloud.com
                         <br><br>
                         Dr. O&#39;reilly has shared "&lt;script&gt;alert(&#39;secrets of the board&#39;);&lt;/script&gt;" with you.
                         <br><br>
-                        <a href="files/shares/with-me">Click here to view it: files/shares/with-me</a>
+                        Click here to view it: <a href="files/shares/with-me">files/shares/with-me</a>
                     </td>
                 </tr>
                 <tr>
@@ -384,7 +384,7 @@ https://owncloud.com
                         <br><br>
                         Dr. O&#39;reilly has invited you to join "&lt;script&gt;alert(&#39;secret space&#39;);&lt;/script&gt;".
                         <br><br>
-                        <a href="f/spaceid">Click here to view it: f/spaceid</a>
+                        Click here to view it: <a href="f/spaceid">f/spaceid</a>
                     </td>
                 </tr>
                 <tr>