Index: openacs-4/packages/contacts/lib/history-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/history-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/history-portlet.tcl	12 Oct 2005 22:39:08 -0000	1.1
+++ openacs-4/packages/contacts/lib/history-portlet.tcl	28 Oct 2005 17:57:18 -0000	1.2
@@ -1 +1,6 @@
+foreach optional_param {party_id query search_id tasks_interval page page_size page_flush_p tasks_orderby show_filters_p emp_f} {
+    if {![info exists $optional_param]} {
+	set $optional_param {}
+    }
+}
 set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
\ No newline at end of file
Index: openacs-4/packages/contacts/lib/mail-tracking-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/mail-tracking-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/lib/mail-tracking-portlet.adp	20 Oct 2005 16:05:33 -0000	1.2
+++ openacs-4/packages/contacts/lib/mail-tracking-portlet.adp	28 Oct 2005 17:57:18 -0000	1.3
@@ -10,6 +10,10 @@
 	    <include
       		src="/packages/mail-tracking/lib/messages"
       		recipient_id="@party_id@"
+		page="@page@"
+		page_size="@page_size@"
+		show_filter_p="f"
+		elements="@elements@">
         </td>
       </tr>
     </table>
Index: openacs-4/packages/contacts/lib/mail-tracking-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/mail-tracking-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/mail-tracking-portlet.tcl	19 Oct 2005 17:01:38 -0000	1.1
+++ openacs-4/packages/contacts/lib/mail-tracking-portlet.tcl	28 Oct 2005 17:57:18 -0000	1.2
@@ -1 +1,16 @@
+# recipient        - to filter mails for a single receiver
+# sender           - to filter mails for a single sender
+# object_id        - to filter mails for a object_id
+# page             - to filter the pagination
+# page_size        - to know how many rows show (optional default to 10)
+# show_filter_p    - to show or not the filters in the inlcude, default to "t"
+# from_package_id  - to watch mails of this package instance  
+# elements         - a list of elements to show in the list template. If not provided will show all elements.
+
+foreach optional_param {page page_size show_filters_p elements} {
+    if {![info exists $optional_param]} {
+	set $optional_param {}
+    }
+}
+
 set portlet_layout [parameter::get -parameter "DefaultPortletLayout"]
\ No newline at end of file
Index: openacs-4/packages/contacts/www/mail-tracking.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/mail-tracking.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/www/mail-tracking.tcl	21 Oct 2005 22:15:13 -0000	1.4
+++ openacs-4/packages/contacts/www/mail-tracking.tcl	28 Oct 2005 17:57:18 -0000	1.5
@@ -8,7 +8,7 @@
     {page "1"}
 }
 
-foreach optional_param {sender_id recipient_id page page_size page_flush_p orderby object_id} {
+foreach optional_param {sender_id recipient_id page page_size page_flush_p orderby object_id emp_mail_f} {
     if {![info exists $optional_param]} {
 	set $optional_param {}
     }
Index: openacs-4/packages/contacts/www/message-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message-ae.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/message-ae.tcl	28 Jul 2005 13:41:50 -0000	1.2
+++ openacs-4/packages/contacts/www/message-ae.tcl	28 Oct 2005 17:57:18 -0000	1.3
@@ -61,7 +61,7 @@
     email {
 	append form_elements {
 	    {description:text(text) {label "[_ contacts.Subject]"} {html {size 55 maxlength 1000}}}
-	    {content:text(textarea) {label "[_ contacts.Body]"} {html {cols 55 rows 18}}}
+	    {content:text(textarea) {label "[_ contacts.Body]"} {html {cols 70 rows 24}}}
 	}
     }
     letter {
Index: openacs-4/packages/contacts/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/contacts/www/message.adp	24 Oct 2005 18:12:18 -0000	1.19
+++ openacs-4/packages/contacts/www/message.adp	28 Oct 2005 17:57:18 -0000	1.20
@@ -18,30 +18,14 @@
 <if @using_emp_email_p@>
     #contacts.This_contact_doesnt#
 </if>    
-
 <if @party_ids@ ne "">
   <if @message_type@ eq "">
     <formtemplate id="message"></formtemplate>
   </if>
   <else>
-    <if @message_type@ eq "email">
-
     	<include 	
-        	src=/packages/contacts/lib/email
-        	return_url=@return_url@ 
-	        party_ids=@party_ids@ 
-		no_callback_p="f"
-		action="message"
-		signature_id=@signature_id@
-                file_ids="@file_ids@"
-                object_id="@context_id@"
-		item_id="@item_id@"
-	        >
-	</if>
-	<else>
-    	<include 	
         	src=/packages/contacts/lib/@message_type@
-        	return_url=@return_url@ 
+        	return_url=@return_url;noquote@ 
 	        party_ids=@party_ids@ 
 	        file_ids=@file_ids@ 
 		item_id=@item_id@
@@ -51,6 +35,5 @@
 	        header_id=@header_id@
 	        folder_id=@folder_id@
 	        >
-	</else>
   </else>
 </if>
Index: openacs-4/packages/contacts/www/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/contacts/www/message.tcl	21 Oct 2005 22:14:36 -0000	1.20
+++ openacs-4/packages/contacts/www/message.tcl	28 Oct 2005 17:57:18 -0000	1.21
@@ -30,7 +30,6 @@
     }
 }
 
-
 if { [exists_and_not_null message] && ![exists_and_not_null message_type] } {
     set message_type [lindex [split $message "."] 0]
     set item_id [lindex [split $message "."] 1]