--- parser3/src/classes/mail.C	2002/04/01 09:37:50	1.61
+++ parser3/src/classes/mail.C	2002/06/10 11:56:22	1.64
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: mail.C,v 1.61 2002/04/01 09:37:50 paf Exp $
+	$Id: mail.C,v 1.64 2002/06/10 11:56:22 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -44,8 +44,6 @@ public: // Methoded
 	void configure_user(Request& r);
 private:
 	String mail_name;
-	String content_disposition_name;
-	String content_disposition_filename_name;
 };
 
 // helpers
@@ -152,7 +150,8 @@ static const String& attach_hash_to_stri
 	String& result=*new(pool) String(pool);
 
 	// content-type: application/octet-stream
-	result << "content-type: " << r.mime_type_of(file_name_cstr) << "\n";
+	result << "content-type: " << r.mime_type_of(file_name_cstr) 
+		<< "; name=\"" << file_name_cstr << "\"\n";
 	// content-disposition: attachment; filename="user_file_name"
 	result << "content-disposition: attachment; filename=\"" << file_name_cstr << "\"\n";
 
@@ -459,19 +458,14 @@ static void _send(Request& r, const Stri
 	const String *from, *to;
 	const String& letter=letter_hash_to_string(r, method_name, *hash, 0, &from, &to);
 
-//	r.write_assign_lang(*new(pool) VString(letter));
 	sendmail(r, method_name, letter, from, to);
 }
 
 // constructor & configurator
 
-MMail::MMail(Pool& apool) : Methoded(apool),
-	mail_name(apool, MAIL_NAME),
-	content_disposition_name(apool, CONTENT_DISPOSITION_NAME),
-	content_disposition_filename_name(apool, CONTENT_DISPOSITION_FILENAME_NAME)
+MMail::MMail(Pool& apool) : Methoded(apool, MAIL_CLASS_NAME),
+	mail_name(apool, MAIL_NAME)
 {
-	set_name(*NEW String(pool(), MAIL_CLASS_NAME));
-
 	// ^mail:send{hash}
 	add_native_method("send", Method::CT_STATIC, _send, 1, 1);
 }