@Spiricom I believe this is an issue with the authors/creators of Mastodon don't using it all that much themselves or they would have fixed it. :)
Don't know if you're up for it, but some third-party client apps get this right, e.g. Ivory; I think https://elk.zone (web-based client) does it better as well.