[[ Bug 12540 ]] Re-disambiguate transfer types unicode and text, and ens...

...ure the latter deals with unicode transparently