diff --git a/src/com/android/email/activity/MessageListXLFragmentManager.java b/src/com/android/email/activity/MessageListXLFragmentManager.java
index 72f4f27d0..d61a0b5f6 100644
--- a/src/com/android/email/activity/MessageListXLFragmentManager.java
+++ b/src/com/android/email/activity/MessageListXLFragmentManager.java
@@ -360,7 +360,7 @@ class MessageListXLFragmentManager {
      */
     public void goBackToMailbox() {
         if (isMessageSelected()) {
-            selectMailbox(getMailboxId(), false);
+            mThreePane.showLeftPane(); // Show mailbox list
         }
     }
 
diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
index 0e4e5de9e..7584cefb6 100644
--- a/src/com/android/email/activity/MessageViewFragment.java
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -408,7 +408,6 @@ public class MessageViewFragment extends MessageViewFragmentBase {
 
     private void onMarkAsUnread() {
         onMarkMessageAsRead(false);
-        mCallback.onMessageSetUnread();
     }
 
     /**