diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index daa9e0105..b2d70863c 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -546,7 +546,9 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
         if (mailbox.mType == EmailContent.Mailbox.TYPE_DRAFTS) {
             MessageCompose.actionEditDraft(this, messageId);
         } else {
-            MessageView.actionView(this, messageId, mailboxId);
+            // WARNING: here we pass mMailboxId, which can be the negative id of a compound
+            // mailbox, instead of the mailboxId of the particular message that is opened
+            MessageView.actionView(this, messageId, mMailboxId);
         }
     }