diff --git a/core/src/plugins/core.mailer/create.mysql b/core/src/plugins/core.mailer/create.mysql
index 01cd3305d4..cf36737d3c 100644
--- a/core/src/plugins/core.mailer/create.mysql
+++ b/core/src/plugins/core.mailer/create.mysql
@@ -1,3 +1,4 @@
+/* SEPARATOR */
 CREATE TABLE IF NOT EXISTS `ajxp_mail_queue` (
   `id` int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
   `recipent` varchar(255) NOT NULL,
@@ -5,8 +6,8 @@ CREATE TABLE IF NOT EXISTS `ajxp_mail_queue` (
   `date_event` int(11) NOT NULL,
   `notification_object` longblob NOT NULL,
   `html` int(1) NOT NULL
-) CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
+);
+/* SEPARATOR */
 CREATE TABLE IF NOT EXISTS `ajxp_mail_sent` (
   `id` int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
   `recipent` varchar(255) NOT NULL,
@@ -14,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `ajxp_mail_sent` (
   `date_event` int(11) NOT NULL,
   `notification_object` longblob NOT NULL,
   `html` int(1) NOT NULL
-) CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
+);
+/* SEPARATOR */
 CREATE TRIGGER `mail_queue_go_to_sent` BEFORE DELETE ON `ajxp_mail_queue`
 FOR EACH ROW INSERT INTO ajxp_mail_sent (id,recipent,url,date_event,notification_object,html) VALUES (old.id,old.recipent,old.url,old.date_event,old.notification_object,old.html);
\ No newline at end of file
diff --git a/core/src/plugins/core.mailer/create.pgsql b/core/src/plugins/core.mailer/create.pgsql
index 06ac391634..02197365b4 100644
--- a/core/src/plugins/core.mailer/create.pgsql
+++ b/core/src/plugins/core.mailer/create.pgsql
@@ -1,3 +1,4 @@
+/* SEPARATOR */
 CREATE TABLE IF NOT EXISTS ajxp_mail_queue (
  id serial PRIMARY KEY,
  recipent varchar(255) NOT NULL,
@@ -6,7 +7,7 @@ CREATE TABLE IF NOT EXISTS ajxp_mail_queue (
  notification_object bytea NOT NULL,
  html integer NOT NULL
 );
-
+/* SEPARATOR */
 CREATE TABLE IF NOT EXISTS ajxp_mail_sent (
  id serial PRIMARY KEY,
  recipent varchar(255) NOT NULL,
@@ -15,10 +16,7 @@ CREATE TABLE IF NOT EXISTS ajxp_mail_sent (
  notification_object bytea NOT NULL,
  html integer NOT NULL
 );
-
-/** SEPARATOR **/
-/** BLOCK **/
-
+/* SEPARATOR */
 CREATE FUNCTION ajxp_send_mail() RETURNS trigger AS $ajxp_send_mail$
     BEGIN
         INSERT INTO ajxp_mail_sent (id,recipent,url,date_event,notification_object,html)
@@ -26,8 +24,6 @@ CREATE FUNCTION ajxp_send_mail() RETURNS trigger AS $ajxp_send_mail$
         RETURN OLD;
     END;
 $ajxp_send_mail$ LANGUAGE plpgsql;
-
-/** SEPARATOR **/
-
+/* SEPARATOR */
 CREATE TRIGGER mail_queue_go_to_sent BEFORE DELETE ON ajxp_mail_queue
 FOR EACH ROW EXECUTE PROCEDURE ajxp_send_mail();
\ No newline at end of file
diff --git a/core/src/plugins/core.mailer/create.sqlite b/core/src/plugins/core.mailer/create.sqlite
index adeb2d5a54..3dacdf0bbc 100644
--- a/core/src/plugins/core.mailer/create.sqlite
+++ b/core/src/plugins/core.mailer/create.sqlite
@@ -1,3 +1,4 @@
+/* SEPARATOR */
 CREATE TABLE ajxp_mail_queue (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   recipent TEXT,
@@ -6,7 +7,7 @@ CREATE TABLE ajxp_mail_queue (
   notification_object blob,
   html INT
 );
-
+/* SEPARATOR */
 CREATE TABLE ajxp_mail_sent (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
   recipent TEXT,
@@ -15,7 +16,7 @@ CREATE TABLE ajxp_mail_sent (
   notification_object blob,
   html INT
 );
-
+/* SEPARATOR */
 CREATE TRIGGER mail_queue_go_to_sent BEFORE DELETE ON ajxp_mail_queue
 FOR EACH ROW
     BEGIN