diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index 5b6ac4f9e8bfa6803b965bf6bb9eaa00e1c06fe3..20d10e189e90f8a5d16a41eba94e47054fb47fe1 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -118,8 +118,8 @@ class mail_plugin {
 		// Move mailbox, if domain has changed and delete old mailbox
 		if($data['new']['maildir'] != $data['old']['maildir'] && is_dir($data['old']['maildir'])) {
 			if(is_dir($data['new']['maildir'])) {
-				exec("rm -f ".escapeshellcmd($data['new']['maildir']).'/*');
-				rmdir($data['new']['maildir']);
+				exec("rm -fr ".escapeshellcmd($data['new']['maildir']));
+				//rmdir($data['new']['maildir']);
 			}
 			exec('mv -f '.escapeshellcmd($data['old']['maildir']).' '.escapeshellcmd($data['new']['maildir']));
 			// exec('mv -f '.escapeshellcmd($data['old']['maildir']).'/* '.escapeshellcmd($data['new']['maildir']));