diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index b31d604c0b50c3ef22f7abc1074bc5a91b6c5c0c..c5c5f4607c1e87e21d3d695fce1429fd91429628 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -19,6 +19,7 @@ backup_dir=/var/backup
 backup_dir_is_mount=n
 backup_dir_mount_cmd=
 backup_mode=rootgz
+baclup_delete=n
 monit_url=
 monit_user=
 monit_password=
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index cde19e44b4a4967596df48b75b60b1478cf3ab54..dde1d746a9e054470bed0252205181c910a37caf 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -195,6 +195,12 @@ $form["tabs"]['server'] = array(
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'backup_delete' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		'monit_url' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 385ff9fd96d522d88d21fa86398b02237b9217f1..07e94af875a1d97c685846ecc1f62b32bb57edbd 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -196,4 +196,5 @@ $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
 $wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
 ?>
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 7c0c7b7e4d512c392f9aeaf06cce5110ff4d30a0..e52a543ce316bb9b2ca6aa169295aed89a406d81 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -73,6 +73,12 @@
                 <select name="backup_mode" id="backup_mode" class="selectInput">
                     {tmpl_var name='backup_mode'}
                 </select>
+            </div>
+            <div class="ctrlHolder">
+                <p class="label">{tmpl_var name='backup_delete_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='backup_delete'}
+                </div>
             </div>
 			<div class="ctrlHolder">
                 <label for="monit_url">{tmpl_var name='monit_url_txt'}</label>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 499f23eb13d57f0b3af31df9532db6e703773874..5fc085be74ce3a8050a9fc717d5631b9f8396eaa 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1991,7 +1991,7 @@ class apache2_plugin {
 				//* mount backup directory, if necessary
 				$mount_backup = true;
 				$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
-				if($server_config['backup_dir'] != '') {
+				if($server_config['backup_dir'] != '' && $server_config['backup_delete'] == 'y') {
 					if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
 						if(!$app->system->is_mounted($backup_dir)){
 							exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index 378c4aded895c09830ae42481bdb6781e6eaecf8..4a308da615a5f805d83e514819ca036eef960c0d 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -326,13 +326,14 @@ class mail_plugin {
 		} else {
 			$app->log('Possible security violation when deleting the maildir: '.$data['old']['maildir'], LOGLEVEL_ERROR);
 		}
+
 		//* Delete the mail-backups
 		$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
 		$backup_dir = $server_config['backup_dir'];
 		//* mount backup directory, if necessary
 		$mount_backup = true;
 		$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
-		if($server_config['backup_dir'] != '' && $maildir_path_deleted) {
+		if($server_config['backup_dir'] != '' && $maildir_path_deleted && $server_config['backup_delete'] == 'y') {
 			if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
 				if(!$app->system->is_mounted($backup_dir)){
 					exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
@@ -391,7 +392,7 @@ class mail_plugin {
 		//* mount backup directory, if necessary
 		$mount_backup = true;
 		$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
-		if($server_config['backup_dir'] != '' && $maildomain_path_deleted) {
+		if($server_config['backup_dir'] != '' && $maildomain_path_deleted && $server_config['backup_delete'] == 'y'){
 			if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
 				if(!$app->system->is_mounted($backup_dir)){
 					exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));