(#1224) - unreverts and fixes don't mutate options object
(#1210) - Fix attachments in websql/Safari

Fixes problems we encounter with unexpected
encoding coercions for non-text attachment
data.