diff --git a/TODO b/TODO
index 512ec447f813426f06a7ca924574cde6b48c2fe6..2a304162be4495a5c638cf4cd8f152ab04973d6e 100644
--- a/TODO
+++ b/TODO
@@ -12,7 +12,6 @@ Current:
 	  recipients. Conversely, the generated To header must include the
 	  URI recipients apart from those stated explicitly in the To URI
 	  header.
-	- Add owner-email to the Auto-submitted field
 	- Implement checking the :from argument for validity and policy 
 	  violations.
 * Implement means to configure which extensions to provide and incorporate
diff --git a/src/lib-sieve/plugins/enotify/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/ntfy-mailto.c
index 8da979c7a829aa6ef3e0f6cf23223e2ac39ad39e..50307dd251d23913e62b18199b3486a27a0257cc 100644
--- a/src/lib-sieve/plugins/enotify/ntfy-mailto.c
+++ b/src/lib-sieve/plugins/enotify/ntfy-mailto.c
@@ -585,7 +585,8 @@ static bool ntfy_mailto_send
 		rfc2822_header_field_printf(f, "To", "<%s>", recipients[i]);
 		rfc2822_header_field_write(f, "Subject", subject);
 			
-		rfc2822_header_field_write(f, "Auto-Submitted", "auto-notified");
+		rfc2822_header_field_printf(f, "Auto-Submitted", 
+			"auto-notified; owner-email=\"%s\"", msgdata->to_address);
 		rfc2822_header_field_write(f, "Precedence", "bulk");
 
 		/* Set importance */
@@ -607,9 +608,6 @@ static bool ntfy_mailto_send
 		
 		/* Add custom headers */
 		
-		/* FIXME: ignore from and auto-submitted and recognize body, subject, to and
-		 * cc.
-		 */
 		headers = array_get(&mtctx->headers, &hcount);
 		for ( h = 0; h < hcount; h++ ) {
 			const char *name = rfc2822_header_field_name_sanitize(headers[h].name);