diff --git a/src/com/android/email/activity/MessageListXL.java b/src/com/android/email/activity/MessageListXL.java
index 9d64f1bdc..34f755d05 100644
--- a/src/com/android/email/activity/MessageListXL.java
+++ b/src/com/android/email/activity/MessageListXL.java
@@ -342,10 +342,7 @@ public class MessageListXL extends Activity implements View.OnClickListener,
     @Override
     public void onMoveToMailboxSelected(long newMailboxId, long[] messageIds) {
         ActivityHelper.moveMessages(this, newMailboxId, messageIds);
-        if (!moveToOlder()) {
-            // if this is the last message, move up to message-list.
-            mFragmentManager.goBackToMailbox();
-        }
+        onCurrentMessageGone();
     }
 
     /**