Improved the MessageComponent key handling