public-inbox-mda | 15 ++++++++++++++-

diff --git a/public-inbox-mda b/public-inbox-mda
index 70fbdf27faded071df827f9af0bea765dcd798f3..14017f68d265cf4fc4c9bde3864136f61dc18d49 100755
--- a/public-inbox-mda
+++ b/public-inbox-mda
@@ -41,7 +41,20 @@
 	if (PublicInbox::Filter->run($simple)) {
 		# run spamc again on the HTML-free message
 		if (do_spamc($simple, \$filtered)) {
-			$filter->simple(Email::Simple->new($filtered));
+			$simple = Email::Simple->new($filtered);
+			$filter->simple($simple);
+
+			my $from = $filter->from;
+			my @from = Email::Address->parse($from);
+			my $name = $from[0]->name;
+			defined $name or $name = "";
+			my $email = $from[0]->address;
+			defined $email or $email = "";
+			local $ENV{GIT_AUTHOR_NAME} = $name;
+			local $ENV{GIT_AUTHOR_EMAIL} = $email;
+			local $ENV{GIT_COMMITTER_EMAIL} = $recipient;
+			local $ENV{GIT_COMMITTER_NAME} = $dst->{listname};
+
 			$filter->pipe(MDA, '-1', $main_repo);
 		}
 	}