diff --git a/keyserver/src/creators/message-creator.js b/keyserver/src/creators/message-creator.js
--- a/keyserver/src/creators/message-creator.js
+++ b/keyserver/src/creators/message-creator.js
@@ -131,6 +131,10 @@
         ? creationString(viewer, messageData.localID)
         : null;
 
+    const targetMessageID = messageData.targetMessageID
+      ? messageData.targetMessageID
+      : null;
+
     messageInsertRows.push([
       ids[i],
       threadID,
@@ -139,6 +143,7 @@
       content,
       messageData.time,
       creation,
+      targetMessageID,
     ]);
     messageInfos.push(rawMessageInfoFromMessageData(messageData, ids[i]));
   }
@@ -166,7 +171,8 @@
   }
 
   const messageInsertQuery = SQL`
-    INSERT INTO messages(id, thread, user, type, content, time, creation)
+    INSERT INTO messages(id, thread, user, type, content, time,
+      creation, target_message)
     VALUES ${messageInsertRows}
   `;
   await Promise.all([