more attachments updates
Merge branch 'master' of https://github.com/blackchair/helena
Merge branch 'master' of https://github.com/blackchair/helena