One line solution (plus comment) implements Solution 1: replace lines 1033 & 1034...
Inconsistent behavior in replying to emails with UTF-8 (rfc2047) From fields