defer updating stream
style cleanup
activate gmime rfc2047 workaround and add test case for #1005