Cosmetic corrections for Android
Support for streaming in attachments