diff --git a/src/Tests/Tests.Messages.ts b/src/Tests/Tests.Messages.ts
index 7641f72..e421e87 100644
--- a/src/Tests/Tests.Messages.ts
+++ b/src/Tests/Tests.Messages.ts
@@ -28,11 +28,15 @@ WAConnectionTest('Messages', (conn) => {
         assert.ok (received.jpegThumbnail)
     })
     it('should quote a message', async () => {
-        const messages = await conn.loadMessages(testJid, 2)
+        const {messages} = await conn.loadMessages(testJid, 2)
         const message = await sendAndRetreiveMessage(conn, 'hello fren 2', MessageType.extendedText, {
             quoted: messages[0],
         })
         assert.strictEqual(message.message.extendedTextMessage.contextInfo.stanzaId, messages[0].key.id)
+        assert.strictEqual(
+            message.message.extendedTextMessage.contextInfo.participant, 
+            messages[0].key.fromMe ? conn.user.id : messages[0].key.id
+        )
     })
     it('should send a gif', async () => {
         const content = await fs.readFile('./Media/ma_gif.mp4')
diff --git a/src/WAConnection/6.MessagesSend.ts b/src/WAConnection/6.MessagesSend.ts
index 20acc79..7c1ad08 100644
--- a/src/WAConnection/6.MessagesSend.ts
+++ b/src/WAConnection/6.MessagesSend.ts
@@ -150,7 +150,7 @@ export class WAConnection extends Base {
         if (options.contextInfo) message[key].contextInfo = options.contextInfo
 
         if (quoted) {
-            const participant = quoted.key.participant || quoted.key.remoteJid
+            const participant = quoted.key.fromMe ? this.user.id : (quoted.key.participant || quoted.key.remoteJid)
 
             message[key].contextInfo = message[key].contextInfo || { }
             message[key].contextInfo.participant = participant