Slight reordering.
Message screen handles market:// urls