diff --git a/src/Client.js b/src/Client.js
index 522d79a..ca75e66 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -923,7 +923,7 @@ class Client extends EventEmitter {
             }
 
             const msg = await window.WWebJS.sendMessage(chat, message, options, sendSeen);
-            return msg.serialize();
+            return window.WWebJS.getMessageModel(msg);
         }, chatId, content, internalOptions, sendSeen);
 
         return new Message(this, newMessage);
diff --git a/src/util/Injected.js b/src/util/Injected.js
index dd32a9d..3e85a91 100644
--- a/src/util/Injected.js
+++ b/src/util/Injected.js
@@ -532,7 +532,7 @@ exports.LoadUtils = () => {
 
         msg.isEphemeral = message.isEphemeral;
         msg.isStatusV3 = message.isStatusV3;
-        msg.links = (message.getRawLinks()).map(link => ({
+        msg.links = (window.Store.Validators.findLinks(message.mediaObject ? message.caption : message.body)).map((link) => ({
             link: link.href,
             isSuspicious: Boolean(link.suspiciousCharacters && link.suspiciousCharacters.size)
         }));