Index: openacs-4/packages/contacts/lib/email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/email.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/contacts/lib/email.tcl	25 Sep 2005 12:40:39 -0000	1.11
+++ openacs-4/packages/contacts/lib/email.tcl	28 Sep 2005 22:13:26 -0000	1.12
@@ -143,8 +143,21 @@
 	    set to $name
 	    set to_addr [contact::email -party_id $party_id]
 	    if {[empty_string_p $to_addr]} {
-		ad_return_error [_ contacts.Error] [_ contacts.lt_there_was_an_error_processing_this_request]
-		break
+		# We are going to check if this party_id has an employer and if this
+		# employer has an email
+		set employer_id [relation::get_object_two -object_id_one $party_id \
+				     -rel_type "contact_rels_employment"]
+		if { ![empty_string_p $employer_id] } {
+		    # Get the employer email adress
+		    set to_addr [contact::email -party_id $employer_id]
+		    if {[empty_string_p $to_addr]} {
+			ad_return_error [_ contacts.Error] [_ contacts.lt_there_was_an_error_processing_this_request]
+			break
+		    } 
+		} else {
+		    ad_return_error [_ contacts.Error] [_ contacts.lt_there_was_an_error_processing_this_request]
+		    break
+		}
 	    }
 	    set values [list]
 	    set locale [lang::user::site_wide_locale -user_id $party_id]
Index: openacs-4/packages/contacts/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/contacts/www/message.adp	10 Sep 2005 13:39:04 -0000	1.12
+++ openacs-4/packages/contacts/www/message.adp	28 Sep 2005 22:14:00 -0000	1.13
@@ -15,12 +15,15 @@
 </else>
 <property name="focus">comment_add.comment</property>
 
+<if @using_emp_email_p@>
+    #contacts.This_contact_doesnt#
+</if>    
+
 <if @party_ids@ ne "">
   <if @message_type@ eq "">
     <formtemplate id="message"></formtemplate>
   </if>
   <else>
-    
     <include 
         src=/packages/contacts/lib/@message_type@
         return_url=@return_url@ 
Index: openacs-4/packages/contacts/www/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/contacts/www/message.tcl	10 Sep 2005 13:39:04 -0000	1.14
+++ openacs-4/packages/contacts/www/message.tcl	28 Sep 2005 22:14:00 -0000	1.15
@@ -47,6 +47,8 @@
 set user_id [ad_conn user_id]
 set context [list $title]
 
+set using_emp_email_p 0
+
 set recipients  [list]
 foreach party_id $party_ids {
     set contact_name   [contact::name -party_id $party_id]
@@ -82,16 +84,52 @@
             lappend party_ids $party_id
             lappend recipients $contact_link
         } else {
-            lappend invalid_party_ids $party_id
-            lappend invalid_recipients $contact_link
+	    # We are going to check if there is an employee relationship
+	    # if there is we are going to check if the employer has an
+	    # email adrres, if it does we are going to use that address
+	    set employer_id [relation::get_object_two -object_id_one $party_id \
+				 -rel_type "contact_rels_employment"]
+
+	    if { ![empty_string_p $employer_id] } {
+		set emp_addr [contact::email -party_id $employer_id]
+		if { ![empty_string_p $emp_addr] } {
+		    lappend party_ids $party_id
+		    lappend recipients $contact_link
+		    set using_emp_email_p 1
+		} else {
+		    lappend invalid_party_ids $party_id
+		    lappend invalid_recipients $contact_link
+		}
+	    } else {
+		lappend invalid_party_ids $party_id
+		lappend invalid_recipients $contact_link
+	    }
         }
     } else {
         if { $email_p || $letter_p } {
             lappend party_ids $party_id
             lappend recipients $contact_link
         } else {
-            lappend invalid_party_ids $party_id
-            lappend invalid_recipients $contact_link
+	    # We are going to check if there is an employee relationship
+	    # if there is we are going to check if the employer has an
+	    # email adrres, if it does we are going to use that address
+	    set employer_id [relation::get_object_two -object_id_one $party_id \
+				 -rel_type "contact_rels_employment"]
+
+	    if { ![empty_string_p $employer_id] } {
+		set emp_addr [contact::email -party_id $employer_id]
+		if { ![empty_string_p $emp_addr] } {
+		    lappend party_ids $party_id
+		    lappend recipients $contact_link
+		    set using_emp_email_p 1
+		} else {
+		    lappend invalid_party_ids $party_id
+		    lappend invalid_recipients $contact_link
+		}
+	    } else {
+		lappend invalid_party_ids $party_id
+		lappend invalid_recipients $contact_link
+	    }
         }
     }
 }