Index: /trunk/roundcubemail/CHANGELOG
===================================================================
--- /trunk/roundcubemail/CHANGELOG	(revision 4566)
+++ /trunk/roundcubemail/CHANGELOG	(revision 4567)
@@ -2,4 +2,5 @@
 ===========================
 
+- Fix problem with contactgroupmembers table creation on MySQL 4.x, add index on contact_id column
 - Add LDAP SASL bind and proxy authentication (#1486692)
 - Add variable for 'Today' label in date_today option (#1486120)
Index: /trunk/roundcubemail/SQL/mssql.initial.sql
===================================================================
--- /trunk/roundcubemail/SQL/mssql.initial.sql	(revision 4566)
+++ /trunk/roundcubemail/SQL/mssql.initial.sql	(revision 4567)
@@ -196,4 +196,6 @@
 GO
 
+CREATE  INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]
+GO
 
 ALTER TABLE [dbo].[identities] ADD 
Index: /trunk/roundcubemail/SQL/mssql.upgrade.sql
===================================================================
--- /trunk/roundcubemail/SQL/mssql.upgrade.sql	(revision 4566)
+++ /trunk/roundcubemail/SQL/mssql.upgrade.sql	(revision 4567)
@@ -102,2 +102,4 @@
 ALTER TABLE [dbo].[contacts] ADD [words] [text] COLLATE Latin1_General_CI_AI NULL 
 GO
+CREATE  INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]
+GO
Index: /trunk/roundcubemail/SQL/mysql.initial.sql
===================================================================
--- /trunk/roundcubemail/SQL/mysql.initial.sql	(revision 4566)
+++ /trunk/roundcubemail/SQL/mysql.initial.sql	(revision 4567)
@@ -118,5 +118,6 @@
     REFERENCES `contactgroups`(`contactgroup_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `contact_id_fk_contacts` FOREIGN KEY (`contact_id`)
-    REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE ON UPDATE CASCADE
+    REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  INDEX `contactgroupmembers_contact_index` (`contact_id`)
 ) /*!40000 ENGINE=INNODB */;
 
Index: /trunk/roundcubemail/SQL/mysql.update.sql
===================================================================
--- /trunk/roundcubemail/SQL/mysql.update.sql	(revision 4566)
+++ /trunk/roundcubemail/SQL/mysql.update.sql	(revision 4567)
@@ -137,2 +137,4 @@
 
 ALTER TABLE `contacts` ADD `words` TEXT NULL AFTER `vcard`;
+ALTER TABLE `contactgroupmembers` ADD INDEX `contactgroupmembers_contact_index` (`contact_id`);
+ 
Index: /trunk/roundcubemail/SQL/postgres.initial.sql
===================================================================
--- /trunk/roundcubemail/SQL/postgres.initial.sql	(revision 4566)
+++ /trunk/roundcubemail/SQL/postgres.initial.sql	(revision 4567)
@@ -157,4 +157,6 @@
     PRIMARY KEY (contactgroup_id, contact_id)
 );
+
+CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_id);
 
 --
Index: /trunk/roundcubemail/SQL/postgres.update.sql
===================================================================
--- /trunk/roundcubemail/SQL/postgres.update.sql	(revision 4566)
+++ /trunk/roundcubemail/SQL/postgres.update.sql	(revision 4567)
@@ -91,7 +91,6 @@
 TRUNCATE messages;
 
-
 -- Updates from version 0.5.x
 
 ALTER TABLE contacts ADD words TEXT NULL;
-
+CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_id);
Index: /trunk/roundcubemail/SQL/sqlite.initial.sql
===================================================================
--- /trunk/roundcubemail/SQL/sqlite.initial.sql	(revision 4566)
+++ /trunk/roundcubemail/SQL/sqlite.initial.sql	(revision 4567)
@@ -56,4 +56,6 @@
   PRIMARY KEY (contactgroup_id, contact_id)
 );
+
+CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);
 
 
Index: /trunk/roundcubemail/SQL/sqlite.update.sql
===================================================================
--- /trunk/roundcubemail/SQL/sqlite.update.sql	(revision 4566)
+++ /trunk/roundcubemail/SQL/sqlite.update.sql	(revision 4567)
@@ -222,2 +222,3 @@
 
 DELETE FROM messages;
+CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);