Merge "fix expanded message details appearing above the message header"