Rather than when mentioning someone on Android and then writing another message, and showing it as a different message, make it like PC, which shows it as one message.