diff --git a/backend/00-router.go b/backend/00-router.go
index 7b82bda..f189ef4 100644
--- a/backend/00-router.go
+++ b/backend/00-router.go
@@ -19,8 +19,10 @@ func RegisterRoutes(mux *http.ServeMux) {
 
 	// Viewer (lokale mbox betrachten + weiterleiten)
 	mux.HandleFunc("/view", viewerHandler)
+	mux.HandleFunc("/view/source/select", sourceSelectHandler)
 	mux.HandleFunc("/view/message", messageHandler)
 	mux.HandleFunc("/view/target", targetMessageHandler)
+	mux.HandleFunc("/view/target/select", targetSelectHandler)
 	mux.HandleFunc("/view/manual-copy", manualCopyHandler)
 	mux.HandleFunc("/view/forward", forwardHandler)
 }
@@ -41,9 +43,9 @@ func renderShell(w http.ResponseWriter, active, readingPane string) {
 	fmt.Fprintf(w, `<!doctype html><html lang="de"><head><meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <title>Mail-Graveyard</title>
-<link rel="stylesheet" href="/static/style.css?v=20260706-2">
+<link rel="stylesheet" href="/static/style.css?v=20260706-3">
 <script src="/static/htmx.min.js"></script>
-<script src="/static/app.js?v=20260706-2" defer></script></head>
+<script src="/static/app.js?v=20260706-3" defer></script></head>
 <body class="ol2013">
 <header class="ribbon">
   <nav class="ribbon-tabs">
diff --git a/backend/08-viewer.go b/backend/08-viewer.go
index bce1eec..ac8baeb 100644
--- a/backend/08-viewer.go
+++ b/backend/08-viewer.go
@@ -88,6 +88,17 @@ func targetMessageHandler(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprint(w, renderTargetPane(account, folder, targetAccount, index, raw, ""))
 }
 
+func targetSelectHandler(w http.ResponseWriter, r *http.Request) {
+	targetAccount := r.URL.Query().Get("target_account")
+	w.Header().Set("Content-Type", "text/html; charset=utf-8")
+	fmt.Fprint(w, renderInitialTargetSelectPane(targetAccount))
+}
+
+func sourceSelectHandler(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "text/html; charset=utf-8")
+	fmt.Fprint(w, renderInitialSourceSelectPane(`<div class="ef-empty">Nachricht waehlen.</div>`))
+}
+
 func forwardHandler(w http.ResponseWriter, r *http.Request) {
 	// TODO Codex: GET = Weiterleiten-Formular (An/Betreff/Text), POST =
 	// ForwardMessage() aufrufen. NUR hier kommt SMTP zum Einsatz -- der Umzug
@@ -259,15 +270,19 @@ func renderTargetMatch(b *strings.Builder, match forwardedMatch) {
 }
 
 func renderInitialTargetPane() string {
-	return `<div class="pane-head mode-head"><div class="mode-switch"><button class="btn compact active" type="button">Quelle</button><button class="btn secondary compact" type="button">Ziel</button></div><div></div></div><div class="read-body"><div class="ef-empty">Nachricht waehlen.</div></div>`
+	return renderInitialSourceSelectPane(`<div class="ef-empty">Nachricht waehlen.</div>`)
 }
 
 func renderInitialReadPane(body string) string {
 	if strings.TrimSpace(body) == "" {
 		body = `<div class="ef-empty">Nachricht waehlen.</div>`
 	}
+	return renderInitialSourceSelectPane(body)
+}
+
+func renderInitialSourceSelectPane(body string) string {
 	var b strings.Builder
-	b.WriteString(`<div class="pane-head mode-head"><div class="mode-switch"><button class="btn compact active" type="button">Quelle</button><button class="btn secondary compact" type="button">Ziel</button></div><form class="target-select-form"><select id="source-account-select" name="source" class="target-select">`)
+	b.WriteString(`<div class="pane-head mode-head"><div class="mode-switch"><button class="btn compact active" type="button">Quelle</button><button class="btn secondary compact" type="button" hx-get="/view/target/select" hx-target="#read" hx-swap="innerHTML">Ziel</button></div><form class="target-select-form"><select id="source-account-select" name="source" class="target-select">`)
 	for _, opt := range sourceAccountOptions() {
 		fmt.Fprintf(&b, `<option value="%s">%s</option>`, html.EscapeString(opt.Value), html.EscapeString(opt.Label))
 	}
@@ -277,6 +292,20 @@ func renderInitialReadPane(body string) string {
 	return b.String()
 }
 
+func renderInitialTargetSelectPane(selected string) string {
+	var b strings.Builder
+	b.WriteString(`<div class="pane-head mode-head"><div class="mode-switch"><button class="btn secondary compact" type="button" hx-get="/view/source/select" hx-target="#read" hx-swap="innerHTML">Quelle</button><button class="btn compact active" type="button">Ziel</button></div><form class="target-select-form"><select id="target-account-select" name="target_account" class="target-select"><option value="">Automatisch</option>`)
+	for _, opt := range targetAccountOptions() {
+		attr := ""
+		if opt.Value == selected {
+			attr = ` selected`
+		}
+		fmt.Fprintf(&b, `<option value="%s"%s>%s</option>`, html.EscapeString(opt.Value), attr, html.EscapeString(opt.Label))
+	}
+	b.WriteString(`</select></form></div><div class="read-body"><div class="ef-empty">Nachricht waehlen.</div></div>`)
+	return b.String()
+}
+
 func renderReadContent(w io.Writer, subject, from, date, body string) {
 	if subject == "" {
 		subject = "(ohne Betreff)"
