Index: branches/5.1.x/core/install/install_schema.sql
===================================================================
diff -u -N -r13086 -r13140
--- branches/5.1.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 13086)
+++ branches/5.1.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 13140)
@@ -69,16 +69,6 @@
   UNIQUE KEY VariableName (VariableName)
 );
 
-CREATE TABLE EmailMessage (
-  EmailMessageId int(10) NOT NULL auto_increment,
-  Template longtext,
-  MessageType enum('html','text') NOT NULL default 'text',
-  LanguageId int(11) NOT NULL default '0',
-  EventId int(11) NOT NULL default '0',
-  `Subject` text,
-  PRIMARY KEY  (EmailMessageId)
-);
-
 CREATE TABLE EmailQueue (
   EmailQueueId int(10) unsigned NOT NULL AUTO_INCREMENT,
   ToEmail varchar(255) NOT NULL DEFAULT '',
@@ -103,19 +93,35 @@
 );
 
 CREATE TABLE Events (
-  EventId int(11) NOT NULL auto_increment,
-  Event varchar(40) NOT NULL default '',
+  EventId int(11) NOT NULL AUTO_INCREMENT,
+  `Event` varchar(40) NOT NULL DEFAULT '',
   ReplacementTags text,
-  Enabled int(11) NOT NULL default '1',
-  FrontEndOnly tinyint(3) unsigned NOT NULL default '0',
-  FromUserId int(11) default NULL,
-  Module varchar(40) NOT NULL default '',
-  Description varchar(255) NOT NULL default '',
-  `Type` int(11) NOT NULL default '0',
-  PRIMARY KEY  (EventId),
+  l1_Subject text,
+  l2_Subject text,
+  l3_Subject text,
+  l4_Subject text,
+  l5_Subject text,
+  l1_Body longtext,
+  l2_Body longtext,
+  l3_Body longtext,
+  l4_Body longtext,
+  l5_Body longtext,
+  Headers text,
+  MessageType varchar(4) NOT NULL DEFAULT 'text',
+  Enabled int(11) NOT NULL DEFAULT '1',
+  FrontEndOnly tinyint(3) unsigned NOT NULL DEFAULT '0',
+  FromUserId int(11) DEFAULT NULL,
+  Module varchar(40) NOT NULL DEFAULT '',
+  l1_Description text,
+  l2_Description text,
+  l3_Description text,
+  l4_Description text,
+  l5_Description text,
+  `Type` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (EventId),
   KEY `Type` (`Type`),
   KEY Enabled (Enabled),
-  KEY Event (Event),
+  KEY `Event` (`Event`),
   KEY FrontEndOnly (FrontEndOnly)
 );