--- a/mail/test/mozmill/migration-from-tb2/prefs.js
+++ b/mail/test/mozmill/migration-from-tb2/prefs.js
@@ -8,17 +8,16 @@
  * To make a manual change to preferences, you can visit the URL about:config
  * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
  */
 
 user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1273257684);
 user_pref("app.update.lastUpdateTime.background-update-timer", 1273257684);
 user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1273257684);
 user_pref("extensions.checkCompatibility.3.3a", false);
-user_pref("extensions.lastAppVersion", "2.0.0.24");
 user_pref("intl.charsetmenu.mailview.cache", "windows-1252, ISO-8859-1, UTF-8");
 user_pref("ldap_2.prefs_migrated", true);
 user_pref("ldap_2.servers.default.filename", "default.mab");
 user_pref("ldap_2.servers.default.replication.lastChangeNumber", 0);
 user_pref("ldap_2.servers.default.uri", "moz-abldapdirectory://default.mab");
 user_pref("ldap_2.servers.history.replication.lastChangeNumber", 0);
 user_pref("ldap_2.servers.pab.replication.lastChangeNumber", 0);
 user_pref("mail.account.account1.server", "server1");
@@ -53,29 +52,31 @@ user_pref("mail.root.pop3", "AAAAAAG8AAI
 user_pref("mail.root.pop3-rel", "[ProfD]Mail");
 user_pref("mail.server.server1.directory", "AAAAAAHeAAIAAQxNYWNpbnRvc2ggSEQAAAAAAAAAAAAAAAAAAADE+gKpSCsAAAG+vngNTG9jYWwgRm9sZGVycwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAb6+ecgJ1KoAAAAAAAAAAP////8AAAkgAAAAAAAAAAAAAAAAAAAABE1haWwAEAAIAADE+jrpAAAAEQAIAADICgzqAAAAAQAcAb6+eAG+viQADiAPAA4gBwAKSrcACkq2AAB72AACAF9NYWNpbnRvc2ggSEQ6VXNlcnM6YndpbnRvbjpMaWJyYXJ5OlRodW5kZXJiaXJkOlByb2ZpbGVzOjFzaGNlbHhoLnRiMi1kZWZhdWx0Ok1haWw6TG9jYWwgRm9sZGVycwAADgAcAA0ATABvAGMAYQBsACAARgBvAGwAZABlAHIAcwAPABoADABNAGEAYwBpAG4AdABvAHMAaAAgAEgARAASAFJVc2Vycy9id2ludG9uL0xpYnJhcnkvVGh1bmRlcmJpcmQvUHJvZmlsZXMvMXNoY2VseGgudGIyLWRlZmF1bHQvTWFpbC9Mb2NhbCBGb2xkZXJzABMAAS8AABUAAgAO//8AAA==");
 user_pref("mail.server.server1.directory-rel", "[ProfD]Mail/Local Folders");
 user_pref("mail.server.server1.hostname", "Local Folders");
 user_pref("mail.server.server1.name", "Local Folders");
 user_pref("mail.server.server1.type", "none");
 user_pref("mail.server.server1.userName", "nobody");
 user_pref("mail.server.server2.capability", 811553);
+user_pref("mail.server.server2.check_new_mail", false);
 user_pref("mail.server.server2.directory", "AAAAAAHuAAIAAQxNYWNpbnRvc2ggSEQAAAAAAAAAAAAAAAAAAADE+gKpSCsAAAG+vjEOaW1hcC5nbWFpbC5jb20AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAb6/KcgJ1ngAAAAAAAAAAP////8AAAkgAAAAAAAAAAAAAAAAAAAACEltYXBNYWlsABAACAAAxPo66QAAABEACAAAyAoOuAAAAAEAHAG+vjEBvr4kAA4gDwAOIAcACkq3AApKtgAAe9gAAgBkTWFjaW50b3NoIEhEOlVzZXJzOmJ3aW50b246TGlicmFyeTpUaHVuZGVyYmlyZDpQcm9maWxlczoxc2hjZWx4aC50YjItZGVmYXVsdDpJbWFwTWFpbDppbWFwLmdtYWlsLmNvbQAOAB4ADgBpAG0AYQBwAC4AZwBtAGEAaQBsAC4AYwBvAG0ADwAaAAwATQBhAGMAaQBuAHQAbwBzAGgAIABIAEQAEgBXVXNlcnMvYndpbnRvbi9MaWJyYXJ5L1RodW5kZXJiaXJkL1Byb2ZpbGVzLzFzaGNlbHhoLnRiMi1kZWZhdWx0L0ltYXBNYWlsL2ltYXAuZ21haWwuY29tAAATAAEvAAAVAAIADv//AAA=");
 user_pref("mail.server.server2.directory-rel", "[ProfD]ImapMail/imap.gmail.com");
 user_pref("mail.server.server2.download_on_biff", true);
 user_pref("mail.server.server2.hostname", "imap.gmail.com");
-user_pref("mail.server.server2.login_at_startup", true);
+user_pref("mail.server.server2.login_at_startup", false);
 user_pref("mail.server.server2.max_cached_connections", 5);
 user_pref("mail.server.server2.name", "blaketestwinton@gmail.com");
 user_pref("mail.server.server2.namespace.personal", "\"\"");
 user_pref("mail.server.server2.port", 993);
 user_pref("mail.server.server2.realhostname", "imap.googlemail.com");
 user_pref("mail.server.server2.socketType", 3);
 user_pref("mail.server.server2.type", "imap");
 user_pref("mail.server.server2.userName", "blaketestwinton");
+user_pref("mail.shell.checkDefaultClient", false);
 user_pref("mail.showFolderPaneColumns", true);
 user_pref("mail.smtp.defaultserver", "smtp2");
 user_pref("mail.smtpserver.smtp1.description", "Gmail");
 user_pref("mail.smtpserver.smtp1.hostname", "smtp.gmail.com");
 user_pref("mail.smtpserver.smtp1.port", 587);
 user_pref("mail.smtpserver.smtp1.try_ssl", 2);
 user_pref("mail.smtpserver.smtp1.username", "blaketestwinton");
 user_pref("mail.smtpserver.smtp2.description", "Gmail");