Fixed extra space in subject (see https://sourceforge.net/forum/message.php?msg_id=4894970).

1 files changed, 59 insertions, 44 deletions

diff --git a/src/text.cpp b/src/text.cpp
index 67aed20f..13a682ef 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -269,63 +269,78 @@ void text::createFromString(const string& in, const charset& ch)
 
 	removeAllWords();
 
-	for (string::size_type end = in.size(), pos = 0, start = 0 ; ; )
+	const string::size_type asciiCount =
+		utility::stringUtils::countASCIIchars(in.begin(), in.end());
+
+	const string::size_type asciiPercent =
+		(in.length() == 0 ? 100 : (100 * asciiCount) / in.length());
+
+	// If there are "too much" non-ASCII chars, encode everything
+	if (asciiPercent < 60)  // less than 60% ASCII chars
+	{
+		appendWord(vmime::create <word>(in, ch));
+	}
+	// Else, only encode words which need it
+	else
 	{
-		if (pos == end || parserHelpers::isSpace(in[pos]))
+		for (string::size_type end = in.size(), pos = 0, start = 0 ; ; )
 		{
-			if (pos != end)
-				++pos;
+			if (pos == end || parserHelpers::isSpace(in[pos]))
+			{
+				const string chunk(in.begin() + start, in.begin() + pos);
 
-			const string chunk(in.begin() + start, in.begin() + pos);
+				if (pos != end)
+					++pos;
 
-			if (is8bit)
-			{
-				if (count && prevIs8bit)
+				if (is8bit)
 				{
-					// No need to create a new encoded word, just append
-					// the current word to the previous one.
-					ref <word> w = getWordAt(getWordCount() - 1);
-					w->getBuffer() += chunk;
+					if (count && prevIs8bit)
+					{
+						// No need to create a new encoded word, just append
+						// the current word to the previous one.
+						ref <word> w = getWordAt(getWordCount() - 1);
+						w->getBuffer() += " " + chunk;
+					}
+					else
+					{
+						appendWord(vmime::create <word>(chunk, ch));
+
+						prevIs8bit = true;
+						++count;
+					}
 				}
 				else
 				{
-					appendWord(vmime::create <word>(chunk, ch));
-
-					prevIs8bit = true;
-					++count;
+					if (count && !prevIs8bit)
+					{
+						ref <word> w = getWordAt(getWordCount() - 1);
+						w->getBuffer() += " " + chunk;
+					}
+					else
+					{
+						appendWord(vmime::create <word>
+							(chunk, charset(charsets::US_ASCII)));
+
+						prevIs8bit = false;
+						++count;
+					}
 				}
+
+				if (pos == end)
+					break;
+
+				is8bit = false;
+				start = pos;
+			}
+			else if (!parserHelpers::isAscii(in[pos]))
+			{
+				is8bit = true;
+				++pos;
 			}
 			else
 			{
-				if (count && !prevIs8bit)
-				{
-					ref <word> w = getWordAt(getWordCount() - 1);
-					w->getBuffer() += chunk;
-				}
-				else
-				{
-					appendWord(vmime::create <word>
-						(chunk, charset(charsets::US_ASCII)));
-
-					prevIs8bit = false;
-					++count;
-				}
+				++pos;
 			}
-
-			if (pos == end)
-				break;
-
-			is8bit = false;
-			start = pos;
-		}
-		else if (!parserHelpers::isAscii(in[pos]))
-		{
-			is8bit = true;
-			++pos;
-		}
-		else
-		{
-			++pos;
 		}
 	}
 }