                 mailboxes         : @state.mailboxes
                 selectedAccount   : @state.selectedAccount
                 selectedMailboxID : @state.selectedMailboxID
+                message           : MessageStore.getByID messageID
                 conversation      : MessageStore.getMessagesByConversation messageID
 
         # -- Generates the new message composition form

        # -- Generates a conversation
        else if panelInfo.action is 'message'

            return Conversation
                layout            : layout
                settings          : @state.settings

                layout          : layout
                action          : null
                inReplyTo       : null
                settings        : @state.settings
                accounts        : @state.accounts
                selectedAccount : @state.selectedAccount
                message         : message or null
