--- parser3/src/main/untaint.C	2015/10/26 01:21:59	1.170
+++ parser3/src/main/untaint.C	2017/05/29 11:00:22	1.173
@@ -1,11 +1,11 @@
 /** @file
 	Parser: String class part: untaint mechanizm.
 
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-volatile const char * IDENT_UNTAINT_C="$Id: untaint.C,v 1.170 2015/10/26 01:21:59 moko Exp $";
+volatile const char * IDENT_UNTAINT_C="$Id: untaint.C,v 1.173 2017/05/29 11:00:22 moko Exp $";
 
 
 #include "pa_string.h"
@@ -179,6 +179,25 @@ int append_fragment_nonoptimizing(char a
 	return 0; // 0=continue
 }
 
+
+/** 
+	appends to other String without language change
+*/
+
+String& String::append_to(String& dest) const {
+	if(is_empty())
+		return dest;
+
+	// first: fragment infos
+	dest.langs.appendHelper(dest.body, langs, body);
+
+	// next: letters
+	dest.body<<body;
+
+	ASSERT_STRING_INVARIANT(dest);
+	return dest;
+}
+
 /** 
 	appends to other String,
 	marking all tainted pieces of it with @a lang.
@@ -191,9 +210,7 @@ String& String::append_to(String& dest,
 
 	// first: fragment infos
 	
-	if(ilang==L_PASS_APPENDED) // without language-change?
-		dest.langs.appendHelper(dest.body, langs, body);
-	else if(forced) //forcing passed lang?
+	if(forced) //forcing passed lang?
 		dest.langs.appendHelper(dest.body, ilang, body);
 	else {
 		if(langs.opt.is_not_just_lang){
@@ -386,17 +403,17 @@ int cstr_to_string_body_block(String::La
 
 			bool email=false;
 			uchar c;
-			for(const char* src=mail_ptr; (c=(uchar)*src++); ) {
+			for(const char* src=mail_ptr; c=(uchar)*src; src++) {
 				if(c=='\r' || c=='\n')
 					c=' ';
-				if(to_quoted_printable && (c==',' || c == '"' || addr_spec_soon(src-1/*position to 'c'*/))) {
+				if(to_quoted_printable && (c==',' || c == '"' || addr_spec_soon(src))) {
 					email=c=='<';
 					to_string("?=");
 					to_quoted_printable=false;
 				}
 				//RFC   + An 'encoded-word' MUST NOT appear in any portion of an 'addr-spec'.
 				if(!email && (
-					( !to_quoted_printable && (c & 0x80) )  // starting quote-printable-encoding on first 8bit char
+					( !to_quoted_printable && (c & 0x80 || (c == ' ' && src == mail_ptr) ) )  // starting quote-printable-encoding on first 8bit char or leading space (issue #123)
 					|| ( to_quoted_printable && !mail_header_char_valid_within_Qencoded(c) )
 					)) {
 					if(!to_quoted_printable) {