diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php
index 08a4998a9fef4a86846e3b1c7464c16b62ae6e96..226fdfd983f6ad67778e6580ed904bc65abd98d5 100644
--- a/server/plugins-available/maildeliver_plugin.inc.php
+++ b/server/plugins-available/maildeliver_plugin.inc.php
@@ -98,8 +98,9 @@ class maildeliver_plugin {
 			$app->log("Mailfilter config has been changed", LOGLEVEL_DEBUG);
 
 			$sieve_file = $data["new"]["maildir"].'/.sieve';
+			$sieve_file_isp = $data["new"]["maildir"].'/sieve/ispconfig.sieve';
 			if(is_file($sieve_file)) unlink($sieve_file)  or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN);
-
+			if(is_file($sieve_file_isp)) unlink($sieve_file_isp)  or $app->log("Unable to delete file: $sieve_file_isp", LOGLEVEL_WARN);
 			$app->load('tpl');
 
 			//* Select sieve filter file for dovecot version
@@ -204,8 +205,9 @@ class maildeliver_plugin {
 
 			$tpl->setVar('addresses', $address_str);
 
-			file_put_contents($sieve_file, $tpl->grab());
-
+			file_put_contents($sieve_file_isp, $tpl->grab());
+			//* create symlink to activate sieve script
+			symlink("sieve/ispconfig.sieve", ".sieve")  or $app->log("Unable to create symlink to active sieve filter", LOGLEVEL_WARN);	
 			unset($tpl);
 
 		}
@@ -215,7 +217,9 @@ class maildeliver_plugin {
 		global $app, $conf;
 
 		$sieve_file = $data["old"]["maildir"].'/.sieve';
+		$sieve_file_isp = $data["old"]["maildir"].'/sieve/ispconfig.sieve';
 		if(is_file($sieve_file)) unlink($sieve_file)  or $app->log("Unable to delete file: $sieve_file", LOGLEVEL_WARN);
+		if(is_file($sieve_file_isp)) unlink($sieve_file_isp)  or $app->log("Unable to delete file: $sieve_file_isp", LOGLEVEL_WARN);
 	}