--- parser3/src/classes/mail.C	2002/08/13 15:55:41	1.78
+++ parser3/src/classes/mail.C	2002/12/02 10:07:38	1.82
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_MAIL_C="$Date: 2002/08/13 15:55:41 $";
+static const char* IDENT_MAIL_C="$Date: 2002/12/02 10:07:38 $";
 
 #include "pa_config_includes.h"
 
@@ -124,7 +124,7 @@ static void add_header_attribute(const H
 	// append header line
 	*mi.header << 
 		low_element_name << ":" << 
-		attributed_meaning_to_string(element_value, String::UL_MAIL_HEADER).
+		attributed_meaning_to_string(element_value, String::UL_MAIL_HEADER, true).
 			cstr(String::UL_UNSPECIFIED, 0, mi.charset, mi.content_charset_name) << 
 		"\n";
 }
@@ -400,7 +400,7 @@ static void _send(Request& r, const Stri
 	const String *from, *to;
 	const String& message=hash->get(*body_name)/*old format*/?
 		message_hash_to_string(r, method_name, *hash, 0, &from, &to) : // old
-		static_cast<VMail *>(r.self)->message_hash_to_string(r, &method_name, hash, 0, &from, &to); // new
+		static_cast<VMail *>(r.get_self())->message_hash_to_string(r, &method_name, hash, 0, &from, &to); // new
 
 	//r.write_pass_lang(message);
 	sendmail(r, method_name, message, from, to);
@@ -419,7 +419,7 @@ void MMail::configure_user(Request& r) {
 	Pool& pool=r.pool();
 
 	// $MAIN:MAIL[$SMTP[mail.design.ru]]
-	if(Value *mail_element=r.main_class->get_element(mail_name, r.main_class, false))
+	if(Value *mail_element=r.main_class.get_element(mail_name, r.main_class, false))
 		if(Hash *mail_conf=mail_element->get_hash(0))
 			r.classes_conf.put(name(), mail_conf);
 		else