diff --git a/sql/version-028.sql b/sql/version-028.sql
new file mode 100644
index 00000000..ff38053e
--- /dev/null
+++ b/sql/version-028.sql
@@ -0,0 +1,6 @@
+--
+-- Rebuild corrupted message ids, again
+--
+
+UPDATE MessageTable
+SET message_id = trim(trim(message_id), '\n');
diff --git a/test/engine/imap-db/imap-db-database-test.vala b/test/engine/imap-db/imap-db-database-test.vala
index 29d38768..f5f3702c 100644
--- a/test/engine/imap-db/imap-db-database-test.vala
+++ b/test/engine/imap-db/imap-db-database-test.vala
@@ -107,7 +107,7 @@ class Geary.ImapDB.DatabaseTest : TestCase {
         );
         db.open.end(async_result());
 
-        assert_equal<int?>(db.get_schema_version(), 27, "Post-upgrade version");
+        assert_equal<int?>(db.get_schema_version(), 28, "Post-upgrade version");
 
         // Since schema v22 deletes the re-creates all attachments,
         // attachment 12 should no longer exist on the file system and