diff --git a/email2/src/com/android/email/mail/store/ImapStore.java b/email2/src/com/android/email/mail/store/ImapStore.java
index c30405594..72ad658cc 100644
--- a/email2/src/com/android/email/mail/store/ImapStore.java
+++ b/email2/src/com/android/email/mail/store/ImapStore.java
@@ -26,6 +26,7 @@ import android.util.Log;
 
 import com.android.email.LegacyConversions;
 import com.android.email.Preferences;
+import com.android.email.R;
 import com.android.email.VendorPolicyLoader;
 import com.android.email.mail.Store;
 import com.android.email.mail.Transport;
@@ -418,8 +419,9 @@ public class ImapStore extends Store {
                     mailboxes.put(folderName, folder);
                 }
             }
+            String inboxName = mContext.getString(R.string.mailbox_name_display_inbox);
             Folder newFolder =
-                addMailbox(mContext, mAccount.mId, ImapConstants.INBOX, '\0', true /*selectable*/);
+                addMailbox(mContext, mAccount.mId, inboxName, '\0', true /*selectable*/);
             mailboxes.put(ImapConstants.INBOX, (ImapFolder)newFolder);
             createHierarchy(mailboxes);
             saveMailboxList(mContext, mailboxes);
diff --git a/email2/src/com/android/email/mail/store/Pop3Store.java b/email2/src/com/android/email/mail/store/Pop3Store.java
index 6eaa6e5e1..1188032e5 100644
--- a/email2/src/com/android/email/mail/store/Pop3Store.java
+++ b/email2/src/com/android/email/mail/store/Pop3Store.java
@@ -160,8 +160,9 @@ public class Pop3Store extends Store {
 
     @Override
     public Folder[] updateFolders() {
-        Mailbox mailbox = Mailbox.getMailboxForPath(mContext, mAccount.mId, POP3_MAILBOX_NAME);
-        updateMailbox(mailbox, mAccount.mId, POP3_MAILBOX_NAME, '\0', true, Mailbox.TYPE_INBOX);
+        String inboxName = mContext.getString(R.string.mailbox_name_display_inbox);
+        Mailbox mailbox = Mailbox.getMailboxForPath(mContext, mAccount.mId, inboxName);
+        updateMailbox(mailbox, mAccount.mId, inboxName, '\0', true, Mailbox.TYPE_INBOX);
         // Force the parent key to be "no mailbox" for the mail POP3 mailbox
         mailbox.mParentKey = Mailbox.NO_MAILBOX;
         if (mailbox.isSaved()) {
@@ -178,7 +179,7 @@ public class Pop3Store extends Store {
             }
         }
 
-        return new Folder[] { getFolder(POP3_MAILBOX_NAME) };
+        return new Folder[] { getFolder(inboxName) };
     }