Index: openacs-4/packages/contacts/tcl/contact-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-message-procs.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/contacts/tcl/contact-message-procs.tcl	14 Dec 2006 09:12:12 -0000	1.34
+++ openacs-4/packages/contacts/tcl/contact-message-procs.tcl	5 Apr 2007 11:37:48 -0000	1.35
@@ -16,7 +16,7 @@
 } {
     Get a signature
 } {
-    return [db_string get_signature "select signature from contact_signatures where signature_id = :signature_id" -default {}]
+    return [template::util::richtext::get_property content [db_string get_signature "select signature from contact_signatures where signature_id = :signature_id" -default {}]]
 }
 
 ad_proc -private contact::message::root_folder {
Index: openacs-4/packages/contacts/www/settings.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/settings.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/www/settings.tcl	20 Jun 2005 13:12:13 -0000	1.5
+++ openacs-4/packages/contacts/www/settings.tcl	5 Apr 2007 11:37:48 -0000	1.6
@@ -35,7 +35,7 @@
 	}
 	signature {
 	    label ""
-	    display_col signature;noquote
+	    display_template {@signatures.signature;noquote@}
 	}
     } -filters {
     } -orderby {
@@ -52,7 +52,7 @@
      order by default_p, upper(title), upper(signature)
 } {
     
-    set signature [ad_convert_to_html -- "$signature"]
+    set signature [template::util::richtext::get_property contents $signature]
     set signature_url [export_vars -base signature -url {signature_id }]
 }
 
Index: openacs-4/packages/contacts/www/signature.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/signature.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/contacts/www/signature.tcl	7 Jun 2005 07:45:40 -0000	1.3
+++ openacs-4/packages/contacts/www/signature.tcl	5 Apr 2007 11:37:48 -0000	1.4
@@ -31,7 +31,7 @@
 set form_elements {
     signature_id:key
     {title:text(text) {label "[_ contacts.Save_As]"} {html {size 35 maxlength 35}}}
-    {signature:text(textarea) {label "[_ contacts.Signature]"} {html {cols 45 rows 5}}}
+    {signature:richtext(richtext) {label "[_ contacts.Signature]"} {html {cols 45 rows 5}}}
     {default_p:boolean(checkbox),optional {label ""} {options {{{[_ contacts.lt_this_is_my_default_si]} 1}}}}
 }