diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 241be146f..d288b3984 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -331,7 +331,7 @@ public class NotificationController {
         com.android.mail.providers.Account uiAccount = null;
         try {
             if (accountCursor.moveToFirst()) {
-                uiAccount = new com.android.mail.providers.Account(accountCursor);
+                uiAccount = com.android.mail.providers.Account.builder().buildFrom(accountCursor);
             }
         } finally {
             accountCursor.close();
@@ -671,7 +671,7 @@ public class NotificationController {
         com.android.mail.providers.Account account = null;
         try {
             if (accountCursor.moveToFirst()) {
-                account = new com.android.mail.providers.Account(accountCursor);
+                account = com.android.mail.providers.Account.builder().buildFrom(accountCursor);
             }
         } finally {
             accountCursor.close();
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index e2cba83bb..61f59aae2 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -210,6 +210,7 @@ public class AccountSettingsFragment extends MailAccountPrefsFragment
         }
     }
 
+    @Override
     public void onSaveInstanceState(Bundle outstate) {
         super.onSaveInstanceState(outstate);
         if (mCheckFrequency != null) {
@@ -459,7 +460,7 @@ public class AccountSettingsFragment extends MailAccountPrefsFragment
             }
 
             final com.android.mail.providers.Account uiAccount =
-                    new com.android.mail.providers.Account(uiAccountCursor);
+                    com.android.mail.providers.Account.builder().buildFrom(uiAccountCursor);
 
             map.put(RESULT_KEY_UIACCOUNT, uiAccount);
 
diff --git a/src/com/android/email/preferences/EmailPreferenceMigrator.java b/src/com/android/email/preferences/EmailPreferenceMigrator.java
index 99c9a66be..192ae1d57 100644
--- a/src/com/android/email/preferences/EmailPreferenceMigrator.java
+++ b/src/com/android/email/preferences/EmailPreferenceMigrator.java
@@ -57,7 +57,7 @@ public class EmailPreferenceMigrator extends BasePreferenceMigrator {
         } else {
             try {
                 while (accountCursor.moveToNext()) {
-                    accounts.add(new Account(accountCursor));
+                    accounts.add(Account.builder().buildFrom(accountCursor));
                 }
             } finally {
                 accountCursor.close();
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 99c676590..5b7ae5e44 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -5402,7 +5402,7 @@ public class EmailProvider extends ContentProvider
         try {
             if (ac.moveToFirst()) {
                 final com.android.mail.providers.Account uiAccount =
-                        new com.android.mail.providers.Account(ac);
+                        com.android.mail.providers.Account.builder().buildFrom(ac);
                 Intent intent = new Intent(context, FolderPickerActivity.class);
                 intent.putExtra(PICKER_UI_ACCOUNT, uiAccount);
                 intent.putExtra(PICKER_MAILBOX_TYPE, type);
diff --git a/src/com/android/email/provider/WidgetProvider.java b/src/com/android/email/provider/WidgetProvider.java
index 3b17e4711..6909e8902 100644
--- a/src/com/android/email/provider/WidgetProvider.java
+++ b/src/com/android/email/provider/WidgetProvider.java
@@ -159,7 +159,7 @@ public class WidgetProvider extends BaseWidgetProvider {
         com.android.mail.providers.Account uiAccount = null;
         try {
             if (accountCursor.moveToFirst()) {
-                 uiAccount = new com.android.mail.providers.Account(accountCursor);
+                 uiAccount = com.android.mail.providers.Account.builder().buildFrom(accountCursor);
             }
         } finally {
             accountCursor.close();
diff --git a/src/com/android/email2/ui/MailActivityEmail.java b/src/com/android/email2/ui/MailActivityEmail.java
index 0723e64b5..fae8101c0 100644
--- a/src/com/android/email2/ui/MailActivityEmail.java
+++ b/src/com/android/email2/ui/MailActivityEmail.java
@@ -231,7 +231,7 @@ public class MailActivityEmail extends com.android.mail.ui.MailActivity {
         com.android.mail.providers.Account account = null;
         try {
             if (accountCursor.moveToFirst()) {
-                account = new com.android.mail.providers.Account(accountCursor);
+                account = com.android.mail.providers.Account.builder().buildFrom(accountCursor);
             }
         } finally {
             accountCursor.close();