Merge pull request #491 from zakkak/master

Fix replying and forwarding of messages
Fix save for attachments

Bug introduced with 51037be7fb19515fb5fd18655be4fb995f551096