diff --git a/backend/08-viewer.go b/backend/08-viewer.go
index a6ced01..c0336c0 100644
--- a/backend/08-viewer.go
+++ b/backend/08-viewer.go
@@ -115,8 +115,8 @@ func renderViewerTree(w http.ResponseWriter) {
 		fmt.Fprintf(w, `<div class="tree-node account">%s</div>`, html.EscapeString(sourceAccountLabel(account)))
 		for _, path := range mboxes {
 			folder := strings.TrimSuffix(filepath.Base(path), ".mbox")
-			fmt.Fprintf(w, `<a class="tree-node" href="/view?account=%s&amp;folder=%s" hx-get="/view?account=%s&amp;folder=%s" hx-target="#list" hx-swap="innerHTML">%s</a>`,
-				urlEsc(account), urlEsc(folder), urlEsc(account), urlEsc(folder), html.EscapeString(folder))
+			fmt.Fprintf(w, `<a class="tree-node" href="#" hx-get="/view?account=%s&amp;folder=%s" hx-target="#list" hx-swap="innerHTML">%s</a>`,
+				urlEsc(account), urlEsc(folder), html.EscapeString(folder))
 		}
 	}
 	if !found {
@@ -156,8 +156,8 @@ func renderMessageList(w http.ResponseWriter, account, folder, q string) {
 		if from == "" {
 			from = "(ohne Absender)"
 		}
-		fmt.Fprintf(w, `<a class="msg-row" href="/view/message?account=%s&amp;folder=%s&amp;index=%d" hx-get="/view/message?account=%s&amp;folder=%s&amp;index=%d" hx-include="#target-account-select" hx-target="#read" hx-swap="innerHTML"><span class="msg-from">%s</span><span class="msg-subject">%s</span><span class="msg-date">%s</span></a>`,
-			urlEsc(account), urlEsc(folder), entry.Index, urlEsc(account), urlEsc(folder), entry.Index,
+		fmt.Fprintf(w, `<a class="msg-row" href="#" hx-get="/view/message?account=%s&amp;folder=%s&amp;index=%d" hx-include="#target-account-select" hx-target="#read" hx-swap="innerHTML"><span class="msg-from">%s</span><span class="msg-subject">%s</span><span class="msg-date">%s</span></a>`,
+			urlEsc(account), urlEsc(folder), entry.Index,
 			html.EscapeString(from), html.EscapeString(subject), html.EscapeString(entry.Date))
 	}
 	if len(entries) == 0 {