diff --git a/plugins/base/smtp.go b/plugins/base/smtp.go
index 14bff07..f098506 100644
--- a/plugins/base/smtp.go
+++ b/plugins/base/smtp.go
@@ -26,6 +26,7 @@ func quote(r io.Reader) (string, error) {
 	if err := scanner.Err(); err != nil {
 		return "", fmt.Errorf("quote: failed to read original message: %s", err)
 	}
+	builder.WriteString("\n")
 	return builder.String(), nil
 }
 
diff --git a/themes/alps/assets/compose.js b/themes/alps/assets/compose.js
index a980d77..23e67b6 100644
--- a/themes/alps/assets/compose.js
+++ b/themes/alps/assets/compose.js
@@ -1,3 +1,11 @@
+const textarea = document.querySelector("textarea.body");
+if (window.location.pathname.endsWith("/reply")) {
+	// Auto-focus body and scroll to bottom
+	textarea.focus();
+	textarea.setSelectionRange(textarea.value.length, textarea.value.length);
+	textarea.scrollTop = textarea.scrollHeight;
+}
+
 const sendButton = document.getElementById("send-button"),
 	saveButton = document.getElementById("save-button");