Index: openacs-4/packages/acs-mail-lite/sql/oracle/acs-mail-lite-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/sql/oracle/acs-mail-lite-create.sql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-mail-lite/sql/oracle/acs-mail-lite-create.sql	9 Jan 2008 15:37:21 -0000	1.11
+++ openacs-4/packages/acs-mail-lite/sql/oracle/acs-mail-lite-create.sql	9 Jan 2008 16:51:29 -0000	1.12
@@ -7,22 +7,32 @@
 
 create sequence acs_mail_lite_id_seq;
 
-create table acs_mail_lite_queue (
-    message_id                  integer
-                                constraint acs_mail_lite_queue_pk
-                                primary key,
-    to_addr                     varchar(400),
-    from_addr                   varchar(200),
-    subject                     varchar(200),
-    body                        clob,
-    extra_headers               clob,
-    bcc                         clob,
-    package_id			integer
-    				constraint acs_mail_lite_queue_pck_fk
-				references apm_packages,
-    valid_email_p		varchar2(1)
-				constraint acs_mail_lite_qu_valid_em_p_ck
-				check (valid_email_p in ('t','f'))
+CREATE TABLE acs_mail_lite_queue (
+    message_id          integer
+                        constraint acs_mail_lite_queue_pk 
+                        PRIMARY KEY,
+    creation_date       varchar(4000),
+    locking_server      varchar(4000),
+    to_addr             varchar(4000),
+    cc_addr             clob,
+    bcc_addr            clob,
+    from_addr           varchar(400),
+    reply_to            varchar(400),
+    subject             varchar(4000),
+    body                clob,
+    package_id          integer
+                        constraint amlq_package_id_fk
+                        references apm_packages,
+    file_ids            varchar(4000),
+    mime_type           varchar(200),
+    object_id           integer,
+    no_callback_p       char(1)
+                        constraint amlq_no_callback_p_ck
+                        check (no_callback_p in ('t','f')),
+    extraheaders        clob,
+    use_sender_p        char(1)
+                        constraint amlq_use_sender_p_ck
+                        check (use_sender_p in ('t','f'))
 );
 
 create table acs_mail_lite_mail_log (
Index: openacs-4/packages/acs-mail-lite/sql/oracle/upgrade/upgrade-5.4.0d2-5.4.0d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/sql/oracle/upgrade/upgrade-5.4.0d2-5.4.0d3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/sql/oracle/upgrade/upgrade-5.4.0d2-5.4.0d3.sql	9 Jan 2008 16:51:30 -0000	1.1
@@ -0,0 +1,29 @@
+-- acs-mail-lite/sql/oracle/upgrade/upgrade-5.4.0d2-5.4.0d3.sql
+--
+-- Upgrade acs_mail_lite_queue; 
+--
+
+-- new columns
+
+alter table acs_mail_lite_queue add column  creation_date       varchar(4000);
+alter table acs_mail_lite_queue add column  locking_server      varchar(4000);
+alter table acs_mail_lite_queue add column  cc_addr             clob;
+alter table acs_mail_lite_queue add column  reply_to            varchar(400);
+alter table acs_mail_lite_queue add column  file_ids            varchar(4000);
+alter table acs_mail_lite_queue add column  mime_type           varchar(200);
+alter table acs_mail_lite_queue add column  object_id           integer;
+alter table acs_mail_lite_queue add column  no_callback_p       char(1)
+                                            constraint amlq_no_callback_p_ck
+                                            check (no_callback_p in ('t','f'));
+alter table acs_mail_lite_queue add column  use_sender_p        char(1)
+                                            constraint amlq_use_sender_p_ck
+                                            check (use_sender_p in ('t','f'));
+
+-- renamed columns
+alter table acs_mail_lite_queue rename column bcc to bcc_addr;
+alter table acs_mail_lite_queue rename column extra_headers to extraheaders;
+
+-- datatype changes
+alter table acs_mail_lite_queue modify    to_addr             varchar(4000);
+alter table acs_mail_lite_queue modify    from_addr           varchar(400);
+alter table acs_mail_lite_queue modify    subject             varchar(4000);
Index: openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql	9 Jan 2008 15:29:12 -0000	1.10
+++ openacs-4/packages/acs-mail-lite/sql/postgresql/acs-mail-lite-create.sql	9 Jan 2008 16:51:30 -0000	1.11
@@ -7,20 +7,28 @@
 
 create sequence acs_mail_lite_id_seq;
 
-create table acs_mail_lite_queue (
-    message_id                  integer
-                                constraint acs_mail_lite_queue_pk
-                                primary key,
-    to_addr                     text,
-    from_addr                   varchar(200),
-    subject                     varchar(200),
-    body                        text,
-    extra_headers               text,
-    bcc                         text,
-    package_id			integer
-    				constraint acs_mail_lite_queue_pck_fk
-				references apm_packages,
-    valid_email_p		boolean
+CREATE TABLE acs_mail_lite_queue (
+    message_id          integer
+                        constraint acs_mail_lite_queue_pk
+                        primary key,
+    creation_date       text,
+    locking_server      text,
+    to_addr             text,
+    cc_addr             text,
+    bcc_addr            text,
+    from_addr           text,
+    reply_to            text,
+    subject             text,
+    body                text,
+    package_id          integer
+                        constraint amlq_package_id_fk
+                        references apm_packages,
+    file_ids            text,
+    mime_type           text,
+    object_id           integer,
+    no_callback_p       boolean,
+    extraheaders        text,
+    use_sender_p        boolean
 );
 
 create table acs_mail_lite_mail_log (
Index: openacs-4/packages/acs-mail-lite/sql/postgresql/upgrade/upgrade-5.4.0d2-5.4.0d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/sql/postgresql/upgrade/upgrade-5.4.0d2-5.4.0d3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/sql/postgresql/upgrade/upgrade-5.4.0d2-5.4.0d3.sql	9 Jan 2008 16:51:30 -0000	1.1
@@ -0,0 +1,24 @@
+-- acs-mail-lite/sql/postgresql/upgrade/upgrade-5.4.0d2-5.4.0d3.sql
+--
+-- Modify acs_mail_lite_queue
+--
+
+-- New columns
+alter table acs_mail_lite_queue 
+    add column     creation_date       text,
+    add column     locking_server      text,
+    add column     cc_addr             text,
+    add column     reply_to            text,
+    add column     file_ids            text,
+    add column     mime_type           text,
+    add column     object_id           integer,
+    add column     no_callback_p       boolean,
+    add column     use_sender_p        boolean;
+
+-- Renamed columns
+alter table acs_mail_lite_queue rename column bcc to bcc_addr;
+
+-- Column datatype changes
+alter table acs_mail_lite_queue 
+    alter column   from_addr   type  text,
+    alter column   subject     type  text;
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-oracle.xql,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-oracle.xql	9 Jan 2008 12:11:55 -0000	1.10
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-oracle.xql	9 Jan 2008 16:51:30 -0000	1.11
@@ -6,8 +6,8 @@
     <fullquery name="acs_mail_lite::send.create_queue_entry">
         <querytext>
             insert into acs_mail_lite_queue
-                  (id,
-		   creation_date,
+                  (message_id,
+                   creation_date,
                    locking_server,
                    to_addr,
                    cc_addr,
@@ -25,7 +25,7 @@
                   )
             values
                   (acs_mail_lite_id_seq.nextval,
-		   :creation_date,
+                   :creation_date,
                    :locking_server,
                    :to_addr,
                    :cc_addr,
@@ -66,7 +66,7 @@
     <fullquery name="acs_mail_lite::sweeper.get_queued_messages">
         <querytext>
             select
-                   id,
+                   message_id as id,
                    creation_date,
                    locking_server,
                    to_addr,
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql	9 Jan 2008 12:11:55 -0000	1.11
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs-postgresql.xql	9 Jan 2008 16:51:30 -0000	1.12
@@ -6,8 +6,8 @@
     <fullquery name="acs_mail_lite::send.create_queue_entry">
         <querytext>
             insert into acs_mail_lite_queue
-                  (id, 
-		   creation_date,
+                  (message_id, 
+                   creation_date,
                    locking_server,
                    to_addr,
                    cc_addr,
@@ -67,7 +67,7 @@
     <fullquery name="acs_mail_lite::sweeper.get_queued_messages">
         <querytext>
             select
-                   id,
+                   message_id as id,
                    creation_date,
                    locking_server,
                    to_addr,
Index: openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql	9 Jan 2008 13:19:10 -0000	1.16
+++ openacs-4/packages/acs-mail-lite/tcl/acs-mail-lite-procs.xql	9 Jan 2008 16:51:30 -0000	1.17
@@ -17,25 +17,25 @@
 
     <fullquery name="acs_mail_lite::sweeper.get_queued_message">
         <querytext>
-            select id
+            select message_id as id
             from acs_mail_lite_queue
-            where id=:id and (locking_server = '' or locking_server is NULL)
+            where message_id=:id and (locking_server = '' or locking_server is NULL)
         </querytext>
     </fullquery>
 
     <fullquery name="acs_mail_lite::sweeper.lock_queued_message">
         <querytext>
             update acs_mail_lite_queue
                set locking_server = :locking_server
-            where id=:id
+            where message_id=:id
         </querytext>
     </fullquery> 
 
 
     <fullquery name="acs_mail_lite::sweeper.delete_queue_entry">
         <querytext>
             delete from acs_mail_lite_queue
-            where id=:id
+            where message_id=:id
         </querytext>
     </fullquery>