diff --git a/src/wordEncoder.cpp b/src/wordEncoder.cpp
index 82a74cff..332f9bf2 100644
--- a/src/wordEncoder.cpp
+++ b/src/wordEncoder.cpp
@@ -247,7 +247,7 @@ bool wordEncoder::isEncodingNeeded
 		return true;
 
 	// If any RFC-2047 sequence is found in the buffer, encode it
-	if (buffer.find("=?") != string::npos)
+	if (buffer.find("=?") != string::npos || buffer.find("?=") != string::npos)
 		return true;
 
 	return false;