2 files changed, 33 insertions, 61 deletions

diff --git a/src/vmime/text.cpp b/src/vmime/text.cpp
index a6172633..08d27bb9 100644
--- a/src/vmime/text.cpp
+++ b/src/vmime/text.cpp
@@ -285,84 +285,53 @@ void text::createFromString(const string& in, const charset& ch) {
 		asciiPercent = (in.length() == 0 ? 100 : (100 * asciiCount) / in.length());
 	}
 
-	// If there are "too much" non-ASCII chars, encode everything
+	// If there are "too much" non-ASCII chars, produce just one
+	// vmime::word. Because encoding happens word-wise, all of the input
+	// gets encoded.
+
 	if (alwaysEncode || asciiPercent < 60) {  // less than 60% ASCII chars
 
 		appendWord(make_shared <word>(in, ch));
+		return;
 
-	// Else, only encode words which need it
-	} else {
-
-		bool is8bit = false;     // is the current word 8-bit?
-		bool prevIs8bit = false; // is previous word 8-bit?
-		unsigned int count = 0;  // total number of words
-
-		for (size_t end = in.size(), pos = 0, start = 0 ; ; ) {
-
-			if (pos == end || parserHelpers::isSpace(in[pos])) {
-
-				const string chunk(in.begin() + start, in.begin() + pos);
-
-				if (pos != end) {
-					++pos;
-				}
-
-				if (is8bit) {
-
-					if (count && prevIs8bit) {
-
-						// No need to create a new encoded word, just append
-						// the current word to the previous one.
-						shared_ptr <word> w = getWordAt(getWordCount() - 1);
-						w->getBuffer() += " " + chunk;
-
-					} else {
-
-						if (count) {
-							shared_ptr <word> w = getWordAt(getWordCount() - 1);
-							w->getBuffer() += ' ';
-						}
-
-						appendWord(make_shared <word>(chunk, ch));
+	}
 
-						prevIs8bit = true;
-						++count;
-					}
+	// Else, only encode words which need it
 
-				} else {
+	size_t end = in.size(), pos = 0;
+	bool is8bit = false;     // is the current word 8-bit?
+	bool prevIs8bit = false; // is previous word 8-bit?
+	unsigned int count = 0;  // total number of words
 
-					if (count && !prevIs8bit) {
+	do {
+		size_t start = pos;
 
-						shared_ptr <word> w = getWordAt(getWordCount() - 1);
-						w->getBuffer() += " " + chunk;
+		for (; parserHelpers::isSpace(in[pos]); )
+			++pos;
 
-					} else {
+		for (; pos < end && !parserHelpers::isSpace(in[pos]); ++pos)
+			is8bit |= !parserHelpers::isAscii(in[pos]);
 
-						appendWord(make_shared <word>(chunk, charset(charsets::US_ASCII)));
+		// All chunks will have whitespace (if any) at front, never at the end
+		const string chunk(in.begin() + start, in.begin() + pos);
 
-						prevIs8bit = false;
-						++count;
-					}
-				}
+		if (prevIs8bit == is8bit && count > 0) {
 
-				if (pos == end) {
-					break;
-				}
+			// same bitness as previous word; merge
+			auto w = getWordAt(getWordCount() - 1);
+			w->getBuffer() += chunk;
 
-				is8bit = false;
-				start = pos;
+		} else {
 
-			} else if (!parserHelpers::isAscii(in[pos])) {
+			appendWord(make_shared <word>(chunk, charset(is8bit ? ch : charsets::US_ASCII)));
+			++count;
 
-				is8bit = true;
-				++pos;
+		}
 
-			} else {
+		prevIs8bit = is8bit;
+		is8bit = false;
 
-				++pos;
-			}
-		}
-	}
+	} while (pos < end);
 }
 
 
diff --git a/src/vmime/word.cpp b/src/vmime/word.cpp
index d4bf85cf..a16b4b51 100644
--- a/src/vmime/word.cpp
+++ b/src/vmime/word.cpp
@@ -755,6 +755,9 @@ void word::generate(
 		if (!startNewLine && !state->isFirstWord && !state->lastCharIsSpace) {
 
 			os << " "; // Separate from previous word
+			if (!state->prevWordIsEncoded && m_buffer[0] == ' ')
+				wordEnc.getNextChunk(1);
+
 			++curLineLength;
 
 			state->lastCharIsSpace = true;