Fixed Rfc2047Workaround logic