diff --git a/README b/README
index 39d2eb2f4c8f6c9d8a7489f860661efb58646c70..b77a6a221be223e0e1546da4c12a7599e923a95d 100644
--- a/README
+++ b/README
@@ -116,7 +116,6 @@ Extensions and their implementation status:
     relational: full 
     regex: full, but suboptimal
     vacation: almost complete; no support for required References header
-              and :addresses is currently ignored.
     imapflags: flag management works, but flags are not stored 
     copy: full
     include: planned (* first leave out variables support)  
diff --git a/src/lib-sieve/plugins/vacation/ext-vacation.c b/src/lib-sieve/plugins/vacation/ext-vacation.c
index de822b958341939e9d7d41929988dcfe4c9e3168..abb40ac25b92e225770f63f7fe868965ebfb4f92 100644
--- a/src/lib-sieve/plugins/vacation/ext-vacation.c
+++ b/src/lib-sieve/plugins/vacation/ext-vacation.c
@@ -3,8 +3,8 @@
  *
  * Authors: Stephan Bosch
  * Specification: draft-ietf-sieve-vacation-07
- * Implementation: almost complete, the required sopport for  Refences header 
- *   is missing and :addresses is ignored.
+ * Implementation: almost complete; the required sopport for Refences header 
+ *   is missing.
  * Status: experimental, largely untested
  * 
  */
@@ -597,8 +597,13 @@ static bool act_vacation_send
 		
 	fprintf(f, "To: <%s>\r\n", msgdata->return_path);
 	fprintf(f, "Subject: %s\r\n", str_sanitize(ctx->subject, 80));
-	if ( msgdata->id != NULL ) 
+	
+	/* Produce a proper reply */
+	if ( msgdata->id != NULL ) {
 		fprintf(f, "In-Reply-To: %s\r\n", msgdata->id);
+		
+		/* FIXME: Update References header */
+	}
 	fprintf(f, "Auto-Submitted: auto-replied (vacation)\r\n");
 
 	/* FIXME: What about the required references header ? */