Merge pull request #492 from zakkak/master

Fix save for attachments