2 files changed, 31 insertions, 8 deletions
diff --git a/plugins/base/routes.go b/plugins/base/routes.go
index ad4d121..9dd110a 100644
--- a/plugins/base/routes.go
+++ b/plugins/base/routes.go
@@ -431,6 +431,7 @@ func handleCompose(ctx *koushin.Context, msg *OutgoingMessage, draft *messagePat
 
 func handleComposeNew(ctx *koushin.Context) error {
 	// These are common mailto URL query parameters
+	// TODO: cc, bcc
 	return handleCompose(ctx, &OutgoingMessage{
 		To:        strings.Split(ctx.QueryParam("to"), ","),
 		Subject:   ctx.QueryParam("subject"),
diff --git a/plugins/viewhtml/sanitize.go b/plugins/viewhtml/sanitize.go
index c7de703..f8d6a58 100644
--- a/plugins/viewhtml/sanitize.go
+++ b/plugins/viewhtml/sanitize.go
@@ -70,6 +70,14 @@ var allowedStyles = map[string]bool{
 	"list-style-position": true,
 }
 
+var mailtoParams = []string{
+	"subject",
+	"cc",
+	"bcc",
+	"body",
+	"in-reply-to",
+}
+
 type sanitizer struct {
 	msg *koushinbase.IMAPMessage
 }
@@ -80,17 +88,31 @@ func (san *sanitizer) sanitizeImageURL(src string) string {
 		return "about:blank"
 	}
 
-	// TODO: mid support?
-	if !strings.EqualFold(u.Scheme, "cid") || san.msg == nil {
-		return "about:blank"
-	}
+	switch strings.ToLower(u.Scheme) {
+	case "mailto":
+		mailtoQuery := u.Query()
 
-	part := san.msg.PartByID(u.Opaque)
-	if part == nil || !strings.HasPrefix(part.MIMEType, "image/") {
+		composeURL := url.URL{Path: "/compose"}
+		composeQuery := make(url.Values)
+		composeQuery.Set("to", u.Opaque)
+		for _, k := range mailtoParams {
+			if v := mailtoQuery.Get(k); v != "" {
+				composeQuery.Set(k, v)
+			}
+		}
+		composeURL.RawQuery = composeQuery.Encode()
+		return composeURL.String()
+	case "cid":
+		// TODO: mid support?
+		part := san.msg.PartByID(u.Opaque)
+		if part == nil || !strings.HasPrefix(part.MIMEType, "image/") {
+			return "about:blank"
+		}
+
+		return part.URL(true).String()
+	default:
 		return "about:blank"
 	}
-
-	return part.URL(true).String()
 }
 
 func (san *sanitizer) sanitizeCSSDecls(decls []*css.Declaration) []*css.Declaration {