Fix issue with attachments dropped in some cases.
Increase version to 0.5.3.
Merge remote-tracking branch 'origin/devel'