git » sdk » commit 152b8ab

diff --git a/borogove/Message.hx b/borogove/Message.hx
index 22827da..ae918e4 100644
--- a/borogove/Message.hx
+++ b/borogove/Message.hx
@@ -324,6 +324,7 @@ class Message {
 				replyToMessage.replyId = replyToID;
 				if ((msg.serverIdBy != null && msg.serverIdBy != localJid.asBare().asString()) || isGroupchat) {
 					replyToMessage.serverId = replyToID;
+					replyToMessage.serverIdBy = msg.serverIdBy;
 				} else {
 					replyToMessage.localId = replyToID;
 				}
diff --git a/borogove/persistence/IDB.js b/borogove/persistence/IDB.js
index 06e9b39..d2f0361 100644
--- a/borogove/persistence/IDB.js
+++ b/borogove/persistence/IDB.js
@@ -589,7 +589,9 @@ export default async (dbname, media, tokenize, stemmer) => {
 
 			(
 				// Hydrate reply stubs
-				message.replyToMessage && !message.replyToMessage.serverIdBy ? this.getMessage(account, message.chatId(), message.replyToMessage.serverId, message.replyToMessage.localId) : Promise.resolve(message.replyToMessage)
+				message.replyToMessage && !message.replyToMessage.stanza ?
+					this.getMessage(account, message.chatId(), message.replyToMessage.serverId, message.replyToMessage.localId) :
+					Promise.resolve(message.replyToMessage)
 			).then((replyToMessage) => {
 				message.replyToMessage = replyToMessage;
 				const tx = db.transaction(["messages", "reactions"], "readwrite");