diff --git a/src/com/android/email/activity/UIControllerBase.java b/src/com/android/email/activity/UIControllerBase.java
index 8796c3a7e..fc937d958 100644
--- a/src/com/android/email/activity/UIControllerBase.java
+++ b/src/com/android/email/activity/UIControllerBase.java
@@ -870,7 +870,13 @@ abstract class UIControllerBase implements MailboxListFragment.Callback,
         // Something bad happened - the account or mailbox we were looking for was deleted.
         // Just restart and let the entry flow find a good default view.
         Utility.showToast(mActivity, R.string.toast_mailbox_not_found);
-        Welcome.actionStart(mActivity);
+        long accountId = getUIAccountId();
+        if (accountId != Account.NO_ACCOUNT) {
+            mActivity.startActivity(Welcome.createOpenAccountInboxIntent(mActivity, accountId));
+        } else {
+            Welcome.actionStart(mActivity);
+
+        }
         mActivity.finish();
     }
 
diff --git a/src/com/android/email/activity/UIControllerOnePane.java b/src/com/android/email/activity/UIControllerOnePane.java
index 89145775e..815325b5c 100644
--- a/src/com/android/email/activity/UIControllerOnePane.java
+++ b/src/com/android/email/activity/UIControllerOnePane.java
@@ -32,7 +32,6 @@ import com.android.emailcommon.Logging;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.EmailContent.Message;
 import com.android.emailcommon.provider.Mailbox;
-import com.android.emailcommon.utility.Utility;
 
 import java.util.Set;