diff --git a/filter/CHANGELOG b/filter/CHANGELOG
index 614cfa928..927d0b0c9 100644
--- a/filter/CHANGELOG
+++ b/filter/CHANGELOG
@@ -22,3 +22,5 @@ Autoreply messages containing non-ASCII characters are now properly quoted-print
 ---- Changes since 1.400 ----
 Filters that deliver to mbox-format folders now have locking enabled.
 Creation of filters that match headers is now less error-prone, due to a new menu for selecting if it should match the start, end or any part of the header.
+---- Changes since 1.410 ----
+When an autoreply is deleted, the underlying message file is deleted too.
diff --git a/filter/filter-lib.pl b/filter/filter-lib.pl
index 66ea734b4..b2ae13050 100644
--- a/filter/filter-lib.pl
+++ b/filter/filter-lib.pl
@@ -282,6 +282,9 @@ sub delete_filter
 local ($filter) = @_;
 &procmail::delete_recipe($filter->{'recipe'});
 &setup_forward_procmail();
+if ($filter->{'actionreply'} && !-d $filter->{'actionreply'}) {
+	&unlink_file($filter->{'actionreply'});
+	}
 }
 
 # swap_filters(&filter1, &filter2)