--- parser3/src/classes/mail.C	2002/08/07 07:35:45	1.75
+++ parser3/src/classes/mail.C	2002/08/13 15:55:41	1.78
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_MAIL_C="$Date: 2002/08/07 07:35:45 $";
+static const char* IDENT_MAIL_C="$Date: 2002/08/13 15:55:41 $";
 
 #include "pa_config_includes.h"
 
@@ -249,8 +249,8 @@ static const String& message_hash_to_str
 				"\n"; // header|body separator
 
 			const String& body=body_element->as_string();
-			const void *body_ptr=body.cstr();  // body
-			size_t body_size=body.size();  // body
+			const char *body_ptr=body.cstr(String::UL_UNSPECIFIED);  // body
+			size_t body_size=strlen(body_ptr);  // body
 			const void *mail_ptr;
 			size_t mail_size;
 			Charset::transcode(pool, 
@@ -271,7 +271,7 @@ static void sendmail(Request& r, const S
 					 const String *from, const String *to) {
 	Pool& pool=r.pool();
 
-	char *message_cstr=message.cstr();
+	char *message_cstr=message.cstr(String::UL_UNSPECIFIED);
 	Hash *mail_conf=static_cast<Hash *>(r.classes_conf.get(mail_base_class->name()));
 
 	const char *exception_type="email.format";
@@ -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))
+	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