--- parser3/src/classes/mail.C	2016/03/31 21:46:20	1.126
+++ parser3/src/classes/mail.C	2016/09/08 20:41:47	1.129
@@ -19,7 +19,7 @@
 
 #include "smtp.h"
 
-volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.126 2016/03/31 21:46:20 moko Exp $";
+volatile const char * IDENT_MAIL_C="$Id: mail.C,v 1.129 2016/09/08 20:41:47 moko Exp $";
 
 // defines
 
@@ -149,9 +149,8 @@ static void sendmail(
 	if(after_file_spec==STRING_NOT_FOUND || after_file_spec==0)
 		file_spec=sendmail_command;
 	else {
-		size_t pos_after=after_file_spec;
-		file_spec=&sendmail_command->mid(0, pos_after++);
-		sendmail_command->split(argv, pos_after, " ", String::L_AS_IS);
+		file_spec=&sendmail_command->mid(0, after_file_spec);
+		sendmail_command->split(argv, after_file_spec+1, " ", String::L_AS_IS);
 	}
 
 	if(!file_executable(*file_spec))
@@ -205,7 +204,7 @@ static void _send(Request& r, MethodPara
 	if(Value* vdebug=hash->get(MAIL_DEBUG_NAME))
 		print_debug=vdebug->as_bool();
 
-	Value* vmail_conf=static_cast<Value*>(r.classes_conf.get(mail_name));
+	Value* vmail_conf=static_cast<Value*>(r.classes_conf.get(mail_class->type()));
 	Value* smtp_server_port=0;
 	if(vmail_conf) {
 		// $MAIN:MAIL.SMTP[mail.yourdomain.ru[:port]]
@@ -237,7 +236,7 @@ void MMail::configure_user(Request& r) {
 	// $MAIN:MAIL[$SMTP[mail.design.ru]]
 	if(Value* mail_element=r.main_class.get_element(mail_name)) {
 		if(mail_element->get_hash())
-			r.classes_conf.put(name(), mail_element);
+			r.classes_conf.put(type(), mail_element);
 		else
 			if( !mail_element->is_string() )
 				throw Exception(PARSER_RUNTIME,