diff --git a/src/main/resources/database/mysql/alter_10_3_2_to_10_3_3.sql b/src/main/resources/database/mysql/alter_10_3_2_to_10_3_3.sql
index 2e972fb1f05e37c4c88d9b4c426ad5a60337d62c..17d5e2eca76c46c7eaa722265c3f4e3b3dbc9e46 100644
--- a/src/main/resources/database/mysql/alter_10_3_2_to_10_3_3.sql
+++ b/src/main/resources/database/mysql/alter_10_3_2_to_10_3_3.sql
@@ -1 +1,3 @@
-alter table o_ac_offer add column autobooking boolean default 0;
\ No newline at end of file
+alter table o_ac_offer add column autobooking boolean default 0;
+
+create index idx_mail_meta_id_idx on o_mail (meta_mail_id);
\ No newline at end of file
diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql
index 5dbe58990df2a9a0a5b1dc80c886e4f13c29f09c..9b8c5e37100e8fec48dbdf462f9da10d2cd21fbe 100644
--- a/src/main/resources/database/mysql/setupDatabase.sql
+++ b/src/main/resources/database/mysql/setupDatabase.sql
@@ -2022,6 +2022,7 @@ alter table o_tag add constraint FK6491FCA5A4FA5DC foreign key (fk_author_id) re
 
 -- mail
 alter table o_mail add constraint FKF86663165A4FA5DC foreign key (fk_from_id) references o_mail_recipient (recipient_id);
+create index idx_mail_meta_id_idx on o_mail (meta_mail_id);
 
 alter table o_mail_recipient add constraint FKF86663165A4FA5DG foreign key (fk_recipient_id) references o_bs_identity (id);
 
diff --git a/src/main/resources/database/oracle/alter_10_3_2_to_10_3_3.sql b/src/main/resources/database/oracle/alter_10_3_2_to_10_3_3.sql
index 88bf104c6e405401d058eef298f794d834fd13d2..9552d3d714e661de5b463601096b9b33f4996bd6 100644
--- a/src/main/resources/database/oracle/alter_10_3_2_to_10_3_3.sql
+++ b/src/main/resources/database/oracle/alter_10_3_2_to_10_3_3.sql
@@ -1 +1,3 @@
 alter table o_ac_offer add autobooking number default 0 not null;
+
+create index idx_mail_meta_id_idx on o_mail (meta_mail_id);
diff --git a/src/main/resources/database/oracle/setupDatabase.sql b/src/main/resources/database/oracle/setupDatabase.sql
index 2823622633719d6293d864f09d631ec3b9cd88eb..119d08a4ed4dee413861ff9aa8544e9f97e54198 100644
--- a/src/main/resources/database/oracle/setupDatabase.sql
+++ b/src/main/resources/database/oracle/setupDatabase.sql
@@ -2167,6 +2167,7 @@ create index idx_mail_from_idx on o_mail (fk_from_id);
 
 alter table o_mail_recipient add constraint FKF86663165A4FA5DG foreign key (fk_recipient_id) references o_bs_identity (id);
 create index idx_mailrec_rcp_idx on o_mail_recipient (fk_recipient_id);
+create index idx_mail_meta_id_idx on o_mail (meta_mail_id);
 
 alter table o_mail_to_recipient add constraint FKF86663165A4FA5DE foreign key (fk_mail_id) references o_mail (mail_id);
 create index idx_mailtorec_mail_idx on o_mail_to_recipient (fk_mail_id);
diff --git a/src/main/resources/database/postgresql/alter_10_3_0_to_10_3_1.sql b/src/main/resources/database/postgresql/alter_10_3_0_to_10_3_1.sql
index 1fbf609db37a91b58af580160217b2cf50534b87..b715e360eb32ab7dac59cf15eb2201c84187c58d 100644
--- a/src/main/resources/database/postgresql/alter_10_3_0_to_10_3_1.sql
+++ b/src/main/resources/database/postgresql/alter_10_3_0_to_10_3_1.sql
@@ -1 +1,3 @@
 alter table o_gta_task alter column g_taskname type varchar(1024);
+
+create index idx_mail_meta_id_idx on o_mail (meta_mail_id);
diff --git a/src/main/resources/database/postgresql/setupDatabase.sql b/src/main/resources/database/postgresql/setupDatabase.sql
index 3fcd6cdba400428dd0e0851d4d270650f4e8ae76..df812acdbecca1d8393fe0ed4940c69bae440f31 100644
--- a/src/main/resources/database/postgresql/setupDatabase.sql
+++ b/src/main/resources/database/postgresql/setupDatabase.sql
@@ -2013,6 +2013,7 @@ create index idx_mail_from_idx on o_mail (fk_from_id);
 
 alter table o_mail_recipient add constraint FKF86663165A4FA5DG foreign key (fk_recipient_id) references o_bs_identity (id);
 create index idx_mailrec_rcp_idx on o_mail_recipient (fk_recipient_id);
+create index idx_mail_meta_id_idx on o_mail (meta_mail_id);
 
 alter table o_mail_to_recipient add constraint FKF86663165A4FA5DE foreign key (fk_mail_id) references o_mail (mail_id);
 create index idx_mailtorec_mail_idx on o_mail_to_recipient (fk_mail_id);