diff --git a/util/db-mysql.sql b/util/db-mysql.sql
index 05d835b7..8ccfb54e 100644
--- a/util/db-mysql.sql
+++ b/util/db-mysql.sql
@@ -51,7 +51,7 @@ create table if not exists `metadata` (
   `digest` char(64) not null,
   `bodydigest` char(64) not null,
   `vcode` char(64) default null,
-  primary key (`id`), unique(`message_id`)
+  primary key (`id`)
 ) Engine=InnoDB;
 
 create index metadata_idx on metadata(`piler_id`);
diff --git a/util/db-upgrade-0.1.22-vs-0.1.23.sql b/util/db-upgrade-0.1.22-vs-0.1.23.sql
index 21700759..f892e60b 100644
--- a/util/db-upgrade-0.1.22-vs-0.1.23.sql
+++ b/util/db-upgrade-0.1.22-vs-0.1.23.sql
@@ -6,3 +6,6 @@ create table if not exists `domain_user` (
    key `domain_user_idx2` (`uid`)
 ) ENGINE=InnoDB;
 
+
+alter table metadata drop index message_id;
+