diff --git a/root/usr/share/mozilla-mcd/thunderbird.php b/root/usr/share/mozilla-mcd/thunderbird.php
index 73a86a6..a7c264a 100644
--- a/root/usr/share/mozilla-mcd/thunderbird.php
+++ b/root/usr/share/mozilla-mcd/thunderbird.php
@@ -124,8 +124,11 @@ for ($i=0; $i < count($user[0]['mail'])-1; $i++){
 <?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.smtpServer", "smtp1");
 <?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.useremail", "<?php echo $user[0]['mail'][$i]; ?>");
 <?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.valid", true);
+defaultPref("mail.identity.id<?php echo $id; ?>.fcc_folder_pickup_mode", "1");
 defaultPref("mail.identity.id<?php echo $id; ?>.fcc_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Sent");
+defaultPref("mail.identity.id<?php echo $id; ?>.drafts_folder_pickup_mode", "1");
 defaultPref("mail.identity.id<?php echo $id; ?>.draft_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Drafts");
+defaultPref("mail.identity.id<?php echo $id; ?>.templ_folder_pickup_mode", "1");
 defaultPref("mail.identity.id<?php echo $id; ?>.stationery_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Templates");
 defaultPref("mail.identity.id<?php echo $id; ?>.attach_signature", true);
 defaultPref("mail.identity.id<?php echo $id; ?>.sig_file", path_profile+path_sep+"signature"+path_sep+"email.html");