commit a17b2751139b1f8579eef54056cb86c3ca0e02ac Author: Sukhbir Singh sukhbir@torproject.org Date: Thu Dec 26 21:56:04 2013 -0500

Make sure we respect #10309 during account creation --- chrome/content/emailwizard.js | 6 ++++++ components/torbirdy.js | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index d4b2c3a..2cab873 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -83,6 +83,12 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { var checkNewMailPref = checkNewMail.replace("%serverkey%", serverkey); prefs.setBoolPref(checkNewMailPref, false);

+ // Make sure that drafts are saved to Local Folders if it is an IMAP account. + if (protocol === "imap") { + var identity = newAccount.defaultIdentity; + identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts"; + } + // From comm-release/mailnews/base/prefs/content/accountcreation/emailWizard.js : onAdvancedSetup(). var windowManager = Cc["@mozilla.org/appshell/window-mediator;1"] .getService(Ci.nsIWindowMediator); diff --git a/components/torbirdy.js b/components/torbirdy.js index 1480c5d..b12bd41 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -541,7 +541,6 @@ TorBirdy.prototype = { // Now apply our setting where we set the Drafts folder to Local Folders. // The user is free to change this as this setting is not enforced. identity.draftFolder = "mailbox://nobody@Local%20Folders/Drafts"; - identity.draftsFolderPickerMode = 0; } }