--- parser3/src/classes/mail.C	2009/09/27 22:10:12	1.115
+++ parser3/src/classes/mail.C	2012/03/16 09:24:07	1.118
@@ -1,12 +1,10 @@
 /** @file
 	Parser: @b mail parser class.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_MAIL_C="$Date: 2009/09/27 22:10:12 $";
-
 #include "pa_config_includes.h"
 #include "pa_vmethod_frame.h"
 
@@ -21,6 +19,8 @@ static const char * const IDENT_MAIL_C="
 
 #include "smtp.h"
 
+volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.118 2012/03/16 09:24:07 moko Exp $";
+
 // defines
 
 #define MAIL_CLASS_NAME "mail"
@@ -70,13 +70,14 @@ static void sendmail(
 			 options
 #endif
 			 ) {
-	const char* message_cstr=message.untaint_cstr(String::L_AS_IS);
-
 	const char* exception_type="email.format";
 	if(!from) // we use in sendmail -f {from} && SMTP MAIL from: {from}
 		throw Exception(exception_type,
 			0,
 			"parameter does not specify 'from' header field");
+
+	const char* message_cstr=message.untaint_cstr(String::L_AS_IS);
+
 	if(smtp_server_port) {
 		if(!to) // we use only in SMTP RCPT to: {to}
 			throw Exception(exception_type,
@@ -190,8 +191,7 @@ static void sendmail(
 // methods
 
 static void _send(Request& r, MethodParams& params) {
-	Value& vhash=params.as_no_junction(0, "message must not be code");
-	HashStringValue* hash=vhash.get_hash();
+	HashStringValue* hash=params.as_no_junction(0, "message must not be code").get_hash();
 	if(!hash)
 		throw Exception(PARSER_RUNTIME,
 			0,