diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 11de86cb..c89b8c9b 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -24,3 +24,4 @@ install(FILES version-021.sql DESTINATION ${SQL_DEST})
 install(FILES version-022.sql DESTINATION ${SQL_DEST})
 install(FILES version-023.sql DESTINATION ${SQL_DEST})
 install(FILES version-024.sql DESTINATION ${SQL_DEST})
+install(FILES version-025.sql DESTINATION ${SQL_DEST})
diff --git a/sql/version-025.sql b/sql/version-025.sql
new file mode 100644
index 00000000..7b7c287d
--- /dev/null
+++ b/sql/version-025.sql
@@ -0,0 +1,15 @@
+--
+-- Rebuild corrupted MessageSearchTable indexes. Bug 772522.
+--
+
+-- According to the FTS3 docs <https://www.sqlite.org/fts3.html>, this
+-- needs to be done "whenever the implementation of a custom tokeniser
+-- changes", but Geary is also seeing the indexes being corrupted when
+-- doing UPDATEs on MessageSearchTable. Bug 772522 has replaced use of
+-- that with a SELECT/DELETE/INSERT which does not result in a
+-- corrupted index, so do a rebuild here to ensure everyone's is not
+-- back in order.
+INSERT INTO MessageSearchTable(MessageSearchTable) VALUES('rebuild');
+
+-- While we're here, optimise it as well.
+INSERT INTO MessageSearchTable(MessageSearchTable) VALUES('optimize');