diff --git a/Changes b/Changes
index c43f4c8..102e4e1 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+  Set the Return-Path header when queuing into maildir mailboxes.
+
   prefork, forkserver: restart on SIGHUP (reload all modules, with register() /
   init() phase).
 
diff --git a/plugins/queue/maildir b/plugins/queue/maildir
index 5f69fd8..dd804f5 100644
--- a/plugins/queue/maildir
+++ b/plugins/queue/maildir
@@ -166,6 +166,8 @@ sub write_file {
     $self->log(LOGWARN, "could not open $maildir/tmp/$file: $!"),
     return(DECLINED, "queue error (open)");
 
+  print MF "Return-Path: ", $transaction->sender->format , "\n";
+
   print MF "Delivered-To: ",$addr->address,"\n"
     if $addr; # else it had been added before...