diff --git a/web/database/queries/draft-queries.js b/web/database/queries/draft-queries.js
index 5e8faab79..a8ffa2a56 100644
--- a/web/database/queries/draft-queries.js
+++ b/web/database/queries/draft-queries.js
@@ -1,36 +1,51 @@
 // @flow
 
-import type { SqliteDatabase } from 'sql.js';
+import { SqliteDatabase } from 'sql.js';
+
+import type { ClientDBDraftInfo } from 'lib/types/draft-types.js';
+
+import { parseMultiStatementSQLiteResult } from '../utils/db-utils.js';
 
 function removeAllDrafts(db: SqliteDatabase) {
   db.exec(`DELETE FROM drafts`);
 }
 
 function updateDraft(db: SqliteDatabase, key: string, text: string) {
   const query = `
     INSERT OR REPLACE INTO drafts (key, text)
     VALUES ($key, $text)
   `;
   const params = {
     $key: key,
     $text: text,
   };
 
   db.exec(query, params);
 }
 
 function moveDraft(db: SqliteDatabase, oldKey: string, newKey: string) {
   const query = `
     UPDATE OR REPLACE drafts
     SET key = $newKey, text = (SELECT text FROM drafts WHERE key = $oldKey)
     WHERE key = $oldKey
   `;
   const params = {
     $newKey: newKey,
     $oldKey: oldKey,
   };
 
   db.exec(query, params);
 }
 
-export { removeAllDrafts, updateDraft, moveDraft };
+function getAllDrafts(db: SqliteDatabase): ClientDBDraftInfo[] {
+  const rawDBResult = db.exec(`SELECT * FROM drafts`);
+  const dbResult =
+    parseMultiStatementSQLiteResult<ClientDBDraftInfo>(rawDBResult);
+  if (dbResult.length === 0) {
+    return [];
+  }
+
+  return dbResult[0];
+}
+
+export { removeAllDrafts, updateDraft, moveDraft, getAllDrafts };