Index: openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql	22 Aug 2006 16:27:12 -0000	1.12
+++ openacs-4/packages/contacts/lib/contact-relationships-postgresql.xql	8 Sep 2006 13:49:54 -0000	1.13
@@ -3,7 +3,7 @@
 
 <fullquery name="get_relationships">
       <querytext>
-select rel_id, other_party_id, role_singular, rel_type, creation_date
+select rel_id, other_party_id, role, role_singular, rel_type, creation_date
   from ( select object_id_two as other_party_id,
                 role_two as role,
                 pretty_name as role_singular,
Index: openacs-4/packages/contacts/lib/contact-relationships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-relationships.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/contacts/lib/contact-relationships.tcl	22 Aug 2006 16:27:12 -0000	1.13
+++ openacs-4/packages/contacts/lib/contact-relationships.tcl	8 Sep 2006 13:49:54 -0000	1.14
@@ -34,7 +34,7 @@
     set sort_order upper(other_name)
 }
 
-multirow create rels relationship relation_url rel_id contact contact_url attribute value creation_date 
+multirow create rels relationship relation_url rel_id contact contact_url attribute value creation_date role
 
 set groups_belonging_to [db_list get_party_groups { select group_id from group_distinct_member_map where member_id = :party_id  and group_id > 0}]
 lappend groups_belonging_to [contacts::default_group]
@@ -56,7 +56,7 @@
 	set creation_date [lc_time_fmt $creation_date %q]
 	set role_singular [lang::util::localize $role_singular]
 	set other_name [contact::name -party_id $other_party_id -reverse_order]
-	multirow append rels $role_singular $relation_url $rel_id $other_name $contact_url {} {} $creation_date
+	multirow append rels $role_singular $relation_url $rel_id $other_name $contact_url {} {} $creation_date $role
 	
 	# NOT YET IMPLEMENTED - Checking to see if role_singular or role_plural is needed
 	
@@ -65,11 +65,12 @@
 	    
 	    if { [llength $details_list] > 0 } {
 		foreach {section attribute_name pretty_name value} $details_list {
-		    multirow append rels $role_singular $relation_url $rel_id $other_name $contact_url $pretty_name $value $creation_date
+		    multirow append rels $role_singular $relation_url $rel_id $other_name $contact_url $pretty_name $value $creation_date $role
 		}
 	    }
 	}
     }
 }
 
-template::multirow sort rels relationship contact
\ No newline at end of file
+
+template::multirow sort rels role contact
\ No newline at end of file
Index: openacs-4/packages/contacts/lib/email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email.tcl,v
diff -u -N -r1.28 -r1.29
--- openacs-4/packages/contacts/lib/email.tcl	12 Jun 2006 07:57:08 -0000	1.28
+++ openacs-4/packages/contacts/lib/email.tcl	8 Sep 2006 13:49:54 -0000	1.29
@@ -251,6 +251,8 @@
 	}
 	
 	set locale [lang::system::site_wide_locale]
+
+	ad_returnredirect $return_url
 	
 	# Send the mail to all parties.
 	foreach party_id $to {
@@ -338,7 +340,6 @@
         util_user_message -html -message "[_ contacts.Your_message_was_sent_to_-recipients-]"
 
     } -after_submit {
-	ad_returnredirect $return_url
 	ad_script_abort
     }