Index: openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.de_DE.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.de_DE.ISO-8859-1.xml	4 Jan 2006 09:50:17 -0000	1.3
+++ openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.de_DE.ISO-8859-1.xml	17 Nov 2006 16:16:51 -0000	1.4
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-mail-lite" package_version="1.0b7" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-mail-lite" package_version="1.3b5" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="Associated_files">Verkn�pfte Dateien:</msg>
   <msg key="CC">CC</msg>
   <msg key="cc_help">Liste von E-Mail Adressen durch &quot;;&quot; getrennt an die eine Kopie der E-Mail geschickt werden soll.</msg>
   <msg key="check_uncheck">Alle/Keine ausw�hlen</msg>
   <msg key="lt_there_was_an_error_processing">Es gab einen Fehler bei der Verarbeitung Ihrer Anfrage</msg>
   <msg key="Message">Nachricht</msg>
+  <msg key="Queue_server">Serverproze�</msg>
+  <msg key="Queueing_time">Queue-Zeitpunkt</msg>
   <msg key="Recipients">Empf�nger</msg>
   <msg key="Send">Senden</msg>
+  <msg key="Sender">Absender</msg>
   <msg key="Subject">Betreff</msg>
   <msg key="Untitled">Unbenannt</msg>
   <msg key="Upload_file">Datei hinzuf�gen</msg>
Index: openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.en_US.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.en_US.ISO-8859-1.xml	4 Jan 2006 09:50:17 -0000	1.4
+++ openacs-4/packages/acs-mail-lite/catalog/acs-mail-lite.en_US.ISO-8859-1.xml	17 Nov 2006 16:16:51 -0000	1.5
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-mail-lite" package_version="1.0b7" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-mail-lite" package_version="1.3b5" locale="en_US" charset="ISO-8859-1">
 
   <msg key="Associated_files">Associated Files:</msg>
   <msg key="CC">CC</msg>
   <msg key="cc_help">Send copy to multiple addresses separated by &quot;;&quot;</msg>
   <msg key="check_uncheck">Check/Uncheck</msg>
   <msg key="lt_there_was_an_error_processing">There was an error processing this request.</msg>
   <msg key="Message">Message</msg>
+  <msg key="Queue_server">Queue server</msg>
+  <msg key="Queueing_time">Queueing time</msg>
   <msg key="Recipients">Recipients</msg>
   <msg key="Send">Send</msg>
+  <msg key="Sender">Sender</msg>
   <msg key="Subject">Subject</msg>
   <msg key="Untitled">Untitled</msg>
   <msg key="Upload_file">Upload File</msg>
Index: openacs-4/packages/acs-mail-lite/lib/view-complex-send-mail-queue.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/lib/Attic/view-complex-send-mail-queue.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/lib/view-complex-send-mail-queue.adp	17 Nov 2006 16:16:52 -0000	1.1
@@ -0,0 +1 @@
+<listtemplate name="get_all_complex_queued_messages"></listtemplate>
Index: openacs-4/packages/acs-mail-lite/lib/view-complex-send-mail-queue.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/lib/Attic/view-complex-send-mail-queue.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/lib/view-complex-send-mail-queue.tcl	17 Nov 2006 16:16:52 -0000	1.1
@@ -0,0 +1,15 @@
+# 2006/11/17 created (nfl)
+
+template::list::create \
+    -name get_all_complex_queued_messages \
+    -selected_format normal \
+    -multirow messages \
+    -elements {
+	creation_date { label "[_ acs-mail-lite.Queueing_time]" }
+	from_addr { label "[_ acs-mail-lite.Sender]" }
+	to_addr { label "[_ acs-mail-lite.Recipients]" }
+	subject { label "[_ acs-mail-lite.Subject]" }
+        locking_server { label "[_ acs-mail-lite.Queue_server]" }
+    }
+	
+db_multirow messages get_all_complex_queued_messages {}
Index: openacs-4/packages/acs-mail-lite/lib/view-complex-send-mail-queue.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail-lite/lib/Attic/view-complex-send-mail-queue.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail-lite/lib/view-complex-send-mail-queue.xql	17 Nov 2006 16:16:52 -0000	1.1
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <fullquery name="get_all_complex_queued_messages">
+        <querytext>
+            select
+                   id,
+                   creation_date,
+                   locking_server,
+                   to_party_ids,
+                   cc_party_ids,
+                   bcc_party_ids,
+                   to_group_ids,
+                   cc_group_ids,
+                   bcc_group_ids,
+                   to_addr,
+                   cc_addr,
+                   bcc_addr,
+                   from_addr,
+                   subject,
+                   body,
+                   package_id,
+                   files,
+                   file_ids,
+                   folder_ids,
+                   mime_type,
+                   object_id,
+                   (case when single_email_p = TRUE then 1 else 0 end) as single_email_p,
+                   (case when no_callback_p = TRUE then 1 else 0 end) as no_callback_p,
+                   extraheaders,
+                   (case when alternative_part_p = TRUE then 1 else 0 end) as alternative_part_p,
+                   (case when use_sender_p = TRUE then 1 else 0 end) as use_sender_p
+            from acs_mail_lite_complex_queue
+            order by creation_date
+        </querytext>
+    </fullquery>             
+</queryset>