diff --git a/src/app_service/service/message/service.nim b/src/app_service/service/message/service.nim
index 0f545d3f4c..125645ea06 100644
--- a/src/app_service/service/message/service.nim
+++ b/src/app_service/service/message/service.nim
@@ -4,6 +4,7 @@ import ../../../app/core/tasks/[qt, threadpool]
import ../../../app/core/signals/types
import ../../../app/core/eventemitter
import ../../../app/global/global_singleton
+import ../../../backend/accounts as status_accounts
import ../../../backend/messages as status_go
import ../contacts/service as contact_service
import ../token/service as token_service
@@ -665,8 +666,11 @@ proc renderInline(self: Service, parsedText: ParsedText): string =
of PARSED_TEXT_CHILD_TYPE_STRONG_EMPH:
result = fmt(" {value} ")
of PARSED_TEXT_CHILD_TYPE_MENTION:
- let contactDto = self.contactService.getContactById(value)
- result = fmt("{contactDto.userNameOrAlias()}")
+ var id = value
+ if isCompressedPubKey(id):
+ id = status_accounts.decompressPk(id).result
+ let contactDto = self.contactService.getContactById(id)
+ result = fmt("{contactDto.userNameOrAlias()}")
of PARSED_TEXT_CHILD_TYPE_STATUS_TAG:
result = fmt("#{value}")
of PARSED_TEXT_CHILD_TYPE_DEL:
diff --git a/vendor/status-go b/vendor/status-go
index 2873e65a61..05073a9640 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit 2873e65a611ed00782d3b833f5a6c2340f98939d
+Subproject commit 05073a96407ca40313663f7423195ce767c6d9c5