diff --git a/server/plugins-available/getmail_plugin.inc.php b/server/plugins-available/getmail_plugin.inc.php
index 80424ad001eca7a4d286da49ca5f1e3bc924ad4d..5b1edfbab97c6c44f9040005d4c2881ec546e867 100644
--- a/server/plugins-available/getmail_plugin.inc.php
+++ b/server/plugins-available/getmail_plugin.inc.php
@@ -100,7 +100,11 @@ class getmail_plugin {
 
 			if($data["new"]["active"] == 'y') {
 				// Open master template
-				$tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
+				if(file_exists($conf["rootpath"].'/conf-custom/getmail.conf.master')) {
+					$tpl = file_get_contents($conf["rootpath"].'/conf-custom/getmail.conf.master');
+				} else {
+					$tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
+				}
 
 				// Shall emails be deleted after retrieval
 				if($data["new"]["source_delete"] == 'y') {
diff --git a/server/plugins-available/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php
index 37b030608012cf01b3af88e0aed2c2577734c683..5e05bc37c61aea4dc6c87b337bffd732ad87c86b 100644
--- a/server/plugins-available/maildrop_plugin.inc.php
+++ b/server/plugins-available/maildrop_plugin.inc.php
@@ -137,7 +137,11 @@ class maildrop_plugin {
 				}
 
 				// Load the master template
-				$tpl = file_get_contents($conf["rootpath"].'/conf/autoresponder.master');
+				if(file_exists($conf["rootpath"].'/conf-custom/autoresponder.master')) {
+					$tpl = file_get_contents($conf["rootpath"].'/conf-custom/autoresponder.master');
+				} else {
+					$tpl = file_get_contents($conf["rootpath"].'/conf/autoresponder.master');
+				}
 				$tpl = str_replace('{vmail_mailbox_base}', $mail_config["homedir_path"], $tpl);
 
 				if ($data["new"]["autoresponder_start_date"] != '0000-00-00 00:00:00') { // Dates have been set
@@ -201,7 +205,11 @@ class maildrop_plugin {
 				}
 
 				if($data["new"]["move_junk"] == 'y') {
-					$mailfilter_content .= file_get_contents($conf["rootpath"].'/conf/mailfilter_move_junk.master')."\n";
+					if(file_exists($conf["rootpath"].'/conf-custom/mailfilter_move_junk.master')) {
+						$mailfilter_content .= file_get_contents($conf["rootpath"].'/conf-custom/mailfilter_move_junk.master')."\n";
+					} else {
+						$mailfilter_content .= file_get_contents($conf["rootpath"].'/conf/mailfilter_move_junk.master')."\n";
+					}
 				}
 				$mailfilter_content .= $data["new"]["custom_mailfilter"];