--- parser3/src/classes/mail.C	2001/09/05 08:35:04	1.36
+++ parser3/src/classes/mail.C	2001/09/28 15:58:26	1.40
@@ -2,12 +2,10 @@
 	Parser: @b mail parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: mail.C,v 1.36 2001/09/05 08:35:04 parser Exp $
+	$Id: mail.C,v 1.40 2001/09/28 15:58:26 parser Exp $
 */
-static const char *RCSId="$Id: mail.C,v 1.36 2001/09/05 08:35:04 parser Exp $"; 
 
 #include "pa_config_includes.h"
 
@@ -147,7 +145,7 @@ static const String& attach_hash_to_stri
 		file_name=&vfile_name->as_string();
 	else // no $file-name, VFile surely knows name
 		file_name=&static_cast<Value *>(vfile->fields().get(*name_name))->as_string();
-	const char *file_name_cstr=file_name->cstr(String::UL_FILE_NAME);
+	const char *file_name_cstr=file_name->cstr(String::UL_FILE_SPEC);
 
 	String& result=*new(pool) String(pool);
 
@@ -307,7 +305,7 @@ static const String& letter_hash_to_stri
 		} else {
 			result << 
 				"\n" << // header|body separator
-				body_element->as_string();  // body
+				body_element->as_string().cstr(String::UL_AS_IS);  // body
 		}
 	} else 
 		PTHROW(0, 0,